Message ID | 20231009153427.20951-6-brgl@bgdev.pl |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp1952229vqo; Mon, 9 Oct 2023 08:35:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHLO+/incjv0g+mP4qpJvn49v+1ucsiW8rwQTMEBw99IiQvd53GeycNPuwP8CV9mal/vtAk X-Received: by 2002:a05:6a00:2443:b0:68c:69c8:e0f0 with SMTP id d3-20020a056a00244300b0068c69c8e0f0mr19452639pfj.18.1696865741674; Mon, 09 Oct 2023 08:35:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696865741; cv=none; d=google.com; s=arc-20160816; b=sftzSTQCMKGjPn690N76GWb6KAj9vHkRbKjeRU41ixXmZpsi/qIip2beV+7CZhKb2G wh7vQ8UpmxWL8EvWvXyWVIu08vWTnhFQA8dYUPh/nZGgvD2S/EJeiCRWmuVZlHciNnsC 7rRTjK6LIql3XhGYEaUcNxUulJnzNIa8FLXNY3ZeM1Cf0uhrK0VJv9LRwEc82+sVprS9 o02iCM27apAoiepGq3SxIZSirVhI+pR7KczMQ8lV+BIJ9A/qyXYxNia9uvM7d1h8E19r luj4Z+/5VVHODplXt5gsk6yrJbiv4vAqSCM530PZCsNd5dysMTaiCavh/bNBo4EBSNBN uYqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GC/5cw5j4gsHJ9iomK+6pv+kPUVJjLbCpiT9I+Feyy0=; fh=lirm1ccAeXZZB1cIo+N1DqklpgcFmD/vJ7PCWNIL0HU=; b=k7wUOuh/WtnBUS6g8fT+7JWNDzBhIsobh8G3hOoN/9X8QN6nCPhnyZD6rUmb4/9CUo DR60dMZD+32+5hn7aJTYYEBpedeKGTLjg2/a6mMzwFuQP9/dogPRa+nSZqnr8nWkBQ54 j47f0BhNp+RCYOJvJeQp+ILjJVFgO/8mrhhun/wFrUEk7m3Kfzm+c17H6FRgxomeNqsl ysv4oc2FggVwWQjKaJUYkCBNZ6RT5z1uIZqtJ47d0Qu9rIVIdLmcsidTRDapgvf4shzU fwdgxIYJd/27o3uYN7FBvlo3fi2A3Z8NIDSrRchB0OeaibKq5mc36uqR/Dbx8xNRFx20 ek7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=BnxYVHWC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id d17-20020a056a00245100b00696b367da55si7762998pfj.396.2023.10.09.08.35.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 08:35:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=BnxYVHWC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 444488078B9D; Mon, 9 Oct 2023 08:35:38 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377117AbjJIPfG (ORCPT <rfc822;ezelljr.billy@gmail.com> + 18 others); Mon, 9 Oct 2023 11:35:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377030AbjJIPey (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 9 Oct 2023 11:34:54 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5864E8F for <linux-kernel@vger.kernel.org>; Mon, 9 Oct 2023 08:34:47 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3231dff4343so2796072f8f.0 for <linux-kernel@vger.kernel.org>; Mon, 09 Oct 2023 08:34:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696865686; x=1697470486; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GC/5cw5j4gsHJ9iomK+6pv+kPUVJjLbCpiT9I+Feyy0=; b=BnxYVHWCYr5SIblnT1QwjfogTZQYHEBw4fakD7vpch1J+1jg8r4YxWreFnPKqfxwCC /pkacj5HgSLU9UP0IRsEvOyZY5DodAP/OhXWn5NQaqi+R7yGKTlNaEf/RViL7ZLKxINX gm5XPxNjDtjiLhLsNtiqyq2Mh2fFjvtH+en2dPIV4naBdthUxYgQz9wyo1EQaop0IHma hx/YgfzcTL3M5GkmMvvN4mbUdtKTJg12NXpDrjpDVJD1SHFmi7++hFNnJcoWLM9Dmsfv Vkt2KTtKP2ORyUTIltUgUpkk6/AZeHehzP686MFxTVITVEL5E4m2uLjwGwfWRbkcDNQs ampw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696865686; x=1697470486; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GC/5cw5j4gsHJ9iomK+6pv+kPUVJjLbCpiT9I+Feyy0=; b=EVZ6cicZ4XiZ7I3HlNepcZSIh2/nWCoytm4N+1ajckU2CEyifmdrL9RyAc19z5KCOk nuwhGbgDoGjufWi3YfKJLVWwHImEgVQ45zyhz9oi4Q3Wi4Y4smbTqy2HPSWlNdZTXj/s gRBBVcsux+lcK3j466jpCUgJhQhIyC+tmX0KxXeWkTp2A2TL2p0BC9FtXecg4BukaqkD 7JRUHehhub5g7BsMWD5gqDTdspezV5xpybZawEJND/7hzLtqKQTIfv0lfFd/va0gkaoj U+yWiw32oqVh6ff44m+ei1CgR8K9As885poyUnY9oXgZ8NH70d4/NrccAttFSmw2w4PY GfxQ== X-Gm-Message-State: AOJu0YzNC99LD9/A6zHlJbva9wPgrubbAGTZ9j7Z/FNOj2pBqWFbbQMw BnYTXke8wg5pRLg0N6aJYoDi4w== X-Received: by 2002:a5d:428b:0:b0:323:3b45:c452 with SMTP id k11-20020a5d428b000000b003233b45c452mr9526845wrq.14.1696865685819; Mon, 09 Oct 2023 08:34:45 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:f20d:2959:7545:e99f]) by smtp.gmail.com with ESMTPSA id b3-20020adff243000000b0031431fb40fasm10016521wrp.89.2023.10.09.08.34.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 08:34:45 -0700 (PDT) From: Bartosz Golaszewski <brgl@bgdev.pl> To: Andy Gross <agross@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Konrad Dybcio <konrad.dybcio@linaro.org>, Elliot Berman <quic_eberman@quicinc.com>, Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>, Guru Das Srinagesh <quic_gurus@quicinc.com>, Andrew Halaney <ahalaney@redhat.com>, Maximilian Luz <luzmaximilian@gmail.com>, Alex Elder <elder@linaro.org>, Srini Kandagatla <srinivas.kandagatla@linaro.org> Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@quicinc.com, Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Subject: [PATCH v3 05/15] firmware: qcom: scm: enable the TZ mem allocator Date: Mon, 9 Oct 2023 17:34:17 +0200 Message-Id: <20231009153427.20951-6-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231009153427.20951-1-brgl@bgdev.pl> References: <20231009153427.20951-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=2.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_SBL_CSS, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 09 Oct 2023 08:35:38 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779292692060611328 X-GMAIL-MSGID: 1779292692060611328 |
Series |
arm64: qcom: add and enable SHM Bridge support
|
|
Commit Message
Bartosz Golaszewski
Oct. 9, 2023, 3:34 p.m. UTC
From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Select the TrustZone memory allocator in Kconfig and create a pool of memory shareable with the TrustZone when probing the SCM driver. This will allow a gradual conversion of all relevant SCM calls to using the dedicated allocator. Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> --- drivers/firmware/qcom/Kconfig | 1 + drivers/firmware/qcom/qcom_scm.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+)
Comments
Hi Bartosz,
kernel test robot noticed the following build warnings:
[auto build test WARNING on next-20231009]
[cannot apply to arm64/for-next/core krzk-dt/for-next linus/master v6.6-rc5 v6.6-rc4 v6.6-rc3 v6.6-rc5]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Bartosz-Golaszewski/firmware-qcom-move-Qualcomm-code-into-its-own-directory/20231009-233826
base: next-20231009
patch link: https://lore.kernel.org/r/20231009153427.20951-6-brgl%40bgdev.pl
patch subject: [PATCH v3 05/15] firmware: qcom: scm: enable the TZ mem allocator
config: arc-randconfig-001-20231010 (https://download.01.org/0day-ci/archive/20231010/202310101720.hVVWyJf3-lkp@intel.com/config)
compiler: arc-elf-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231010/202310101720.hVVWyJf3-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202310101720.hVVWyJf3-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> drivers/firmware/qcom/qcom_tzmem.c:72: warning: Function parameter or member 'size' not described in 'qcom_tzmem_pool_new'
vim +72 drivers/firmware/qcom/qcom_tzmem.c
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 59
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 60 /**
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 61 * qcom_tzmem_pool_new() - Create a new TZ memory pool.
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 62 * @size - Size of the new pool in bytes.
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 63 *
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 64 * Create a new pool of memory suitable for sharing with the TrustZone.
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 65 *
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 66 * Must not be used in atomic context.
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 67 *
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 68 * Returns:
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 69 * New memory pool address or ERR_PTR() on error.
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 70 */
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 71 struct qcom_tzmem_pool *qcom_tzmem_pool_new(size_t size)
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 @72 {
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 73 struct qcom_tzmem_pool *pool;
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 74 int ret = -ENOMEM;
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 75
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 76 if (!size)
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 77 return ERR_PTR(-EINVAL);
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 78
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 79 size = PAGE_ALIGN(size);
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 80
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 81 pool = kzalloc(sizeof(*pool), GFP_KERNEL);
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 82 if (!pool)
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 83 return ERR_PTR(-ENOMEM);
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 84
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 85 pool->size = size;
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 86
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 87 pool->vbase = dma_alloc_coherent(qcom_tzmem_dev, size, &pool->pbase,
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 88 GFP_KERNEL);
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 89 if (!pool->vbase)
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 90 goto err_kfree_pool;
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 91
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 92 pool->pool = gen_pool_create(PAGE_SHIFT, -1);
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 93 if (!pool)
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 94 goto err_dma_free;
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 95
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 96 gen_pool_set_algo(pool->pool, gen_pool_best_fit, NULL);
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 97
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 98 ret = gen_pool_add_virt(pool->pool, (unsigned long)pool->vbase,
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 99 pool->pbase, size, -1);
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 100 if (ret)
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 101 goto err_destroy_genpool;
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 102
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 103 ret = qcom_tzmem_init_pool(pool);
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 104 if (ret)
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 105 goto err_destroy_genpool;
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 106
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 107 return pool;
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 108
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 109 err_destroy_genpool:
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 110 gen_pool_destroy(pool->pool);
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 111 err_dma_free:
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 112 dma_free_coherent(qcom_tzmem_dev, size, pool->vbase, pool->pbase);
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 113 err_kfree_pool:
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 114 kfree(pool);
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 115 return ERR_PTR(ret);
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 116 }
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 117 EXPORT_SYMBOL_GPL(qcom_tzmem_pool_new);
2e798cd92c1686 Bartosz Golaszewski 2023-10-09 118
diff --git a/drivers/firmware/qcom/Kconfig b/drivers/firmware/qcom/Kconfig index b80269a28224..237da40de832 100644 --- a/drivers/firmware/qcom/Kconfig +++ b/drivers/firmware/qcom/Kconfig @@ -7,6 +7,7 @@ menu "Qualcomm firmware drivers" config QCOM_SCM + select QCOM_TZMEM tristate config QCOM_TZMEM diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index 520de9b5633a..0d4c028be0c1 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -8,8 +8,10 @@ #include <linux/completion.h> #include <linux/cpumask.h> #include <linux/dma-mapping.h> +#include <linux/err.h> #include <linux/export.h> #include <linux/firmware/qcom/qcom_scm.h> +#include <linux/firmware/qcom/qcom_tzmem.h> #include <linux/init.h> #include <linux/interconnect.h> #include <linux/interrupt.h> @@ -20,9 +22,11 @@ #include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/reset-controller.h> +#include <linux/sizes.h> #include <linux/types.h> #include "qcom_scm.h" +#include "qcom_tzmem.h" static bool download_mode = IS_ENABLED(CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT); module_param(download_mode, bool, 0); @@ -41,6 +45,8 @@ struct qcom_scm { int scm_vote_count; u64 dload_mode_addr; + + struct qcom_tzmem_pool *mempool; }; struct qcom_scm_current_perm_info { @@ -1887,6 +1893,16 @@ static int qcom_scm_probe(struct platform_device *pdev) if (of_property_read_bool(pdev->dev.of_node, "qcom,sdi-enabled")) qcom_scm_disable_sdi(); + ret = qcom_tzmem_enable(__scm->dev); + if (ret) + return dev_err_probe(__scm->dev, ret, + "Failed to enable the TrustZone memory allocator\n"); + + __scm->mempool = devm_qcom_tzmem_pool_new(__scm->dev, SZ_256K); + if (IS_ERR(__scm->mempool)) + return dev_err_probe(__scm->dev, PTR_ERR(__scm->mempool), + "Failed to create the SCM memory pool\n"); + /* * Initialize the QSEECOM interface. *