mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
Revert "iommu/amd: Prevent binding other PCI drivers to IOMMU PCI devices"
Commit991de2e590
("PCI, x86: Implement pcibios_alloc_irq() and pcibios_free_irq()") changed IRQ handling on PCI driver probing. It inadvertently broke resume from system sleep on AMD platforms: https://lore.kernel.org/r/20150926164651.GA3640@pd.tnic/ This was fixed by two independent commits: *8affb487d4
("x86/PCI: Don't alloc pcibios-irq when MSI is enabled") *cbbc00be2c
("iommu/amd: Prevent binding other PCI drivers to IOMMU PCI devices") The breaking change and one of these two fixes were subsequently reverted: *fe25d07887
("Revert "x86/PCI: Don't alloc pcibios-irq when MSI is enabled"") *6c777e8799
("Revert "PCI, x86: Implement pcibios_alloc_irq() and pcibios_free_irq()"") This rendered the second fix unnecessary, so revert it as well. It used the match_driver flag in struct pci_dev, which is internal to the PCI core and not supposed to be touched by arbitrary drivers. Signed-off-by: Lukas Wunner <lukas@wunner.de> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org> Acked-by: Joerg Roedel <jroedel@suse.de> Link: https://patch.msgid.link/9a3ddff5cc49512044f963ba0904347bd404094d.1745572340.git.lukas@wunner.de
This commit is contained in:
parent
d24eba726a
commit
3be5fa2366
1 changed files with 0 additions and 3 deletions
|
@ -2030,9 +2030,6 @@ static int __init iommu_init_pci(struct amd_iommu *iommu)
|
|||
if (!iommu->dev)
|
||||
return -ENODEV;
|
||||
|
||||
/* Prevent binding other PCI device drivers to IOMMU devices */
|
||||
iommu->dev->match_driver = false;
|
||||
|
||||
/* ACPI _PRT won't have an IRQ for IOMMU */
|
||||
iommu->dev->irq_managed = 1;
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue