From patchwork Wed Jun 9 10:23:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 12309537 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DC11C48BCF for ; Wed, 9 Jun 2021 10:31:03 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2CCBE601FC for ; Wed, 9 Jun 2021 10:31:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2CCBE601FC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NW/eZwfBsp3UBImi3WMuCp1C7+G4mu+uVOxuyuthusg=; b=LKuiritJrIkCDU J88gDEu5v0fi7sQU5qcDnlZgEdxhpTVP+kA/U8ul98nEn2N2NG5wjPXBO8CHdzoKYN52t0HOFMSUa rlrh0qqUl23FaDXqVVMKdK1wxr+zGWWhXQ8Jrsao3akw+OLYjCkGu9qUBDDv19ZL/b8OlT1LqJFre fQ37SzEmBlnvYjs1uNgiuMhTwOODkULJmDnUJKPQgnv8aPMx0P8KSOKOl0sj1ekGYkE8tAYP6g4DV 2DA+RWyXxmfZPo6jaN/xvpbkhJ3uoO8h2CI0pgkaiEXwz5SX9e3B6maCFq4gMn3BeQ5nNSXHDvoQ2 U8apdgps6ovgJ5dFBtkA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqvSE-00D06V-PK; Wed, 09 Jun 2021 10:28:59 +0000 Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqvNB-00CyVB-BG for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 10:23:46 +0000 Received: by mail-lj1-x22a.google.com with SMTP id r16so812349ljc.0 for ; Wed, 09 Jun 2021 03:23:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z41Cr+HEWGY0CsHaBd8pm3xNtEWwWXvXTvPBLBMGN/o=; b=wxnDktWnokbe9vdca0sig349xZwGFRxYuFMA+W0zn7C/YzUSGShW9nf9GwP+zBWewr KcIhMUvVU7R6230pLSzbrXrkFRT/Krbs6bdsqTll3nVZEW43N6ica7F+OuHFDn1OihUc hBhJPbDM0gVwJ1TfOFHiHSuSlWi2MY5Ve5RS1pVhKTTTTnrxXlZGZRLcToK4DORu19mq TPhX6S+52cWPuBj74jpI+I2yLXiv8faJT7DJz0Isu5f+C3H4wfp6hr/sqtLAOxm621j0 yRad3i1pPSmuIGfc5oOhDfFuQZGEpYj3jjjJ0TUkjmlv8E8CK6Zso99mhY4Nk9tmdoPB vDZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z41Cr+HEWGY0CsHaBd8pm3xNtEWwWXvXTvPBLBMGN/o=; b=LmRYTacXGDQBoWsYVYyHmJKjiR/4jhCN2qn0ven16rKTnVPRyBNlFy1xkzhnq/IQ8L Mxi4RLXPkkblaPcwrdJsNvX0c+kmIP9p2isM8j8Xy4e4SZcyoebMZay91dwMBcuUKDG2 VFm9aczZda3m8oq4NlbNHCB0IGvwl+0KuLULayoj/1GCLRbE1tpSNI28dRaPUwnJGTWR qjfBdTOtlklSMUoEcYEdKEVP9FvxXVY/qrav52bEM2erbAldiZvHeRYwlU2Q9Y2NEc1d vAslguYnq51a2adtqdaw7yfNvhyAIon6E2zavsO3elEKIfFsCG8GIY/emTCGH0ED5ufi UbYQ== X-Gm-Message-State: AOAM5320JPsB+VdlelxEKrwSs8sQqvaOaB0E953nGh/cifQ7RR2pBkmC pgkpbsi8GE8SViEB0X28rzLFhw== X-Google-Smtp-Source: ABdhPJzypUn77FFisUbpoXFQUpt73CwKxfl7HpnfNmeGK3YRsOitn1ppydvc0cplYjzX2lC2zkT2mw== X-Received: by 2002:a2e:bc1b:: with SMTP id b27mr4023293ljf.65.1623234222427; Wed, 09 Jun 2021 03:23:42 -0700 (PDT) Received: from jade.urgonet (h-79-136-85-3.A175.priv.bahnhof.se. [79.136.85.3]) by smtp.gmail.com with ESMTPSA id m4sm302966ljp.9.2021.06.09.03.23.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 03:23:42 -0700 (PDT) From: Jens Wiklander To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, op-tee@lists.trustedfirmware.org Cc: Sumit Garg , Herbert Xu , Sakkinen , Sasha Levin , Thirupathaiah Annapureddy , Vikas Gupta , "David S . Miller" , Tyler Hicks , Jens Wiklander Subject: [PATCH 6/7] firmware: tee_bnxt: use tee_shm_alloc_kernel_buf() Date: Wed, 9 Jun 2021 12:23:23 +0200 Message-Id: <20210609102324.2222332-7-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210609102324.2222332-1-jens.wiklander@linaro.org> References: <20210609102324.2222332-1-jens.wiklander@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_032345_451222_9A8AD3DD X-CRM114-Status: GOOD ( 11.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Uses the new simplified tee_shm_alloc_kernel_buf() function instead of the old deprecated tee_shm_alloc() function which required specific TEE_SHM-flags. Signed-off-by: Jens Wiklander --- drivers/firmware/broadcom/tee_bnxt_fw.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/firmware/broadcom/tee_bnxt_fw.c b/drivers/firmware/broadcom/tee_bnxt_fw.c index ed10da5313e8..56d00ddd4357 100644 --- a/drivers/firmware/broadcom/tee_bnxt_fw.c +++ b/drivers/firmware/broadcom/tee_bnxt_fw.c @@ -212,10 +212,9 @@ static int tee_bnxt_fw_probe(struct device *dev) pvt_data.dev = dev; - fw_shm_pool = tee_shm_alloc(pvt_data.ctx, MAX_SHM_MEM_SZ, - TEE_SHM_MAPPED | TEE_SHM_DMA_BUF); + fw_shm_pool = tee_shm_alloc_kernel_buf(pvt_data.ctx, MAX_SHM_MEM_SZ); if (IS_ERR(fw_shm_pool)) { - dev_err(pvt_data.dev, "tee_shm_alloc failed\n"); + dev_err(pvt_data.dev, "tee_shm_alloc_kernel_buf failed\n"); err = PTR_ERR(fw_shm_pool); goto out_sess; }