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 07/15] firmware: qcom: scm: make qcom_scm_assign_mem() use the TZ allocator
Date: Mon, 9 Oct 2023 17:34:19 +0200 [thread overview]
Message-ID: <20231009153427.20951-8-brgl@bgdev.pl> (raw)
In-Reply-To: <20231009153427.20951-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Let's use the new TZ memory allocator to obtain a buffer for this call
instead of using dma_alloc_coherent().
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
drivers/firmware/qcom/qcom_scm.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c
index 71e98b666391..754f6056b99f 100644
--- a/drivers/firmware/qcom/qcom_scm.c
+++ b/drivers/firmware/qcom/qcom_scm.c
@@ -4,6 +4,7 @@
*/
#include <linux/arm-smccc.h>
+#include <linux/cleanup.h>
#include <linux/clk.h>
#include <linux/completion.h>
#include <linux/cpumask.h>
@@ -998,14 +999,13 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz,
struct qcom_scm_mem_map_info *mem_to_map;
phys_addr_t mem_to_map_phys;
phys_addr_t dest_phys;
- dma_addr_t ptr_phys;
+ phys_addr_t ptr_phys;
size_t mem_to_map_sz;
size_t dest_sz;
size_t src_sz;
size_t ptr_sz;
int next_vm;
__le32 *src;
- void *ptr;
int ret, i, b;
u64 srcvm_bits = *srcvm;
@@ -1015,10 +1015,13 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz,
ptr_sz = ALIGN(src_sz, SZ_64) + ALIGN(mem_to_map_sz, SZ_64) +
ALIGN(dest_sz, SZ_64);
- ptr = dma_alloc_coherent(__scm->dev, ptr_sz, &ptr_phys, GFP_KERNEL);
+ void *ptr __free(qcom_tzmem) = qcom_tzmem_alloc(__scm->mempool,
+ ptr_sz, GFP_KERNEL);
if (!ptr)
return -ENOMEM;
+ ptr_phys = qcom_tzmem_to_phys(ptr);
+
/* Fill source vmid detail */
src = ptr;
i = 0;
@@ -1047,7 +1050,6 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz,
ret = __qcom_scm_assign_mem(__scm->dev, mem_to_map_phys, mem_to_map_sz,
ptr_phys, src_sz, dest_phys, dest_sz);
- dma_free_coherent(__scm->dev, ptr_sz, ptr, ptr_phys);
if (ret) {
dev_err(__scm->dev,
"Assign memory protection call failed %d\n", ret);
--
2.39.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-10-09 15:35 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-09 15:34 [PATCH v3 00/15] arm64: qcom: add and enable SHM Bridge support Bartosz Golaszewski
2023-10-09 15:34 ` [PATCH v3 01/15] firmware: qcom: move Qualcomm code into its own directory Bartosz Golaszewski
2023-10-11 20:01 ` Maximilian Luz
2023-10-09 15:34 ` [PATCH v3 02/15] firmware: qcom: scm: add a missing forward declaration for struct device Bartosz Golaszewski
2023-10-10 19:44 ` Andrew Halaney
2023-10-09 15:34 ` [PATCH v3 03/15] firmware: qcom: scm: remove unneeded 'extern' specifiers Bartosz Golaszewski
2023-10-10 19:45 ` Andrew Halaney
2023-10-09 15:34 ` [PATCH v3 04/15] firmware: qcom: add a dedicated TrustZone buffer allocator Bartosz Golaszewski
2023-10-09 21:28 ` Andrew Halaney
2023-10-10 6:42 ` Bartosz Golaszewski
2023-10-10 8:26 ` Bartosz Golaszewski
2023-10-10 20:48 ` Andrew Halaney
2023-10-11 7:39 ` Bartosz Golaszewski
2023-10-09 15:34 ` [PATCH v3 05/15] firmware: qcom: scm: enable the TZ mem allocator Bartosz Golaszewski
2023-10-10 9:11 ` kernel test robot
2023-10-09 15:34 ` [PATCH v3 06/15] firmware: qcom: scm: smc: switch to using the SCM allocator Bartosz Golaszewski
2023-10-10 22:12 ` Andrew Halaney
2023-10-09 15:34 ` Bartosz Golaszewski [this message]
2023-10-10 22:19 ` [PATCH v3 07/15] firmware: qcom: scm: make qcom_scm_assign_mem() use the TZ allocator Andrew Halaney
2023-10-11 7:41 ` Bartosz Golaszewski
2023-10-11 13:54 ` Andrew Halaney
2023-10-11 14:33 ` Bartosz Golaszewski
2023-10-11 20:13 ` Andrew Halaney
2023-10-09 15:34 ` [PATCH v3 08/15] firmware: qcom: scm: make qcom_scm_ice_set_key() " Bartosz Golaszewski
2023-10-10 22:25 ` Andrew Halaney
2023-10-09 15:34 ` [PATCH v3 09/15] firmware: qcom: scm: make qcom_scm_lmh_dcvsh() " Bartosz Golaszewski
2023-10-10 22:26 ` Andrew Halaney
2023-10-09 15:34 ` [PATCH v3 10/15] firmware: qcom: scm: make qcom_scm_qseecom_app_get_id() " Bartosz Golaszewski
2023-10-10 22:28 ` Andrew Halaney
2023-10-11 20:09 ` Maximilian Luz
2023-10-09 15:34 ` [PATCH v3 11/15] firmware: qcom: qseecom: convert to using " Bartosz Golaszewski
2023-10-10 22:49 ` Andrew Halaney
2023-10-11 7:44 ` Bartosz Golaszewski
2023-10-11 13:55 ` Andrew Halaney
2023-10-11 14:37 ` Bartosz Golaszewski
2023-10-11 20:47 ` Maximilian Luz
2023-10-11 20:09 ` Maximilian Luz
2023-10-12 23:21 ` kernel test robot
2023-10-09 15:34 ` [PATCH v3 12/15] firmware: qcom: scm: add support for SHM bridge operations Bartosz Golaszewski
2023-10-09 15:34 ` [PATCH v3 13/15] firmware: qcom: tzmem: enable SHM Bridge support Bartosz Golaszewski
2023-10-11 21:14 ` Andrew Halaney
2023-10-11 22:17 ` Andrew Halaney
2023-10-13 8:32 ` Bartosz Golaszewski
2023-10-13 13:30 ` Andrew Halaney
2023-10-13 14:06 ` Bartosz Golaszewski
2023-10-09 15:34 ` [PATCH v3 14/15] firmware: qcom: scm: clarify the comment in qcom_scm_pas_init_image() Bartosz Golaszewski
2023-10-11 21:19 ` Andrew Halaney
2023-10-09 15:34 ` [PATCH v3 15/15] arm64: defconfig: enable SHM Bridge support for the TZ memory allocator Bartosz Golaszewski
2023-10-11 21:20 ` Andrew Halaney
2023-10-12 8:57 ` Bartosz Golaszewski
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=20231009153427.20951-8-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=agross@kernel.org \
--cc=ahalaney@redhat.com \
--cc=andersson@kernel.org \
--cc=bartosz.golaszewski@linaro.org \
--cc=elder@linaro.org \
--cc=kernel@quicinc.com \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski@linaro.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=srinivas.kandagatla@linaro.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).