Subject: Re: linux-next: build failure after merge of the rpmsg tree

From: Joerg Roedel <[email-masked]>
Date: Mon, 30 Jan 2023 09:51:51 +0100

Thanks for the report, Stephen.

Bjorn, Mathieu,

On Fri, Jan 27, 2023 at 06:02:26PM +1100, Stephen Rothwell wrote:
> 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.

The patch-set causing this is in a separate branch in the IOMMU tree
which you can be merged into the rpmsg tree for a fixup there:

	git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu-memory-accounting

Regards,

-- 
Jörg Rödel
[email-masked]

SUSE Software Solutions Germany GmbH
Frankenstraße 146
90461 Nürnberg
Germany

(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman