From: Greg Kroah-Hartman Date: Fri, 4 Jul 2025 08:59:08 +0000 (+0200) Subject: drop revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch from all queues X-Git-Tag: v6.1.143~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cdd8bb3960d7d089ae4eaa52d0677b9c37684e1;p=thirdparty%2Fkernel%2Fstable-queue.git drop revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch from all queues --- diff --git a/queue-5.10/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch b/queue-5.10/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch deleted file mode 100644 index bdc047a771..0000000000 --- a/queue-5.10/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch +++ /dev/null @@ -1,60 +0,0 @@ -From a3781804b1b026f31e5fcd07f7a2a2b564d71c6a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Apr 2025 11:24:21 +0200 -Subject: Revert "iommu/amd: Prevent binding other PCI drivers to IOMMU PCI - devices" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Lukas Wunner - -[ Upstream commit 3be5fa236649da6404f1bca1491bf02d4b0d5cce ] - -Commit 991de2e59090 ("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: - -* 8affb487d4a4 ("x86/PCI: Don't alloc pcibios-irq when MSI is enabled") -* cbbc00be2ce3 ("iommu/amd: Prevent binding other PCI drivers to IOMMU PCI devices") - -The breaking change and one of these two fixes were subsequently reverted: - -* fe25d078874f ("Revert "x86/PCI: Don't alloc pcibios-irq when MSI is enabled"") -* 6c777e8799a9 ("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 -Signed-off-by: Bjorn Helgaas -Signed-off-by: Krzysztof Wilczyński -Acked-by: Joerg Roedel -Link: https://patch.msgid.link/9a3ddff5cc49512044f963ba0904347bd404094d.1745572340.git.lukas@wunner.de -Signed-off-by: Sasha Levin ---- - drivers/iommu/amd/init.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c -index e09391ab3deb0..752edbf529f5f 100644 ---- a/drivers/iommu/amd/init.c -+++ b/drivers/iommu/amd/init.c -@@ -1876,9 +1876,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; - --- -2.39.5 - diff --git a/queue-5.10/series b/queue-5.10/series index f9c3f9fed4..de26ed04d6 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -4,7 +4,6 @@ mailbox-not-protect-module_put-with-spin_lock_irqsav.patch mfd-max14577-fix-wakeup-source-leaks-on-device-unbin.patch leds-multicolor-fix-intensity-setting-while-sw-blink.patch hwmon-pmbus-max34440-fix-support-for-max34451.patch -revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch dmaengine-xilinx_dma-set-dma_device-directions.patch md-md-bitmap-fix-dm-raid-max_write_behind-setting.patch bcache-fix-null-pointer-in-cache_set_flush.patch diff --git a/queue-5.15/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch b/queue-5.15/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch deleted file mode 100644 index 66b190269e..0000000000 --- a/queue-5.15/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 941edc8cdffaac06c9f8339aead66417cec250fe Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Apr 2025 11:24:21 +0200 -Subject: Revert "iommu/amd: Prevent binding other PCI drivers to IOMMU PCI - devices" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Lukas Wunner - -[ Upstream commit 3be5fa236649da6404f1bca1491bf02d4b0d5cce ] - -Commit 991de2e59090 ("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: - -* 8affb487d4a4 ("x86/PCI: Don't alloc pcibios-irq when MSI is enabled") -* cbbc00be2ce3 ("iommu/amd: Prevent binding other PCI drivers to IOMMU PCI devices") - -The breaking change and one of these two fixes were subsequently reverted: - -* fe25d078874f ("Revert "x86/PCI: Don't alloc pcibios-irq when MSI is enabled"") -* 6c777e8799a9 ("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 -Signed-off-by: Bjorn Helgaas -Signed-off-by: Krzysztof Wilczyński -Acked-by: Joerg Roedel -Link: https://patch.msgid.link/9a3ddff5cc49512044f963ba0904347bd404094d.1745572340.git.lukas@wunner.de -Signed-off-by: Sasha Levin ---- - drivers/iommu/amd/init.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c -index b6ee83b81d32c..625ff2486982d 100644 ---- a/drivers/iommu/amd/init.c -+++ b/drivers/iommu/amd/init.c -@@ -1870,9 +1870,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; - --- -2.39.5 - diff --git a/queue-5.15/series b/queue-5.15/series index 55370c2cdd..df8221c51e 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -6,7 +6,6 @@ mfd-max14577-fix-wakeup-source-leaks-on-device-unbin.patch leds-multicolor-fix-intensity-setting-while-sw-blink.patch hwmon-pmbus-max34440-fix-support-for-max34451.patch ksmbd-allow-a-filename-to-contain-special-characters.patch -revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch dmaengine-xilinx_dma-set-dma_device-directions.patch md-md-bitmap-fix-dm-raid-max_write_behind-setting.patch bcache-fix-null-pointer-in-cache_set_flush.patch diff --git a/queue-5.4/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch b/queue-5.4/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch deleted file mode 100644 index 95674bea11..0000000000 --- a/queue-5.4/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch +++ /dev/null @@ -1,60 +0,0 @@ -From cf8fe36abb607d8519a20f73ab58e1c7fdae26de Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Apr 2025 11:24:21 +0200 -Subject: Revert "iommu/amd: Prevent binding other PCI drivers to IOMMU PCI - devices" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Lukas Wunner - -[ Upstream commit 3be5fa236649da6404f1bca1491bf02d4b0d5cce ] - -Commit 991de2e59090 ("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: - -* 8affb487d4a4 ("x86/PCI: Don't alloc pcibios-irq when MSI is enabled") -* cbbc00be2ce3 ("iommu/amd: Prevent binding other PCI drivers to IOMMU PCI devices") - -The breaking change and one of these two fixes were subsequently reverted: - -* fe25d078874f ("Revert "x86/PCI: Don't alloc pcibios-irq when MSI is enabled"") -* 6c777e8799a9 ("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 -Signed-off-by: Bjorn Helgaas -Signed-off-by: Krzysztof Wilczyński -Acked-by: Joerg Roedel -Link: https://patch.msgid.link/9a3ddff5cc49512044f963ba0904347bd404094d.1745572340.git.lukas@wunner.de -Signed-off-by: Sasha Levin ---- - drivers/iommu/amd_iommu_init.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c -index de29512c75ccc..cd17deeedf349 100644 ---- a/drivers/iommu/amd_iommu_init.c -+++ b/drivers/iommu/amd_iommu_init.c -@@ -1751,9 +1751,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; - --- -2.39.5 - diff --git a/queue-5.4/series b/queue-5.4/series index 4ba758a7c8..838783f57f 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -1,7 +1,6 @@ cifs-fix-cifs_query_path_info-for-windows-nt-servers.patch mailbox-not-protect-module_put-with-spin_lock_irqsav.patch mfd-max14577-fix-wakeup-source-leaks-on-device-unbin.patch -revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch dmaengine-xilinx_dma-set-dma_device-directions.patch md-md-bitmap-fix-dm-raid-max_write_behind-setting.patch iio-pressure-zpa2326-use-aligned_s64-for-the-timesta.patch diff --git a/queue-6.1/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch b/queue-6.1/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch deleted file mode 100644 index 8175d0db31..0000000000 --- a/queue-6.1/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch +++ /dev/null @@ -1,60 +0,0 @@ -From b65812bf9e3a32d4f65dcc9e233e00956614d37a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Apr 2025 11:24:21 +0200 -Subject: Revert "iommu/amd: Prevent binding other PCI drivers to IOMMU PCI - devices" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Lukas Wunner - -[ Upstream commit 3be5fa236649da6404f1bca1491bf02d4b0d5cce ] - -Commit 991de2e59090 ("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: - -* 8affb487d4a4 ("x86/PCI: Don't alloc pcibios-irq when MSI is enabled") -* cbbc00be2ce3 ("iommu/amd: Prevent binding other PCI drivers to IOMMU PCI devices") - -The breaking change and one of these two fixes were subsequently reverted: - -* fe25d078874f ("Revert "x86/PCI: Don't alloc pcibios-irq when MSI is enabled"") -* 6c777e8799a9 ("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 -Signed-off-by: Bjorn Helgaas -Signed-off-by: Krzysztof Wilczyński -Acked-by: Joerg Roedel -Link: https://patch.msgid.link/9a3ddff5cc49512044f963ba0904347bd404094d.1745572340.git.lukas@wunner.de -Signed-off-by: Sasha Levin ---- - drivers/iommu/amd/init.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c -index bc78e86655516..02e3167b02717 100644 ---- a/drivers/iommu/amd/init.c -+++ b/drivers/iommu/amd/init.c -@@ -2053,9 +2053,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; - --- -2.39.5 - diff --git a/queue-6.1/series b/queue-6.1/series index d6b19f7dc0..7f3e70402a 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -9,7 +9,6 @@ nfsv4-xattr-handlers-should-check-for-absent-nfs-fil.patch hwmon-pmbus-max34440-fix-support-for-max34451.patch ksmbd-allow-a-filename-to-contain-special-characters.patch rust-module-place-cleanup_module-in-.exit.text-secti.patch -revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch dmaengine-xilinx_dma-set-dma_device-directions.patch pci-apple-fix-missing-of-node-reference-in-apple_pci.patch md-md-bitmap-fix-dm-raid-max_write_behind-setting.patch diff --git a/queue-6.12/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch b/queue-6.12/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch deleted file mode 100644 index 83daa837db..0000000000 --- a/queue-6.12/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch +++ /dev/null @@ -1,60 +0,0 @@ -From d23d8cf41c53264e01db904e59b8170aa2795969 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Apr 2025 11:24:21 +0200 -Subject: Revert "iommu/amd: Prevent binding other PCI drivers to IOMMU PCI - devices" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Lukas Wunner - -[ Upstream commit 3be5fa236649da6404f1bca1491bf02d4b0d5cce ] - -Commit 991de2e59090 ("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: - -* 8affb487d4a4 ("x86/PCI: Don't alloc pcibios-irq when MSI is enabled") -* cbbc00be2ce3 ("iommu/amd: Prevent binding other PCI drivers to IOMMU PCI devices") - -The breaking change and one of these two fixes were subsequently reverted: - -* fe25d078874f ("Revert "x86/PCI: Don't alloc pcibios-irq when MSI is enabled"") -* 6c777e8799a9 ("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 -Signed-off-by: Bjorn Helgaas -Signed-off-by: Krzysztof Wilczyński -Acked-by: Joerg Roedel -Link: https://patch.msgid.link/9a3ddff5cc49512044f963ba0904347bd404094d.1745572340.git.lukas@wunner.de -Signed-off-by: Sasha Levin ---- - drivers/iommu/amd/init.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c -index ff11cd7e5c068..b8b10140d41b2 100644 ---- a/drivers/iommu/amd/init.c -+++ b/drivers/iommu/amd/init.c -@@ -2026,9 +2026,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; - --- -2.39.5 - diff --git a/queue-6.12/series b/queue-6.12/series index 2da459ee6f..2d11a45298 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -17,7 +17,6 @@ ksmbd-allow-a-filename-to-contain-special-characters.patch ksmbd-provide-zero-as-a-unique-id-to-the-mac-client.patch rust-module-place-cleanup_module-in-.exit.text-secti.patch rust-arm-fix-unknown-to-clang-argument-mno-fdpic.patch -revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch dmaengine-idxd-check-availability-of-workqueue-alloc.patch dmaengine-xilinx_dma-set-dma_device-directions.patch pci-dwc-make-link-training-more-robust-by-setting-po.patch diff --git a/queue-6.15/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch b/queue-6.15/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch deleted file mode 100644 index c593f4f2d7..0000000000 --- a/queue-6.15/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch +++ /dev/null @@ -1,60 +0,0 @@ -From dc9201183da1397962428249e42c7f7233afbfba Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Apr 2025 11:24:21 +0200 -Subject: Revert "iommu/amd: Prevent binding other PCI drivers to IOMMU PCI - devices" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Lukas Wunner - -[ Upstream commit 3be5fa236649da6404f1bca1491bf02d4b0d5cce ] - -Commit 991de2e59090 ("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: - -* 8affb487d4a4 ("x86/PCI: Don't alloc pcibios-irq when MSI is enabled") -* cbbc00be2ce3 ("iommu/amd: Prevent binding other PCI drivers to IOMMU PCI devices") - -The breaking change and one of these two fixes were subsequently reverted: - -* fe25d078874f ("Revert "x86/PCI: Don't alloc pcibios-irq when MSI is enabled"") -* 6c777e8799a9 ("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 -Signed-off-by: Bjorn Helgaas -Signed-off-by: Krzysztof Wilczyński -Acked-by: Joerg Roedel -Link: https://patch.msgid.link/9a3ddff5cc49512044f963ba0904347bd404094d.1745572340.git.lukas@wunner.de -Signed-off-by: Sasha Levin ---- - drivers/iommu/amd/init.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c -index 14aa0d77df26d..f9037dad53f31 100644 ---- a/drivers/iommu/amd/init.c -+++ b/drivers/iommu/amd/init.c -@@ -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; - --- -2.39.5 - diff --git a/queue-6.15/series b/queue-6.15/series index 1144789949..719b3c07c7 100644 --- a/queue-6.15/series +++ b/queue-6.15/series @@ -23,7 +23,6 @@ ksmbd-allow-a-filename-to-contain-special-characters.patch ksmbd-provide-zero-as-a-unique-id-to-the-mac-client.patch rust-module-place-cleanup_module-in-.exit.text-secti.patch rust-arm-fix-unknown-to-clang-argument-mno-fdpic.patch -revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch dmaengine-idxd-check-availability-of-workqueue-alloc.patch dmaengine-xilinx_dma-set-dma_device-directions.patch pci-dwc-make-link-training-more-robust-by-setting-po.patch diff --git a/queue-6.6/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch b/queue-6.6/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch deleted file mode 100644 index 8e132b8e55..0000000000 --- a/queue-6.6/revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 7a16f337cb396f3e1418c12ba5e9073baa434b08 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Apr 2025 11:24:21 +0200 -Subject: Revert "iommu/amd: Prevent binding other PCI drivers to IOMMU PCI - devices" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Lukas Wunner - -[ Upstream commit 3be5fa236649da6404f1bca1491bf02d4b0d5cce ] - -Commit 991de2e59090 ("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: - -* 8affb487d4a4 ("x86/PCI: Don't alloc pcibios-irq when MSI is enabled") -* cbbc00be2ce3 ("iommu/amd: Prevent binding other PCI drivers to IOMMU PCI devices") - -The breaking change and one of these two fixes were subsequently reverted: - -* fe25d078874f ("Revert "x86/PCI: Don't alloc pcibios-irq when MSI is enabled"") -* 6c777e8799a9 ("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 -Signed-off-by: Bjorn Helgaas -Signed-off-by: Krzysztof Wilczyński -Acked-by: Joerg Roedel -Link: https://patch.msgid.link/9a3ddff5cc49512044f963ba0904347bd404094d.1745572340.git.lukas@wunner.de -Signed-off-by: Sasha Levin ---- - drivers/iommu/amd/init.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c -index 2e7a12f306510..7296e02e2b849 100644 ---- a/drivers/iommu/amd/init.c -+++ b/drivers/iommu/amd/init.c -@@ -2090,9 +2090,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; - --- -2.39.5 - diff --git a/queue-6.6/series b/queue-6.6/series index 70da8ead90..17aacf1d67 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -14,7 +14,6 @@ hwmon-pmbus-max34440-fix-support-for-max34451.patch ksmbd-allow-a-filename-to-contain-special-characters.patch ksmbd-provide-zero-as-a-unique-id-to-the-mac-client.patch rust-module-place-cleanup_module-in-.exit.text-secti.patch -revert-iommu-amd-prevent-binding-other-pci-drivers-t.patch dmaengine-idxd-check-availability-of-workqueue-alloc.patch dmaengine-xilinx_dma-set-dma_device-directions.patch pci-dwc-make-link-training-more-robust-by-setting-po.patch