Date:   Fri, 27 Jan 2023 18:02:26 +1100
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
Message-ID: <20230127180226.783baf07@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/frRvHQhF_rDoSX2W0qag6Z6";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/frRvHQhF_rDoSX2W0qag6Z6
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 fun=
ction 'iommu_map'
  369 |         ret =3D 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 iov=
a,
      |            ^~~~~~~~~

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_m=
ap()"

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 =3D  adsp->mem_phys | (sid << 32);
=20
 	ret =3D 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;
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/frRvHQhF_rDoSX2W0qag6Z6
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmPTdwIACgkQAVBC80lX
0GxutQf+NFHMFY+sQAz4PhnGTSJk7raZfueLnfuLMFw2OBJvrm2DUENqPHzjY7gA
gHJEE2Wv8towOukOlbfaTsl6K4CjCQeOjHDLwzaT/XiXhGCT9kPpB3D1SeK3B9WA
tJ8J1mPrbpXJX49w1qqSH5eut1N9ofYBM6VkZ6er0ljvxORbX6gNGcfmKFtKgig7
+gqR2Gx7OUQDhMxuujdlH+DtI6+8EDfORCtEaOHL/FUVzGJyM6BMQKNMybicUw2p
3kjWAlOkXMWxEP231qNO84NtsTBuTTMRd2JA++bw9caOyZj1Qek+oHZo5pN0E0Vg
Mfn6Dze6VmphPcLp4zGwJUYBoBnthw==
=Sy/m
-----END PGP SIGNATURE-----

--Sig_/frRvHQhF_rDoSX2W0qag6Z6--