linux-kernel - Re: linux-next: build failure after merge of the pci tree

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] [day] [month] [year] [list]

Message-ID: <20160426100548.GM3886@suse.de>
Date:	Tue, 26 Apr 2016 12:05:48 +0200
From:	Joerg Roedel <jroedel@...e.de>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Bjorn Helgaas <bhelgaas@...gle.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Jacek Lawrynowicz <jacek.lawrynowicz@...el.com>
Subject: Re: linux-next: build failure after merge of the pci tree

On Tue, Apr 26, 2016 at 11:13:46AM +1000, Stephen Rothwell wrote:
> diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
> index 5efadad4615b..3839fd2865a6 100644
> --- a/drivers/iommu/amd_iommu.c
> +++ b/drivers/iommu/amd_iommu.c
> @@ -263,8 +263,7 @@ static u16 get_alias(struct device *dev)
>  	 */
>  	if (pci_alias == devid &&
>  	    PCI_BUS_NUM(ivrs_alias) == pdev->bus->number) {
> -		pdev->dev_flags |= PCI_DEV_FLAGS_DMA_ALIAS_DEVFN;
> -		pdev->dma_alias_devfn = ivrs_alias & 0xff;
> +		pci_add_dma_alias(pdev, ivrs_alias & 0xff);
>  		pr_info("AMD-Vi: Added PCI DMA alias %02x.%d for %s\n",
>  			PCI_SLOT(ivrs_alias), PCI_FUNC(ivrs_alias),
>  			dev_name(dev));

That is exactly the right fix, thanks Stephen. I'll work out how to fix
this in the iommu tree.


	Joerg