linux-kernel - Re: [PATCH] ACPI/IORT: fix build regression without IOMMU

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170810142430.GA17205@red-moon>
Date:   Thu, 10 Aug 2017 15:24:30 +0100
From:   Lorenzo Pieralisi <lorenzo.pieralisi@....com>
To:     Arnd Bergmann <arnd@...db.de>
Cc:     Hanjun Guo <hanjun.guo@...aro.org>,
        Sudeep Holla <sudeep.holla@....com>,
        "Rafael J. Wysocki" <rjw@...ysocki.net>,
        Len Brown <lenb@...nel.org>, Will Deacon <will.deacon@....com>,
        Tomasz Nowicki <tn@...ihalf.com>,
        Joerg Roedel <jroedel@...e.de>,
        Sricharan R <sricharan@...eaurora.org>,
        Robin Murphy <robin.murphy@....com>,
        Geetha Sowjanya <geethasowjanya.akula@...ium.com>,
        linux-acpi@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] ACPI/IORT: fix build regression without IOMMU

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@...db.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
>