* [PATCH] ACPI/IORT: Fix build when CONFIG_IOMMU_API=n
@ 2019-01-07 16:42 Lorenzo Pieralisi
2019-01-11 11:33 ` Joerg Roedel
0 siblings, 1 reply; 5+ messages in thread
From: Lorenzo Pieralisi @ 2019-01-07 16:42 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Lorenzo Pieralisi, Catalin Marinas, Will Deacon, linux-acpi,
Joerg Roedel, Qian Cai, Hanjun Guo, Sudeep Holla
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(-)
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)
--
2.19.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] ACPI/IORT: Fix build when CONFIG_IOMMU_API=n
2019-01-07 16:42 [PATCH] ACPI/IORT: Fix build when CONFIG_IOMMU_API=n Lorenzo Pieralisi
@ 2019-01-11 11:33 ` Joerg Roedel
2019-01-11 11:36 ` Will Deacon
0 siblings, 1 reply; 5+ messages in thread
From: Joerg Roedel @ 2019-01-11 11:33 UTC (permalink / raw)
To: Lorenzo Pieralisi
Cc: Catalin Marinas, Will Deacon, linux-acpi, Qian Cai, Hanjun Guo,
Sudeep Holla, linux-arm-kernel
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.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ACPI/IORT: Fix build when CONFIG_IOMMU_API=n
2019-01-11 11:33 ` Joerg Roedel
@ 2019-01-11 11:36 ` Will Deacon
2019-01-11 12:08 ` Joerg Roedel
0 siblings, 1 reply; 5+ messages in thread
From: Will Deacon @ 2019-01-11 11:36 UTC (permalink / raw)
To: Joerg Roedel
Cc: Lorenzo Pieralisi, Catalin Marinas, linux-acpi, Qian Cai,
Hanjun Guo, Sudeep Holla, linux-arm-kernel
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ACPI/IORT: Fix build when CONFIG_IOMMU_API=n
2019-01-11 11:36 ` Will Deacon
@ 2019-01-11 12:08 ` Joerg Roedel
2019-01-11 12:29 ` Will Deacon
0 siblings, 1 reply; 5+ messages in thread
From: Joerg Roedel @ 2019-01-11 12:08 UTC (permalink / raw)
To: Will Deacon
Cc: Lorenzo Pieralisi, Catalin Marinas, linux-acpi, Qian Cai,
Hanjun Guo, Sudeep Holla, linux-arm-kernel
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ACPI/IORT: Fix build when CONFIG_IOMMU_API=n
2019-01-11 12:08 ` Joerg Roedel
@ 2019-01-11 12:29 ` Will Deacon
0 siblings, 0 replies; 5+ messages in thread
From: Will Deacon @ 2019-01-11 12:29 UTC (permalink / raw)
To: Joerg Roedel
Cc: Lorenzo Pieralisi, Catalin Marinas, linux-acpi, Qian Cai,
Hanjun Guo, Sudeep Holla, linux-arm-kernel
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-01-11 12:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-07 16:42 [PATCH] ACPI/IORT: Fix build when CONFIG_IOMMU_API=n Lorenzo Pieralisi
2019-01-11 11:33 ` Joerg Roedel
2019-01-11 11:36 ` Will Deacon
2019-01-11 12:08 ` Joerg Roedel
2019-01-11 12:29 ` Will Deacon
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).