Patchwork ACPI/IORT: Fix build when CONFIG_IOMMU_API=n

login
register
mail settings
Submitter Lorenzo Pieralisi
Date Jan. 7, 2019, 4:42 p.m.
Message ID <20190107164208.27789-1-lorenzo.pieralisi@arm.com>
Download mbox | patch
Permalink /patch/694045/
State New
Headers show

Comments

Lorenzo Pieralisi - Jan. 7, 2019, 4:42 p.m.
From: Qian Cai <cai@lca.pw>

Commit 8097e53eaba2 ("ACPI/IORT: Use helper functions to access
dev->iommu_fwspec") changed by mistake the iort_fwspec_iommu_ops() stub
definition (compiled in when CONFIG_IOMMU_API=n), that caused the
following compilation failure:

drivers/acpi/arm64/iort.c:880:1: error: expected identifier or
'(' before '{' token
 { return NULL; }
 ^
drivers/acpi/arm64/iort.c:879:39: warning: 'iort_fwspec_iommu_ops'
used but never defined
 static inline const struct iommu_ops *iort_fwspec_iommu_ops(struct device *dev);
                                       ^~~~~~~~~~~~~~~~~~~~~

Fix it.

Fixes: 8097e53eaba2 ("ACPI/IORT: Use helper functions to access dev->iommu_fwspec")
Signed-off-by: Qian Cai <cai@lca.pw>
[lorenzo.pieralisi@arm.com: updated tags and log]
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Hanjun Guo <hanjun.guo@linaro.org>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Joerg Roedel <jroedel@suse.de>
---
 drivers/acpi/arm64/iort.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Joerg Roedel - Jan. 11, 2019, 11:33 a.m.
On Mon, Jan 07, 2019 at 04:42:07PM +0000, Lorenzo Pieralisi wrote:
> From: Qian Cai <cai@lca.pw>
> 
> Commit 8097e53eaba2 ("ACPI/IORT: Use helper functions to access
> dev->iommu_fwspec") changed by mistake the iort_fwspec_iommu_ops() stub
> definition (compiled in when CONFIG_IOMMU_API=n), that caused the
> following compilation failure:
> 
> drivers/acpi/arm64/iort.c:880:1: error: expected identifier or
> '(' before '{' token
>  { return NULL; }
>  ^
> drivers/acpi/arm64/iort.c:879:39: warning: 'iort_fwspec_iommu_ops'
> used but never defined
>  static inline const struct iommu_ops *iort_fwspec_iommu_ops(struct device *dev);
>                                        ^~~~~~~~~~~~~~~~~~~~~
> 
> Fix it.
> 
> Fixes: 8097e53eaba2 ("ACPI/IORT: Use helper functions to access dev->iommu_fwspec")
> Signed-off-by: Qian Cai <cai@lca.pw>
> [lorenzo.pieralisi@arm.com: updated tags and log]
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Acked-by: Hanjun Guo <hanjun.guo@linaro.org>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Sudeep Holla <sudeep.holla@arm.com>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Joerg Roedel <jroedel@suse.de>

Applied to iommu/fixes, thanks.
Will Deacon - Jan. 11, 2019, 11:36 a.m.
On Fri, Jan 11, 2019 at 12:33:08PM +0100, Joerg Roedel wrote:
> On Mon, Jan 07, 2019 at 04:42:07PM +0000, Lorenzo Pieralisi wrote:
> > From: Qian Cai <cai@lca.pw>
> > 
> > Commit 8097e53eaba2 ("ACPI/IORT: Use helper functions to access
> > dev->iommu_fwspec") changed by mistake the iort_fwspec_iommu_ops() stub
> > definition (compiled in when CONFIG_IOMMU_API=n), that caused the
> > following compilation failure:
> > 
> > drivers/acpi/arm64/iort.c:880:1: error: expected identifier or
> > '(' before '{' token
> >  { return NULL; }
> >  ^
> > drivers/acpi/arm64/iort.c:879:39: warning: 'iort_fwspec_iommu_ops'
> > used but never defined
> >  static inline const struct iommu_ops *iort_fwspec_iommu_ops(struct device *dev);
> >                                        ^~~~~~~~~~~~~~~~~~~~~
> > 
> > Fix it.
> > 
> > Fixes: 8097e53eaba2 ("ACPI/IORT: Use helper functions to access dev->iommu_fwspec")
> > Signed-off-by: Qian Cai <cai@lca.pw>
> > [lorenzo.pieralisi@arm.com: updated tags and log]
> > Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> > Acked-by: Hanjun Guo <hanjun.guo@linaro.org>
> > Cc: Will Deacon <will.deacon@arm.com>
> > Cc: Sudeep Holla <sudeep.holla@arm.com>
> > Cc: Catalin Marinas <catalin.marinas@arm.com>
> > Cc: Joerg Roedel <jroedel@suse.de>
> 
> Applied to iommu/fixes, thanks.

I've already got this one in arm64 for-next/fixes (should be in linux-next
already). Would you prefer me to drop it (which would mean a rebase :()? I
was planning to send a pull later today, since I have some other fixes
queued as well.

Will
Joerg Roedel - Jan. 11, 2019, 12:08 p.m.
Hi Will,

On Fri, Jan 11, 2019 at 11:36:52AM +0000, Will Deacon wrote:
> I've already got this one in arm64 for-next/fixes (should be in linux-next
> already). Would you prefer me to drop it (which would mean a rebase :()? I
> was planning to send a pull later today, since I have some other fixes
> queued as well.

Ah okay, didn't check linux-next, just linus/master. Keep it in your
tree, I'll drop it from my branch. It is not pushed yet anywhere public,
so it's easy for me to do.

Thanks,

	Joerg
Will Deacon - Jan. 11, 2019, 12:29 p.m.
On Fri, Jan 11, 2019 at 01:08:59PM +0100, Joerg Roedel wrote:
> Hi Will,
> 
> On Fri, Jan 11, 2019 at 11:36:52AM +0000, Will Deacon wrote:
> > I've already got this one in arm64 for-next/fixes (should be in linux-next
> > already). Would you prefer me to drop it (which would mean a rebase :()? I
> > was planning to send a pull later today, since I have some other fixes
> > queued as well.
> 
> Ah okay, didn't check linux-next, just linus/master. Keep it in your
> tree, I'll drop it from my branch. It is not pushed yet anywhere public,
> so it's easy for me to do.

Thanks Joerg, that keeps things simple! Should land in -rc2.

Will

Patch

diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
index fdd90ffceb85..5d29783ee5bd 100644
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@ -876,7 +876,7 @@  int iort_iommu_msi_get_resv_regions(struct device *dev, struct list_head *head)
 	return (resv == its->its_count) ? resv : -ENODEV;
 }
 #else
-static inline const struct iommu_ops *iort_fwspec_iommu_ops(struct device *dev);
+static inline const struct iommu_ops *iort_fwspec_iommu_ops(struct device *dev)
 { return NULL; }
 static inline int iort_add_device_replay(const struct iommu_ops *ops,
 					 struct device *dev)