From patchwork Mon Nov 27 14:15:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 13469705 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="LSYcZMTC" Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9FF51BE for ; Mon, 27 Nov 2023 06:16:14 -0800 (PST) Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-50ba75e33f3so3224876e87.2 for ; Mon, 27 Nov 2023 06:16:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1701094573; x=1701699373; 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=dkEfLIdUazWHVoS/f6N40pGJ+r4HD9QT8ToB//6WjKI=; b=LSYcZMTCNaRrj6L8z+aF/OKYEJbWcexUWhK33Q8zuPPp4wq/acijnx4yWpBpTT5W0n d9WibDy97tueE2jy+oTHhkVe7tDy1us9e3zNTuOG+nDtVhA5LT+/Z1y6d4jerxdcjyS8 H74OEwqhtU1oTD83lYTOiXKOd4h4AYlQBS5L1cdPSkqJxOGYN8trK5c/7WSR78mywwx7 vAJwut24mh/o1+vbYjYkqlS9DuZVrHSxYpuEDHu+126rCDz1gTELP5EbJRMOEd2tN5q2 6LXsUg98mYzBMyfRoQh9sOPgovA1F22KiE2Wv8eEGePsnLMOPlQusY5r48m+VzleuzGj goMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701094573; x=1701699373; 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=dkEfLIdUazWHVoS/f6N40pGJ+r4HD9QT8ToB//6WjKI=; b=On16jUBppJCGvTqfoAE0m3Hv5O0IfQlDEKaTOqDdhltg0Od1lSPl95+JoXFtt9ToFk lVmuj6vMlLsjH0xdh1FXnML7+JSk9B2QhIRe7sI7WteJAt4V5BzFMgRZkFgyYx+Muhg9 FX94NQumkiQY6C+U757RlsIlm9kzEpDhv4veHLDAEkUVhaTFNgpzCJErWq5UqKkd6s7O U4kJdXbcvCKvDuaz4+V2n0dWx4FYqHuBF7Uoi+B6CEfeKznGExokJVqj9nGuwrHKwZRZ /uW2urn+bj/nlSI9MFDbK458Tt5h2ZmfE3J8USougnVX/t3bkSDIEpXXG7zUgWrkSfTd cbNw== X-Gm-Message-State: AOJu0YzX0PTs8B617wSdDqLa2DnBuzPpRylSf/dgvCzoHJPAVDDNkn9C DV9i983EFyYm1Bqz5tbe5oJgWA== X-Google-Smtp-Source: AGHT+IHu7l09DTCJJuDJ288P8P+c4aWNjuqsJh1cEjuw9t082HlZXCAWJIkZM5tGipzeUI3odwZCeg== X-Received: by 2002:a05:6512:239e:b0:50a:763f:ecf1 with SMTP id c30-20020a056512239e00b0050a763fecf1mr10914778lfv.12.1701094572678; Mon, 27 Nov 2023 06:16:12 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:bf33:77c7:8131:5e64]) by smtp.gmail.com with ESMTPSA id be7-20020a05600c1e8700b00405442edc69sm14658830wmb.14.2023.11.27.06.16.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 06:16:11 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Elliot Berman , Krzysztof Kozlowski , Guru Das Srinagesh , Andrew Halaney , Maximilian Luz , Alex Elder , Srini Kandagatla Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@quicinc.com, Bartosz Golaszewski Subject: [PATCH v6 03/13] firmware: qcom: scm: enable the TZ mem allocator Date: Mon, 27 Nov 2023 15:15:50 +0100 Message-Id: <20231127141600.20929-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231127141600.20929-1-brgl@bgdev.pl> References: <20231127141600.20929-1-brgl@bgdev.pl> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Bartosz Golaszewski 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 Reviewed-by: Andrew Halaney Tested-by: Andrew Halaney # sc8280xp-lenovo-thinkpad-x13s --- drivers/firmware/qcom/Kconfig | 1 + drivers/firmware/qcom/qcom_scm.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) 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 #include #include +#include #include #include +#include #include #include #include @@ -20,9 +22,11 @@ #include #include #include +#include #include #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. *