devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Bjorn Andersson <andersson@kernel.org>,
	 Konrad Dybcio <konrad.dybcio@linaro.org>,
	Rob Herring <robh@kernel.org>,
	 Krzysztof Kozlowski <krzk+dt@kernel.org>,
	 Conor Dooley <conor+dt@kernel.org>,
	Robert Marko <robimarko@gmail.com>,
	 Das Srinagesh <quic_gurus@quicinc.com>,
	 Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
	 Maximilian Luz <luzmaximilian@gmail.com>,
	 Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>,
	 Srini Kandagatla <srinivas.kandagatla@linaro.org>,
	 Arnd Bergmann <arnd@arndb.de>,
	Elliot Berman <quic_eberman@quicinc.com>,
	 Alex Elder <elder@kernel.org>
Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
	 linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,  kernel@quicinc.com
Subject: [PATCH v10 12/15] firmware: qcom: scm: add support for SHM bridge memory carveout
Date: Mon, 27 May 2024 14:55:02 +0200	[thread overview]
Message-ID: <20240527-shm-bridge-v10-12-ce7afaa58d3a@linaro.org> (raw)
In-Reply-To: <20240527-shm-bridge-v10-0-ce7afaa58d3a@linaro.org>

From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

Parse the "memory-region" property and - if present - use it to assign
the dedicated reserved memory to the underlying DMA callbacks which will
then allocate memory for the SCM calls from it.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
 drivers/firmware/qcom/qcom_scm.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c
index 94c34cde8179..c82957727650 100644
--- a/drivers/firmware/qcom/qcom_scm.c
+++ b/drivers/firmware/qcom/qcom_scm.c
@@ -23,6 +23,7 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
+#include <linux/of_reserved_mem.h>
 #include <linux/platform_device.h>
 #include <linux/reset-controller.h>
 #include <linux/sizes.h>
@@ -1942,6 +1943,11 @@ 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 = of_reserved_mem_device_init(__scm->dev);
+	if (ret && ret != -ENODEV)
+		return dev_err_probe(__scm->dev, ret,
+				     "Failed to setup the reserved memory region for TZ mem\n");
+
 	ret = qcom_tzmem_enable(__scm->dev);
 	if (ret)
 		return dev_err_probe(__scm->dev, ret,

-- 
2.43.0


  parent reply	other threads:[~2024-05-27 12:56 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-27 12:54 [PATCH v10 00/15] firmware: qcom: implement support for and enable SHM bridge Bartosz Golaszewski
2024-05-27 12:54 ` [PATCH v10 01/15] dt-bindings: firmware: qcom,scm: add memory-region for sa8775p Bartosz Golaszewski
2024-05-27 18:41   ` Krzysztof Kozlowski
2024-05-27 12:54 ` [PATCH v10 02/15] firmware: qcom: add a dedicated TrustZone buffer allocator Bartosz Golaszewski
2024-05-27 12:54 ` [PATCH v10 03/15] firmware: qcom: scm: enable the TZ mem allocator Bartosz Golaszewski
2024-05-27 12:54 ` [PATCH v10 04/15] firmware: qcom: scm: smc: switch to using the SCM allocator Bartosz Golaszewski
2024-05-27 12:54 ` [PATCH v10 05/15] firmware: qcom: scm: make qcom_scm_assign_mem() use the TZ allocator Bartosz Golaszewski
2024-05-27 12:54 ` [PATCH v10 06/15] firmware: qcom: scm: make qcom_scm_ice_set_key() " Bartosz Golaszewski
2024-05-27 12:54 ` [PATCH v10 07/15] firmware: qcom: scm: make qcom_scm_lmh_dcvsh() " Bartosz Golaszewski
2024-05-27 12:54 ` [PATCH v10 08/15] firmware: qcom: scm: make qcom_scm_qseecom_app_get_id() " Bartosz Golaszewski
2024-05-27 12:54 ` [PATCH v10 09/15] firmware: qcom: qseecom: convert to using " Bartosz Golaszewski
2024-06-20 23:14   ` Elliot Berman
2024-06-21  1:24   ` Amirreza Zarrabi
2024-05-27 12:55 ` [PATCH v10 10/15] firmware: qcom: scm: add support for SHM bridge operations Bartosz Golaszewski
2024-05-27 12:55 ` [PATCH v10 11/15] firmware: qcom: tzmem: enable SHM Bridge support Bartosz Golaszewski
2024-05-27 12:55 ` Bartosz Golaszewski [this message]
2024-06-20 23:05   ` [PATCH v10 12/15] firmware: qcom: scm: add support for SHM bridge memory carveout Elliot Berman
2024-05-27 12:55 ` [PATCH v10 13/15] firmware: qcom: scm: clarify the comment in qcom_scm_pas_init_image() Bartosz Golaszewski
2024-06-20 22:54   ` Elliot Berman
2024-06-21 13:42     ` Bartosz Golaszewski
2024-05-27 12:55 ` [PATCH v10 14/15] arm64: defconfig: enable SHM Bridge support for the TZ memory allocator Bartosz Golaszewski
2024-05-27 12:55 ` [PATCH v10 15/15] arm64: dts: qcom: sa8775p: add a dedicated memory carveout for TZ Bartosz Golaszewski
2024-05-29 14:26   ` Konrad Dybcio
2024-05-29 14:39     ` Bartosz Golaszewski
2024-05-31 12:40       ` Konrad Dybcio
2024-06-17 19:57 ` [PATCH v10 00/15] firmware: qcom: implement support for and enable SHM bridge Bartosz Golaszewski
2024-06-23 22:09 ` (subset) " Bjorn Andersson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240527-shm-bridge-v10-12-ce7afaa58d3a@linaro.org \
    --to=brgl@bgdev.pl \
    --cc=andersson@kernel.org \
    --cc=arnd@arndb.de \
    --cc=bartosz.golaszewski@linaro.org \
    --cc=catalin.marinas@arm.com \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=elder@kernel.org \
    --cc=kernel@quicinc.com \
    --cc=konrad.dybcio@linaro.org \
    --cc=krzk+dt@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luzmaximilian@gmail.com \
    --cc=quic_eberman@quicinc.com \
    --cc=quic_gurus@quicinc.com \
    --cc=robh@kernel.org \
    --cc=robimarko@gmail.com \
    --cc=srinivas.kandagatla@linaro.org \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).