From: Greg Kroah-Hartman Date: Tue, 29 Apr 2025 06:40:29 +0000 (+0200) Subject: drop some patches on request X-Git-Tag: v5.4.293~44 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=049f27eb0e76c0271fc3dd2ced097d553861ef68;p=thirdparty%2Fkernel%2Fstable-queue.git drop some patches on request --- diff --git a/queue-5.10/series b/queue-5.10/series index 0f56df788d..d01ff2306b 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -260,7 +260,6 @@ mips-cm-detect-cm-quirks-from-device-tree.patch crypto-null-use-spin-lock-instead-of-mutex.patch clk-check-for-disabled-clock-provider-in-of_clk_get_.patch parisc-pdt-fix-missing-prototype-warning.patch -x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch usb-host-max3421-hcd-add-missing-spi_device_id-table.patch dmaengine-dmatest-fix-dmatest-waiting-less-when-inte.patch usb-gadget-aspeed-add-null-pointer-check-in-ast_vhub.patch diff --git a/queue-5.10/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch b/queue-5.10/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch deleted file mode 100644 index 0ba16dfe21..0000000000 --- a/queue-5.10/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 1e25e95318efbe250757b4da20f177a50ac0c3ea Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 21 Mar 2025 21:48:48 +0100 -Subject: x86/Kconfig: Make CONFIG_PCI_CNB20LE_QUIRK depend on X86_32 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Mateusz Jończyk - -[ Upstream commit d9f87802676bb23b9425aea8ad95c76ad9b50c6e ] - -I was unable to find a good description of the ServerWorks CNB20LE -chipset. However, it was probably exclusively used with the Pentium III -processor (this CPU model was used in all references to it that I -found where the CPU model was provided: dmesgs in [1] and [2]; -[3] page 2; [4]-[7]). - -As is widely known, the Pentium III processor did not support the 64-bit -mode, support for which was introduced by Intel a couple of years later. -So it is safe to assume that no systems with the CNB20LE chipset have -amd64 and the CONFIG_PCI_CNB20LE_QUIRK may now depend on X86_32. - -Additionally, I have determined that most computers with the CNB20LE -chipset did have ACPI support and this driver was inactive on them. -I have submitted a patch to remove this driver, but it was met with -resistance [8]. - -[1] Jim Studt, Re: Problem with ServerWorks CNB20LE and lost interrupts - Linux Kernel Mailing List, https://lkml.org/lkml/2002/1/11/111 - -[2] RedHat Bug 665109 - e100 problems on old Compaq Proliant DL320 - https://bugzilla.redhat.com/show_bug.cgi?id=665109 - -[3] R. Hughes-Jones, S. Dallison, G. Fairey, Performance Measurements on - Gigabit Ethernet NICs and Server Quality Motherboards, - http://datatag.web.cern.ch/papers/pfldnet2003-rhj.doc - -[4] "Hardware for Linux", - Probe #d6b5151873 of Intel STL2-bd A28808-302 Desktop Computer (STL2) - https://linux-hardware.org/?probe=d6b5151873 - -[5] "Hardware for Linux", Probe #0b5d843f10 of Compaq ProLiant DL380 - https://linux-hardware.org/?probe=0b5d843f10 - -[6] Ubuntu Forums, Dell Poweredge 2400 - Adaptec SCSI Bus AIC-7880 - https://ubuntuforums.org/showthread.php?t=1689552 - -[7] Ira W. Snyder, "BISECTED: 2.6.35 (and -git) fail to boot: APIC problems" - https://lkml.org/lkml/2010/8/13/220 - -[8] Bjorn Helgaas, "Re: [PATCH] x86/pci: drop ServerWorks / Broadcom - CNB20LE PCI host bridge driver" - https://lore.kernel.org/lkml/20220318165535.GA840063@bhelgaas/T/ - -Signed-off-by: Mateusz Jończyk -Signed-off-by: David Heideberg -Signed-off-by: Ingo Molnar -Cc: "H. Peter Anvin" -Cc: Linus Torvalds -Link: https://lore.kernel.org/r/20250321-x86_x2apic-v3-6-b0cbaa6fa338@ixit.cz -Signed-off-by: Sasha Levin ---- - arch/x86/Kconfig | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index 93a1f9937a9bb..f3a7e8fdc83c7 100644 ---- a/arch/x86/Kconfig -+++ b/arch/x86/Kconfig -@@ -2766,13 +2766,21 @@ config MMCONF_FAM10H - depends on X86_64 && PCI_MMCONFIG && ACPI - - config PCI_CNB20LE_QUIRK -- bool "Read CNB20LE Host Bridge Windows" if EXPERT -- depends on PCI -+ bool "Read PCI host bridge windows from the CNB20LE chipset" if EXPERT -+ depends on X86_32 && PCI - help - Read the PCI windows out of the CNB20LE host bridge. This allows - PCI hotplug to work on systems with the CNB20LE chipset which do - not have ACPI. - -+ The ServerWorks (later Broadcom) CNB20LE was a chipset designed -+ most probably only for Pentium III. -+ -+ To find out if you have such a chipset, search for a PCI device with -+ 1166:0009 PCI IDs, for example by executing -+ lspci -nn | grep '1166:0009' -+ The code is inactive if there is none. -+ - There's no public spec for this chipset, and this functionality - is known to be incomplete. - --- -2.39.5 - diff --git a/queue-5.15/series b/queue-5.15/series index 9a6fde626c..f4873349a5 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -326,7 +326,6 @@ clk-check-for-disabled-clock-provider-in-of_clk_get_.patch parisc-pdt-fix-missing-prototype-warning.patch s390-sclp-add-check-for-get_zeroed_page.patch s390-tty-fix-a-potential-memory-leak-bug.patch -x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch usb-host-max3421-hcd-add-missing-spi_device_id-table.patch fs-ntfs3-fix-warning-in-ntfs_extend_initialized_size.patch usb-dwc3-gadget-avoid-using-reserved-endpoints-on-in.patch diff --git a/queue-5.15/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch b/queue-5.15/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch deleted file mode 100644 index 2d188054aa..0000000000 --- a/queue-5.15/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 458227fd473ec852861996f300151ad1118bc4a4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 21 Mar 2025 21:48:48 +0100 -Subject: x86/Kconfig: Make CONFIG_PCI_CNB20LE_QUIRK depend on X86_32 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Mateusz Jończyk - -[ Upstream commit d9f87802676bb23b9425aea8ad95c76ad9b50c6e ] - -I was unable to find a good description of the ServerWorks CNB20LE -chipset. However, it was probably exclusively used with the Pentium III -processor (this CPU model was used in all references to it that I -found where the CPU model was provided: dmesgs in [1] and [2]; -[3] page 2; [4]-[7]). - -As is widely known, the Pentium III processor did not support the 64-bit -mode, support for which was introduced by Intel a couple of years later. -So it is safe to assume that no systems with the CNB20LE chipset have -amd64 and the CONFIG_PCI_CNB20LE_QUIRK may now depend on X86_32. - -Additionally, I have determined that most computers with the CNB20LE -chipset did have ACPI support and this driver was inactive on them. -I have submitted a patch to remove this driver, but it was met with -resistance [8]. - -[1] Jim Studt, Re: Problem with ServerWorks CNB20LE and lost interrupts - Linux Kernel Mailing List, https://lkml.org/lkml/2002/1/11/111 - -[2] RedHat Bug 665109 - e100 problems on old Compaq Proliant DL320 - https://bugzilla.redhat.com/show_bug.cgi?id=665109 - -[3] R. Hughes-Jones, S. Dallison, G. Fairey, Performance Measurements on - Gigabit Ethernet NICs and Server Quality Motherboards, - http://datatag.web.cern.ch/papers/pfldnet2003-rhj.doc - -[4] "Hardware for Linux", - Probe #d6b5151873 of Intel STL2-bd A28808-302 Desktop Computer (STL2) - https://linux-hardware.org/?probe=d6b5151873 - -[5] "Hardware for Linux", Probe #0b5d843f10 of Compaq ProLiant DL380 - https://linux-hardware.org/?probe=0b5d843f10 - -[6] Ubuntu Forums, Dell Poweredge 2400 - Adaptec SCSI Bus AIC-7880 - https://ubuntuforums.org/showthread.php?t=1689552 - -[7] Ira W. Snyder, "BISECTED: 2.6.35 (and -git) fail to boot: APIC problems" - https://lkml.org/lkml/2010/8/13/220 - -[8] Bjorn Helgaas, "Re: [PATCH] x86/pci: drop ServerWorks / Broadcom - CNB20LE PCI host bridge driver" - https://lore.kernel.org/lkml/20220318165535.GA840063@bhelgaas/T/ - -Signed-off-by: Mateusz Jończyk -Signed-off-by: David Heideberg -Signed-off-by: Ingo Molnar -Cc: "H. Peter Anvin" -Cc: Linus Torvalds -Link: https://lore.kernel.org/r/20250321-x86_x2apic-v3-6-b0cbaa6fa338@ixit.cz -Signed-off-by: Sasha Levin ---- - arch/x86/Kconfig | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index de6a66ad3fa62..b0bcdf8add86b 100644 ---- a/arch/x86/Kconfig -+++ b/arch/x86/Kconfig -@@ -2742,13 +2742,21 @@ config MMCONF_FAM10H - depends on X86_64 && PCI_MMCONFIG && ACPI - - config PCI_CNB20LE_QUIRK -- bool "Read CNB20LE Host Bridge Windows" if EXPERT -- depends on PCI -+ bool "Read PCI host bridge windows from the CNB20LE chipset" if EXPERT -+ depends on X86_32 && PCI - help - Read the PCI windows out of the CNB20LE host bridge. This allows - PCI hotplug to work on systems with the CNB20LE chipset which do - not have ACPI. - -+ The ServerWorks (later Broadcom) CNB20LE was a chipset designed -+ most probably only for Pentium III. -+ -+ To find out if you have such a chipset, search for a PCI device with -+ 1166:0009 PCI IDs, for example by executing -+ lspci -nn | grep '1166:0009' -+ The code is inactive if there is none. -+ - There's no public spec for this chipset, and this functionality - is known to be incomplete. - --- -2.39.5 - diff --git a/queue-5.4/series b/queue-5.4/series index 8e268d1c6a..0a7183224f 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -160,7 +160,6 @@ mips-cm-detect-cm-quirks-from-device-tree.patch crypto-null-use-spin-lock-instead-of-mutex.patch clk-check-for-disabled-clock-provider-in-of_clk_get_.patch parisc-pdt-fix-missing-prototype-warning.patch -x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch usb-host-max3421-hcd-add-missing-spi_device_id-table.patch dmaengine-dmatest-fix-dmatest-waiting-less-when-inte.patch usb-gadget-aspeed-add-null-pointer-check-in-ast_vhub.patch diff --git a/queue-5.4/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch b/queue-5.4/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch deleted file mode 100644 index 6fcefcc244..0000000000 --- a/queue-5.4/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch +++ /dev/null @@ -1,97 +0,0 @@ -From e5c38789e5375232651a9fc4372ba3b4ccc61d0a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 21 Mar 2025 21:48:48 +0100 -Subject: x86/Kconfig: Make CONFIG_PCI_CNB20LE_QUIRK depend on X86_32 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Mateusz Jończyk - -[ Upstream commit d9f87802676bb23b9425aea8ad95c76ad9b50c6e ] - -I was unable to find a good description of the ServerWorks CNB20LE -chipset. However, it was probably exclusively used with the Pentium III -processor (this CPU model was used in all references to it that I -found where the CPU model was provided: dmesgs in [1] and [2]; -[3] page 2; [4]-[7]). - -As is widely known, the Pentium III processor did not support the 64-bit -mode, support for which was introduced by Intel a couple of years later. -So it is safe to assume that no systems with the CNB20LE chipset have -amd64 and the CONFIG_PCI_CNB20LE_QUIRK may now depend on X86_32. - -Additionally, I have determined that most computers with the CNB20LE -chipset did have ACPI support and this driver was inactive on them. -I have submitted a patch to remove this driver, but it was met with -resistance [8]. - -[1] Jim Studt, Re: Problem with ServerWorks CNB20LE and lost interrupts - Linux Kernel Mailing List, https://lkml.org/lkml/2002/1/11/111 - -[2] RedHat Bug 665109 - e100 problems on old Compaq Proliant DL320 - https://bugzilla.redhat.com/show_bug.cgi?id=665109 - -[3] R. Hughes-Jones, S. Dallison, G. Fairey, Performance Measurements on - Gigabit Ethernet NICs and Server Quality Motherboards, - http://datatag.web.cern.ch/papers/pfldnet2003-rhj.doc - -[4] "Hardware for Linux", - Probe #d6b5151873 of Intel STL2-bd A28808-302 Desktop Computer (STL2) - https://linux-hardware.org/?probe=d6b5151873 - -[5] "Hardware for Linux", Probe #0b5d843f10 of Compaq ProLiant DL380 - https://linux-hardware.org/?probe=0b5d843f10 - -[6] Ubuntu Forums, Dell Poweredge 2400 - Adaptec SCSI Bus AIC-7880 - https://ubuntuforums.org/showthread.php?t=1689552 - -[7] Ira W. Snyder, "BISECTED: 2.6.35 (and -git) fail to boot: APIC problems" - https://lkml.org/lkml/2010/8/13/220 - -[8] Bjorn Helgaas, "Re: [PATCH] x86/pci: drop ServerWorks / Broadcom - CNB20LE PCI host bridge driver" - https://lore.kernel.org/lkml/20220318165535.GA840063@bhelgaas/T/ - -Signed-off-by: Mateusz Jończyk -Signed-off-by: David Heideberg -Signed-off-by: Ingo Molnar -Cc: "H. Peter Anvin" -Cc: Linus Torvalds -Link: https://lore.kernel.org/r/20250321-x86_x2apic-v3-6-b0cbaa6fa338@ixit.cz -Signed-off-by: Sasha Levin ---- - arch/x86/Kconfig | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index e92b5eb57acd7..75e72d407b9b4 100644 ---- a/arch/x86/Kconfig -+++ b/arch/x86/Kconfig -@@ -2743,13 +2743,21 @@ config MMCONF_FAM10H - depends on X86_64 && PCI_MMCONFIG && ACPI - - config PCI_CNB20LE_QUIRK -- bool "Read CNB20LE Host Bridge Windows" if EXPERT -- depends on PCI -+ bool "Read PCI host bridge windows from the CNB20LE chipset" if EXPERT -+ depends on X86_32 && PCI - help - Read the PCI windows out of the CNB20LE host bridge. This allows - PCI hotplug to work on systems with the CNB20LE chipset which do - not have ACPI. - -+ The ServerWorks (later Broadcom) CNB20LE was a chipset designed -+ most probably only for Pentium III. -+ -+ To find out if you have such a chipset, search for a PCI device with -+ 1166:0009 PCI IDs, for example by executing -+ lspci -nn | grep '1166:0009' -+ The code is inactive if there is none. -+ - There's no public spec for this chipset, and this functionality - is known to be incomplete. - --- -2.39.5 - diff --git a/queue-6.1/hardening-disable-gcc-randstruct-for-compile_test.patch b/queue-6.1/hardening-disable-gcc-randstruct-for-compile_test.patch deleted file mode 100644 index 8ebdd424c1..0000000000 --- a/queue-6.1/hardening-disable-gcc-randstruct-for-compile_test.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3b9668fce3828bbddf4961359124c51d00808507 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 9 Apr 2025 08:11:58 -0700 -Subject: hardening: Disable GCC randstruct for COMPILE_TEST - -From: Kees Cook - -[ Upstream commit f5c68a4e84f9feca3be578199ec648b676db2030 ] - -There is a GCC crash bug in the randstruct for latest GCC versions that -is being tickled by landlock[1]. Temporarily disable GCC randstruct for -COMPILE_TEST builds to unbreak CI systems for the coming -rc2. This can -be restored once the bug is fixed. - -Suggested-by: Mark Brown -Link: https://lore.kernel.org/all/20250407-kbuild-disable-gcc-plugins-v1-1-5d46ae583f5e@kernel.org/ [1] -Acked-by: Mark Brown -Acked-by: Arnd Bergmann -Link: https://lore.kernel.org/r/20250409151154.work.872-kees@kernel.org -Signed-off-by: Kees Cook -Signed-off-by: Sasha Levin ---- - security/Kconfig.hardening | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/security/Kconfig.hardening b/security/Kconfig.hardening -index 0f295961e7736..12e7e836a3f12 100644 ---- a/security/Kconfig.hardening -+++ b/security/Kconfig.hardening -@@ -287,7 +287,7 @@ config CC_HAS_RANDSTRUCT - - choice - prompt "Randomize layout of sensitive kernel structures" -- default RANDSTRUCT_FULL if COMPILE_TEST && (GCC_PLUGINS || CC_HAS_RANDSTRUCT) -+ default RANDSTRUCT_FULL if COMPILE_TEST && CC_HAS_RANDSTRUCT - default RANDSTRUCT_NONE - help - If you enable this, the layouts of structures that are entirely --- -2.39.5 - diff --git a/queue-6.1/series b/queue-6.1/series index 5457d9d85c..b298297970 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -102,7 +102,6 @@ clk-check-for-disabled-clock-provider-in-of_clk_get_.patch parisc-pdt-fix-missing-prototype-warning.patch s390-sclp-add-check-for-get_zeroed_page.patch s390-tty-fix-a-potential-memory-leak-bug.patch -x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch usb-host-max3421-hcd-add-missing-spi_device_id-table.patch fs-ntfs3-fix-warning-in-ntfs_extend_initialized_size.patch usb-dwc3-gadget-refactor-loop-to-avoid-null-endpoint.patch @@ -145,7 +144,6 @@ x86-i8253-call-clockevent_i8253_disable-with-interru.patch loop-aio-inherit-the-ioprio-of-original-request.patch spi-tegra210-quad-use-warn_on_once-instead-of-warn_o.patch spi-tegra210-quad-add-rate-limiting-and-simplify-tim.patch -hardening-disable-gcc-randstruct-for-compile_test.patch ubsan-fix-panic-from-test_ubsan_out_of_bounds.patch md-raid1-add-check-for-missing-source-disk-in-proces.patch spi-spi-imx-add-check-for-spi_imx_setupxfer.patch diff --git a/queue-6.1/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch b/queue-6.1/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch deleted file mode 100644 index 54ef49baa3..0000000000 --- a/queue-6.1/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch +++ /dev/null @@ -1,97 +0,0 @@ -From d072ec1a548db49a88b8e861e8a25bce08206008 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 21 Mar 2025 21:48:48 +0100 -Subject: x86/Kconfig: Make CONFIG_PCI_CNB20LE_QUIRK depend on X86_32 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Mateusz Jończyk - -[ Upstream commit d9f87802676bb23b9425aea8ad95c76ad9b50c6e ] - -I was unable to find a good description of the ServerWorks CNB20LE -chipset. However, it was probably exclusively used with the Pentium III -processor (this CPU model was used in all references to it that I -found where the CPU model was provided: dmesgs in [1] and [2]; -[3] page 2; [4]-[7]). - -As is widely known, the Pentium III processor did not support the 64-bit -mode, support for which was introduced by Intel a couple of years later. -So it is safe to assume that no systems with the CNB20LE chipset have -amd64 and the CONFIG_PCI_CNB20LE_QUIRK may now depend on X86_32. - -Additionally, I have determined that most computers with the CNB20LE -chipset did have ACPI support and this driver was inactive on them. -I have submitted a patch to remove this driver, but it was met with -resistance [8]. - -[1] Jim Studt, Re: Problem with ServerWorks CNB20LE and lost interrupts - Linux Kernel Mailing List, https://lkml.org/lkml/2002/1/11/111 - -[2] RedHat Bug 665109 - e100 problems on old Compaq Proliant DL320 - https://bugzilla.redhat.com/show_bug.cgi?id=665109 - -[3] R. Hughes-Jones, S. Dallison, G. Fairey, Performance Measurements on - Gigabit Ethernet NICs and Server Quality Motherboards, - http://datatag.web.cern.ch/papers/pfldnet2003-rhj.doc - -[4] "Hardware for Linux", - Probe #d6b5151873 of Intel STL2-bd A28808-302 Desktop Computer (STL2) - https://linux-hardware.org/?probe=d6b5151873 - -[5] "Hardware for Linux", Probe #0b5d843f10 of Compaq ProLiant DL380 - https://linux-hardware.org/?probe=0b5d843f10 - -[6] Ubuntu Forums, Dell Poweredge 2400 - Adaptec SCSI Bus AIC-7880 - https://ubuntuforums.org/showthread.php?t=1689552 - -[7] Ira W. Snyder, "BISECTED: 2.6.35 (and -git) fail to boot: APIC problems" - https://lkml.org/lkml/2010/8/13/220 - -[8] Bjorn Helgaas, "Re: [PATCH] x86/pci: drop ServerWorks / Broadcom - CNB20LE PCI host bridge driver" - https://lore.kernel.org/lkml/20220318165535.GA840063@bhelgaas/T/ - -Signed-off-by: Mateusz Jończyk -Signed-off-by: David Heideberg -Signed-off-by: Ingo Molnar -Cc: "H. Peter Anvin" -Cc: Linus Torvalds -Link: https://lore.kernel.org/r/20250321-x86_x2apic-v3-6-b0cbaa6fa338@ixit.cz -Signed-off-by: Sasha Levin ---- - arch/x86/Kconfig | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index 48ab6e8f2d1d4..6da1115e1f0fe 100644 ---- a/arch/x86/Kconfig -+++ b/arch/x86/Kconfig -@@ -2795,13 +2795,21 @@ config MMCONF_FAM10H - depends on X86_64 && PCI_MMCONFIG && ACPI - - config PCI_CNB20LE_QUIRK -- bool "Read CNB20LE Host Bridge Windows" if EXPERT -- depends on PCI -+ bool "Read PCI host bridge windows from the CNB20LE chipset" if EXPERT -+ depends on X86_32 && PCI - help - Read the PCI windows out of the CNB20LE host bridge. This allows - PCI hotplug to work on systems with the CNB20LE chipset which do - not have ACPI. - -+ The ServerWorks (later Broadcom) CNB20LE was a chipset designed -+ most probably only for Pentium III. -+ -+ To find out if you have such a chipset, search for a PCI device with -+ 1166:0009 PCI IDs, for example by executing -+ lspci -nn | grep '1166:0009' -+ The code is inactive if there is none. -+ - There's no public spec for this chipset, and this functionality - is known to be incomplete. - --- -2.39.5 - diff --git a/queue-6.12/hardening-disable-gcc-randstruct-for-compile_test.patch b/queue-6.12/hardening-disable-gcc-randstruct-for-compile_test.patch deleted file mode 100644 index 13a45cc2b2..0000000000 --- a/queue-6.12/hardening-disable-gcc-randstruct-for-compile_test.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0002a16939abdbcc97554ed5d97899483685105b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 9 Apr 2025 08:11:58 -0700 -Subject: hardening: Disable GCC randstruct for COMPILE_TEST - -From: Kees Cook - -[ Upstream commit f5c68a4e84f9feca3be578199ec648b676db2030 ] - -There is a GCC crash bug in the randstruct for latest GCC versions that -is being tickled by landlock[1]. Temporarily disable GCC randstruct for -COMPILE_TEST builds to unbreak CI systems for the coming -rc2. This can -be restored once the bug is fixed. - -Suggested-by: Mark Brown -Link: https://lore.kernel.org/all/20250407-kbuild-disable-gcc-plugins-v1-1-5d46ae583f5e@kernel.org/ [1] -Acked-by: Mark Brown -Acked-by: Arnd Bergmann -Link: https://lore.kernel.org/r/20250409151154.work.872-kees@kernel.org -Signed-off-by: Kees Cook -Signed-off-by: Sasha Levin ---- - security/Kconfig.hardening | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/security/Kconfig.hardening b/security/Kconfig.hardening -index c9d5ca3d8d08d..2b219bc26fe56 100644 ---- a/security/Kconfig.hardening -+++ b/security/Kconfig.hardening -@@ -310,7 +310,7 @@ config CC_HAS_RANDSTRUCT - - choice - prompt "Randomize layout of sensitive kernel structures" -- default RANDSTRUCT_FULL if COMPILE_TEST && (GCC_PLUGINS || CC_HAS_RANDSTRUCT) -+ default RANDSTRUCT_FULL if COMPILE_TEST && CC_HAS_RANDSTRUCT - default RANDSTRUCT_NONE - help - If you enable this, the layouts of structures that are entirely --- -2.39.5 - diff --git a/queue-6.12/series b/queue-6.12/series index 84f3b1decb..5ad4167275 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -165,7 +165,6 @@ s390-tty-fix-a-potential-memory-leak-bug.patch bpf-bpftool-setting-error-code-in-do_loader.patch bpf-only-fails-the-busy-counter-check-in-bpf_cgrp_st.patch bpf-reject-attaching-fexit-fmod_ret-to-__noreturn-fu.patch -x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch mailbox-pcc-fix-the-possible-race-in-updation-of-cha.patch mailbox-pcc-always-clear-the-platform-ack-interrupt-.patch usb-host-max3421-hcd-add-missing-spi_device_id-table.patch @@ -240,7 +239,6 @@ riscv-provide-all-alternative-macros-all-the-time.patch ksmbd-fix-warning-do-not-call-blocking-ops-when-task.patch spi-tegra210-quad-use-warn_on_once-instead-of-warn_o.patch spi-tegra210-quad-add-rate-limiting-and-simplify-tim.patch -hardening-disable-gcc-randstruct-for-compile_test.patch ubsan-fix-panic-from-test_ubsan_out_of_bounds.patch x86-cpu-add-cpu-model-number-for-bartlett-lake-cpus-.patch md-raid1-add-check-for-missing-source-disk-in-proces.patch diff --git a/queue-6.12/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch b/queue-6.12/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch deleted file mode 100644 index 051d0a1e0c..0000000000 --- a/queue-6.12/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch +++ /dev/null @@ -1,97 +0,0 @@ -From de3f4a1ce7f547ed858b228908a8dd318b4cf362 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 21 Mar 2025 21:48:48 +0100 -Subject: x86/Kconfig: Make CONFIG_PCI_CNB20LE_QUIRK depend on X86_32 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Mateusz Jończyk - -[ Upstream commit d9f87802676bb23b9425aea8ad95c76ad9b50c6e ] - -I was unable to find a good description of the ServerWorks CNB20LE -chipset. However, it was probably exclusively used with the Pentium III -processor (this CPU model was used in all references to it that I -found where the CPU model was provided: dmesgs in [1] and [2]; -[3] page 2; [4]-[7]). - -As is widely known, the Pentium III processor did not support the 64-bit -mode, support for which was introduced by Intel a couple of years later. -So it is safe to assume that no systems with the CNB20LE chipset have -amd64 and the CONFIG_PCI_CNB20LE_QUIRK may now depend on X86_32. - -Additionally, I have determined that most computers with the CNB20LE -chipset did have ACPI support and this driver was inactive on them. -I have submitted a patch to remove this driver, but it was met with -resistance [8]. - -[1] Jim Studt, Re: Problem with ServerWorks CNB20LE and lost interrupts - Linux Kernel Mailing List, https://lkml.org/lkml/2002/1/11/111 - -[2] RedHat Bug 665109 - e100 problems on old Compaq Proliant DL320 - https://bugzilla.redhat.com/show_bug.cgi?id=665109 - -[3] R. Hughes-Jones, S. Dallison, G. Fairey, Performance Measurements on - Gigabit Ethernet NICs and Server Quality Motherboards, - http://datatag.web.cern.ch/papers/pfldnet2003-rhj.doc - -[4] "Hardware for Linux", - Probe #d6b5151873 of Intel STL2-bd A28808-302 Desktop Computer (STL2) - https://linux-hardware.org/?probe=d6b5151873 - -[5] "Hardware for Linux", Probe #0b5d843f10 of Compaq ProLiant DL380 - https://linux-hardware.org/?probe=0b5d843f10 - -[6] Ubuntu Forums, Dell Poweredge 2400 - Adaptec SCSI Bus AIC-7880 - https://ubuntuforums.org/showthread.php?t=1689552 - -[7] Ira W. Snyder, "BISECTED: 2.6.35 (and -git) fail to boot: APIC problems" - https://lkml.org/lkml/2010/8/13/220 - -[8] Bjorn Helgaas, "Re: [PATCH] x86/pci: drop ServerWorks / Broadcom - CNB20LE PCI host bridge driver" - https://lore.kernel.org/lkml/20220318165535.GA840063@bhelgaas/T/ - -Signed-off-by: Mateusz Jończyk -Signed-off-by: David Heideberg -Signed-off-by: Ingo Molnar -Cc: "H. Peter Anvin" -Cc: Linus Torvalds -Link: https://lore.kernel.org/r/20250321-x86_x2apic-v3-6-b0cbaa6fa338@ixit.cz -Signed-off-by: Sasha Levin ---- - arch/x86/Kconfig | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index e54da3b4d334e..ee5611418500c 100644 ---- a/arch/x86/Kconfig -+++ b/arch/x86/Kconfig -@@ -2964,13 +2964,21 @@ config MMCONF_FAM10H - depends on X86_64 && PCI_MMCONFIG && ACPI - - config PCI_CNB20LE_QUIRK -- bool "Read CNB20LE Host Bridge Windows" if EXPERT -- depends on PCI -+ bool "Read PCI host bridge windows from the CNB20LE chipset" if EXPERT -+ depends on X86_32 && PCI - help - Read the PCI windows out of the CNB20LE host bridge. This allows - PCI hotplug to work on systems with the CNB20LE chipset which do - not have ACPI. - -+ The ServerWorks (later Broadcom) CNB20LE was a chipset designed -+ most probably only for Pentium III. -+ -+ To find out if you have such a chipset, search for a PCI device with -+ 1166:0009 PCI IDs, for example by executing -+ lspci -nn | grep '1166:0009' -+ The code is inactive if there is none. -+ - There's no public spec for this chipset, and this functionality - is known to be incomplete. - --- -2.39.5 - diff --git a/queue-6.14/hardening-disable-gcc-randstruct-for-compile_test.patch b/queue-6.14/hardening-disable-gcc-randstruct-for-compile_test.patch deleted file mode 100644 index 9e633cd01c..0000000000 --- a/queue-6.14/hardening-disable-gcc-randstruct-for-compile_test.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 135354c61ab43fc65be6f59c68db9a8812241d91 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 9 Apr 2025 08:11:58 -0700 -Subject: hardening: Disable GCC randstruct for COMPILE_TEST - -From: Kees Cook - -[ Upstream commit f5c68a4e84f9feca3be578199ec648b676db2030 ] - -There is a GCC crash bug in the randstruct for latest GCC versions that -is being tickled by landlock[1]. Temporarily disable GCC randstruct for -COMPILE_TEST builds to unbreak CI systems for the coming -rc2. This can -be restored once the bug is fixed. - -Suggested-by: Mark Brown -Link: https://lore.kernel.org/all/20250407-kbuild-disable-gcc-plugins-v1-1-5d46ae583f5e@kernel.org/ [1] -Acked-by: Mark Brown -Acked-by: Arnd Bergmann -Link: https://lore.kernel.org/r/20250409151154.work.872-kees@kernel.org -Signed-off-by: Kees Cook -Signed-off-by: Sasha Levin ---- - security/Kconfig.hardening | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/security/Kconfig.hardening b/security/Kconfig.hardening -index b56e001e0c6a9..10be745c13ba5 100644 ---- a/security/Kconfig.hardening -+++ b/security/Kconfig.hardening -@@ -311,7 +311,7 @@ config CC_HAS_RANDSTRUCT - - choice - prompt "Randomize layout of sensitive kernel structures" -- default RANDSTRUCT_FULL if COMPILE_TEST && (GCC_PLUGINS || CC_HAS_RANDSTRUCT) -+ default RANDSTRUCT_FULL if COMPILE_TEST && CC_HAS_RANDSTRUCT - default RANDSTRUCT_NONE - help - If you enable this, the layouts of structures that are entirely --- -2.39.5 - diff --git a/queue-6.14/series b/queue-6.14/series index 6fce9c2021..ddd81a1085 100644 --- a/queue-6.14/series +++ b/queue-6.14/series @@ -193,7 +193,6 @@ selftests-bpf-fix-cap_enable_effective-return-code.patch bpf-bpftool-setting-error-code-in-do_loader.patch bpf-only-fails-the-busy-counter-check-in-bpf_cgrp_st.patch bpf-reject-attaching-fexit-fmod_ret-to-__noreturn-fu.patch -x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch mailbox-pcc-fix-the-possible-race-in-updation-of-cha.patch mailbox-pcc-always-clear-the-platform-ack-interrupt-.patch staging-gpib-use-min-for-calculating-transfer-length.patch @@ -284,7 +283,6 @@ riscv-provide-all-alternative-macros-all-the-time.patch ksmbd-fix-warning-do-not-call-blocking-ops-when-task.patch spi-tegra210-quad-use-warn_on_once-instead-of-warn_o.patch spi-tegra210-quad-add-rate-limiting-and-simplify-tim.patch -hardening-disable-gcc-randstruct-for-compile_test.patch ubsan-fix-panic-from-test_ubsan_out_of_bounds.patch nvmet-pci-epf-cleanup-link-state-management.patch x86-cpu-add-cpu-model-number-for-bartlett-lake-cpus-.patch diff --git a/queue-6.14/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch b/queue-6.14/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch deleted file mode 100644 index f33dad7a29..0000000000 --- a/queue-6.14/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 8cc03c8c367ced0228a5fbaec8c02274f11b2a38 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 21 Mar 2025 21:48:48 +0100 -Subject: x86/Kconfig: Make CONFIG_PCI_CNB20LE_QUIRK depend on X86_32 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Mateusz Jończyk - -[ Upstream commit d9f87802676bb23b9425aea8ad95c76ad9b50c6e ] - -I was unable to find a good description of the ServerWorks CNB20LE -chipset. However, it was probably exclusively used with the Pentium III -processor (this CPU model was used in all references to it that I -found where the CPU model was provided: dmesgs in [1] and [2]; -[3] page 2; [4]-[7]). - -As is widely known, the Pentium III processor did not support the 64-bit -mode, support for which was introduced by Intel a couple of years later. -So it is safe to assume that no systems with the CNB20LE chipset have -amd64 and the CONFIG_PCI_CNB20LE_QUIRK may now depend on X86_32. - -Additionally, I have determined that most computers with the CNB20LE -chipset did have ACPI support and this driver was inactive on them. -I have submitted a patch to remove this driver, but it was met with -resistance [8]. - -[1] Jim Studt, Re: Problem with ServerWorks CNB20LE and lost interrupts - Linux Kernel Mailing List, https://lkml.org/lkml/2002/1/11/111 - -[2] RedHat Bug 665109 - e100 problems on old Compaq Proliant DL320 - https://bugzilla.redhat.com/show_bug.cgi?id=665109 - -[3] R. Hughes-Jones, S. Dallison, G. Fairey, Performance Measurements on - Gigabit Ethernet NICs and Server Quality Motherboards, - http://datatag.web.cern.ch/papers/pfldnet2003-rhj.doc - -[4] "Hardware for Linux", - Probe #d6b5151873 of Intel STL2-bd A28808-302 Desktop Computer (STL2) - https://linux-hardware.org/?probe=d6b5151873 - -[5] "Hardware for Linux", Probe #0b5d843f10 of Compaq ProLiant DL380 - https://linux-hardware.org/?probe=0b5d843f10 - -[6] Ubuntu Forums, Dell Poweredge 2400 - Adaptec SCSI Bus AIC-7880 - https://ubuntuforums.org/showthread.php?t=1689552 - -[7] Ira W. Snyder, "BISECTED: 2.6.35 (and -git) fail to boot: APIC problems" - https://lkml.org/lkml/2010/8/13/220 - -[8] Bjorn Helgaas, "Re: [PATCH] x86/pci: drop ServerWorks / Broadcom - CNB20LE PCI host bridge driver" - https://lore.kernel.org/lkml/20220318165535.GA840063@bhelgaas/T/ - -Signed-off-by: Mateusz Jończyk -Signed-off-by: David Heideberg -Signed-off-by: Ingo Molnar -Cc: "H. Peter Anvin" -Cc: Linus Torvalds -Link: https://lore.kernel.org/r/20250321-x86_x2apic-v3-6-b0cbaa6fa338@ixit.cz -Signed-off-by: Sasha Levin ---- - arch/x86/Kconfig | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index aeb95b6e55369..de47e7c435679 100644 ---- a/arch/x86/Kconfig -+++ b/arch/x86/Kconfig -@@ -2981,13 +2981,21 @@ config MMCONF_FAM10H - depends on X86_64 && PCI_MMCONFIG && ACPI - - config PCI_CNB20LE_QUIRK -- bool "Read CNB20LE Host Bridge Windows" if EXPERT -- depends on PCI -+ bool "Read PCI host bridge windows from the CNB20LE chipset" if EXPERT -+ depends on X86_32 && PCI - help - Read the PCI windows out of the CNB20LE host bridge. This allows - PCI hotplug to work on systems with the CNB20LE chipset which do - not have ACPI. - -+ The ServerWorks (later Broadcom) CNB20LE was a chipset designed -+ most probably only for Pentium III. -+ -+ To find out if you have such a chipset, search for a PCI device with -+ 1166:0009 PCI IDs, for example by executing -+ lspci -nn | grep '1166:0009' -+ The code is inactive if there is none. -+ - There's no public spec for this chipset, and this functionality - is known to be incomplete. - --- -2.39.5 - diff --git a/queue-6.6/hardening-disable-gcc-randstruct-for-compile_test.patch b/queue-6.6/hardening-disable-gcc-randstruct-for-compile_test.patch deleted file mode 100644 index ca1b02b282..0000000000 --- a/queue-6.6/hardening-disable-gcc-randstruct-for-compile_test.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 87d50819a8cc48eba0cfe2ecd16bfa24134ac72f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 9 Apr 2025 08:11:58 -0700 -Subject: hardening: Disable GCC randstruct for COMPILE_TEST - -From: Kees Cook - -[ Upstream commit f5c68a4e84f9feca3be578199ec648b676db2030 ] - -There is a GCC crash bug in the randstruct for latest GCC versions that -is being tickled by landlock[1]. Temporarily disable GCC randstruct for -COMPILE_TEST builds to unbreak CI systems for the coming -rc2. This can -be restored once the bug is fixed. - -Suggested-by: Mark Brown -Link: https://lore.kernel.org/all/20250407-kbuild-disable-gcc-plugins-v1-1-5d46ae583f5e@kernel.org/ [1] -Acked-by: Mark Brown -Acked-by: Arnd Bergmann -Link: https://lore.kernel.org/r/20250409151154.work.872-kees@kernel.org -Signed-off-by: Kees Cook -Signed-off-by: Sasha Levin ---- - security/Kconfig.hardening | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/security/Kconfig.hardening b/security/Kconfig.hardening -index 2cff851ebfd7e..f1ba84812ab22 100644 ---- a/security/Kconfig.hardening -+++ b/security/Kconfig.hardening -@@ -310,7 +310,7 @@ config CC_HAS_RANDSTRUCT - - choice - prompt "Randomize layout of sensitive kernel structures" -- default RANDSTRUCT_FULL if COMPILE_TEST && (GCC_PLUGINS || CC_HAS_RANDSTRUCT) -+ default RANDSTRUCT_FULL if COMPILE_TEST && CC_HAS_RANDSTRUCT - default RANDSTRUCT_NONE - help - If you enable this, the layouts of structures that are entirely --- -2.39.5 - diff --git a/queue-6.6/series b/queue-6.6/series index 9ddee5b43f..d52b8bf5f6 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -126,7 +126,6 @@ s390-tty-fix-a-potential-memory-leak-bug.patch bpf-bpftool-setting-error-code-in-do_loader.patch bpf-only-fails-the-busy-counter-check-in-bpf_cgrp_st.patch bpf-reject-attaching-fexit-fmod_ret-to-__noreturn-fu.patch -x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch mailbox-pcc-fix-the-possible-race-in-updation-of-cha.patch mailbox-pcc-always-clear-the-platform-ack-interrupt-.patch usb-host-max3421-hcd-add-missing-spi_device_id-table.patch @@ -183,7 +182,6 @@ riscv-provide-all-alternative-macros-all-the-time.patch loop-aio-inherit-the-ioprio-of-original-request.patch spi-tegra210-quad-use-warn_on_once-instead-of-warn_o.patch spi-tegra210-quad-add-rate-limiting-and-simplify-tim.patch -hardening-disable-gcc-randstruct-for-compile_test.patch ubsan-fix-panic-from-test_ubsan_out_of_bounds.patch x86-cpu-add-cpu-model-number-for-bartlett-lake-cpus-.patch md-raid1-add-check-for-missing-source-disk-in-proces.patch diff --git a/queue-6.6/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch b/queue-6.6/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch deleted file mode 100644 index c6dc15bf48..0000000000 --- a/queue-6.6/x86-kconfig-make-config_pci_cnb20le_quirk-depend-on-.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 842e4c8add0b3d9d4fc18dd3ce6c8db5e388afd9 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 21 Mar 2025 21:48:48 +0100 -Subject: x86/Kconfig: Make CONFIG_PCI_CNB20LE_QUIRK depend on X86_32 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Mateusz Jończyk - -[ Upstream commit d9f87802676bb23b9425aea8ad95c76ad9b50c6e ] - -I was unable to find a good description of the ServerWorks CNB20LE -chipset. However, it was probably exclusively used with the Pentium III -processor (this CPU model was used in all references to it that I -found where the CPU model was provided: dmesgs in [1] and [2]; -[3] page 2; [4]-[7]). - -As is widely known, the Pentium III processor did not support the 64-bit -mode, support for which was introduced by Intel a couple of years later. -So it is safe to assume that no systems with the CNB20LE chipset have -amd64 and the CONFIG_PCI_CNB20LE_QUIRK may now depend on X86_32. - -Additionally, I have determined that most computers with the CNB20LE -chipset did have ACPI support and this driver was inactive on them. -I have submitted a patch to remove this driver, but it was met with -resistance [8]. - -[1] Jim Studt, Re: Problem with ServerWorks CNB20LE and lost interrupts - Linux Kernel Mailing List, https://lkml.org/lkml/2002/1/11/111 - -[2] RedHat Bug 665109 - e100 problems on old Compaq Proliant DL320 - https://bugzilla.redhat.com/show_bug.cgi?id=665109 - -[3] R. Hughes-Jones, S. Dallison, G. Fairey, Performance Measurements on - Gigabit Ethernet NICs and Server Quality Motherboards, - http://datatag.web.cern.ch/papers/pfldnet2003-rhj.doc - -[4] "Hardware for Linux", - Probe #d6b5151873 of Intel STL2-bd A28808-302 Desktop Computer (STL2) - https://linux-hardware.org/?probe=d6b5151873 - -[5] "Hardware for Linux", Probe #0b5d843f10 of Compaq ProLiant DL380 - https://linux-hardware.org/?probe=0b5d843f10 - -[6] Ubuntu Forums, Dell Poweredge 2400 - Adaptec SCSI Bus AIC-7880 - https://ubuntuforums.org/showthread.php?t=1689552 - -[7] Ira W. Snyder, "BISECTED: 2.6.35 (and -git) fail to boot: APIC problems" - https://lkml.org/lkml/2010/8/13/220 - -[8] Bjorn Helgaas, "Re: [PATCH] x86/pci: drop ServerWorks / Broadcom - CNB20LE PCI host bridge driver" - https://lore.kernel.org/lkml/20220318165535.GA840063@bhelgaas/T/ - -Signed-off-by: Mateusz Jończyk -Signed-off-by: David Heideberg -Signed-off-by: Ingo Molnar -Cc: "H. Peter Anvin" -Cc: Linus Torvalds -Link: https://lore.kernel.org/r/20250321-x86_x2apic-v3-6-b0cbaa6fa338@ixit.cz -Signed-off-by: Sasha Levin ---- - arch/x86/Kconfig | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index d874ea22512b5..9b60b144f38ac 100644 ---- a/arch/x86/Kconfig -+++ b/arch/x86/Kconfig -@@ -2827,13 +2827,21 @@ config MMCONF_FAM10H - depends on X86_64 && PCI_MMCONFIG && ACPI - - config PCI_CNB20LE_QUIRK -- bool "Read CNB20LE Host Bridge Windows" if EXPERT -- depends on PCI -+ bool "Read PCI host bridge windows from the CNB20LE chipset" if EXPERT -+ depends on X86_32 && PCI - help - Read the PCI windows out of the CNB20LE host bridge. This allows - PCI hotplug to work on systems with the CNB20LE chipset which do - not have ACPI. - -+ The ServerWorks (later Broadcom) CNB20LE was a chipset designed -+ most probably only for Pentium III. -+ -+ To find out if you have such a chipset, search for a PCI device with -+ 1166:0009 PCI IDs, for example by executing -+ lspci -nn | grep '1166:0009' -+ The code is inactive if there is none. -+ - There's no public spec for this chipset, and this functionality - is known to be incomplete. - --- -2.39.5 -