Hi all,
After merging the rpmsg tree, today's linux-next build (arm64 defconfig)
failed like this:
drivers/remoteproc/qcom_q6v5_adsp.c: In function 'adsp_map_carveout':
drivers/remoteproc/qcom_q6v5_adsp.c:369:15: error: too few arguments to function 'iommu_map'
369 | ret = iommu_map(rproc->domain, iova, adsp->mem_phys,
| ^~~~~~~~~
In file included from drivers/remoteproc/qcom_q6v5_adsp.c:12:
include/linux/iommu.h:473:12: note: declared here
473 | extern int iommu_map(struct iommu_domain *domain, unsigned long iova,
| ^~~~~~~~~
Caused by commit
f22eedff28af ("remoteproc: qcom: Add support for memory sandbox")
interacting with commit
1369459b2e21 ("iommu: Add a gfp parameter to iommu_map()")
from the iommu tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 27 Jan 2023 17:58:15 +1100
Subject: [PATCH] remoteproc: fix for "iommu: Add a gfp parameter to iommu_map()"
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/remoteproc/qcom_q6v5_adsp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c
index 2dc850f48f00..08d8dad22ca7 100644
--- a/drivers/remoteproc/qcom_q6v5_adsp.c
+++ b/drivers/remoteproc/qcom_q6v5_adsp.c
@@ -367,7 +367,8 @@ static int adsp_map_carveout(struct rproc *rproc)
iova = adsp->mem_phys | (sid << 32);
ret = iommu_map(rproc->domain, iova, adsp->mem_phys,
- adsp->mem_size, IOMMU_READ | IOMMU_WRITE);
+ adsp->mem_size, IOMMU_READ | IOMMU_WRITE,
+ GFP_KERNEL);
if (ret) {
dev_err(adsp->dev, "Unable to map ADSP Physical Memory\n");
return ret;
--
2.35.1
--
Cheers,
Stephen Rothwell
Attachment:
pgpzrqj3YWYd8.pgp
Description: OpenPGP digital signature
