From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bjorn Andersson <bjorn.andersson@linaro.org>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Joerg Roedel <joro@8bytes.org>
Cc: Jason Gunthorpe <jgg@nvidia.com>, Jason Gunthorpe <jgg@ziepe.ca>,
Joerg Roedel <jroedel@suse.de>,
Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the rpmsg tree
Date: Fri, 27 Jan 2023 18:02:26 +1100 [thread overview]
Message-ID: <20230127180226.783baf07@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1822 bytes --]
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@canb.auug.org.au>
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@canb.auug.org.au>
---
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-01-27 7:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-27 7:02 Stephen Rothwell [this message]
2023-01-30 8:51 ` linux-next: build failure after merge of the rpmsg tree Joerg Roedel
-- strict thread matches above, loose matches on Subject: below --
2020-10-15 4:55 Stephen Rothwell
2019-02-22 5:18 Stephen Rothwell
2019-02-22 12:50 ` Christoph Hellwig
2019-02-22 14:02 ` Loic PALLARDY
2018-04-26 3:33 Stephen Rothwell
2018-04-26 3:46 ` Bjorn Andersson
2017-08-31 6:54 Stephen Rothwell
2017-08-31 17:47 ` 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=20230127180226.783baf07@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bjorn.andersson@linaro.org \
--cc=jgg@nvidia.com \
--cc=jgg@ziepe.ca \
--cc=joro@8bytes.org \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=quic_srivasam@quicinc.com \
/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).