Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1708564 > unrolled thread

[PATCH] ACPI/IORT: fix build regression without IOMMU

Started byArnd Bergmann <arnd@arndb.de>
First post2017-08-10 14:30 +0200
Last post2017-08-10 16:30 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] ACPI/IORT: fix build regression without IOMMU Arnd Bergmann <arnd@arndb.de> - 2017-08-10 14:30 +0200
    Re: [PATCH] ACPI/IORT: fix build regression without IOMMU Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> - 2017-08-10 16:30 +0200

#1708564 — [PATCH] ACPI/IORT: fix build regression without IOMMU

FromArnd Bergmann <arnd@arndb.de>
Date2017-08-10 14:30 +0200
Subject[PATCH] ACPI/IORT: fix build regression without IOMMU
Message-ID<ucUL8-5wC-29@gated-at.bofh.it>
A recent change reintroduced a bug that had previously been
fixed by commit d49f2dedf33b ("ACPI/IORT: Fix CONFIG_IOMMU_API
dependency"):

drivers/acpi/arm64/iort.c: In function 'iort_iommu_configure':
drivers/acpi/arm64/iort.c:829:26: error: 'struct iommu_fwspec' has no member named 'ops'

This does the same change again, replacing another direct
reference to iommu_fwspec->ops with a helper function call.

Fixes: bc8648d49a95 ("ACPI/IORT: Handle PCI aliases properly for IOMMUs")
Signed-off-by: Arnd Bergmann <arnd@arndb.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 9cdd49289786..9565d572f8dd 100644
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@ -826,7 +826,7 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev)
 	 * add_device callback for dev, replay it to get things in order.
 	 */
 	if (!err) {
-		ops = dev->iommu_fwspec->ops;
+		ops = iort_fwspec_iommu_ops(dev->iommu_fwspec);
 		err = iort_add_device_replay(ops, dev);
 	}
 
-- 
2.9.0

[toc] | [next] | [standalone]


#1708672

FromLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Date2017-08-10 16:30 +0200
Message-ID<ucWDf-6RR-3@gated-at.bofh.it>
In reply to#1708564
On Thu, Aug 10, 2017 at 02:11:00PM +0200, Arnd Bergmann wrote:
> A recent change reintroduced a bug that had previously been
> fixed by commit d49f2dedf33b ("ACPI/IORT: Fix CONFIG_IOMMU_API
> dependency"):
> 
> drivers/acpi/arm64/iort.c: In function 'iort_iommu_configure':
> drivers/acpi/arm64/iort.c:829:26: error: 'struct iommu_fwspec' has no member named 'ops'
> 
> This does the same change again, replacing another direct
> reference to iommu_fwspec->ops with a helper function call.
> 
> Fixes: bc8648d49a95 ("ACPI/IORT: Handle PCI aliases properly for IOMMUs")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/acpi/arm64/iort.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Sorry Arnd, thanks, I will send it to Catalin straight away.

Lorenzo

> diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
> index 9cdd49289786..9565d572f8dd 100644
> --- a/drivers/acpi/arm64/iort.c
> +++ b/drivers/acpi/arm64/iort.c
> @@ -826,7 +826,7 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev)
>  	 * add_device callback for dev, replay it to get things in order.
>  	 */
>  	if (!err) {
> -		ops = dev->iommu_fwspec->ops;
> +		ops = iort_fwspec_iommu_ops(dev->iommu_fwspec);
>  		err = iort_add_device_replay(ops, dev);
>  	}
>  
> -- 
> 2.9.0
> 

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web