From: Greg Kroah-Hartman Date: Sun, 23 Jul 2023 11:24:57 +0000 (+0200) Subject: drop pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch from everywhere X-Git-Tag: v5.15.121~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad1212e9b83b578fd446d226276766e57385b5bd;p=thirdparty%2Fkernel%2Fstable-queue.git drop pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch from everywhere --- diff --git a/queue-4.19/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch b/queue-4.19/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch deleted file mode 100644 index f33c7cbda64..00000000000 --- a/queue-4.19/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 40613da52b13fb21c5566f10b287e0ca8c12c4e9 Mon Sep 17 00:00:00 2001 -From: Igor Mammedov -Date: Mon, 24 Apr 2023 21:15:57 +0200 -Subject: PCI: acpiphp: Reassign resources on bridge if necessary - -From: Igor Mammedov - -commit 40613da52b13fb21c5566f10b287e0ca8c12c4e9 upstream. - -When using ACPI PCI hotplug, hotplugging a device with large BARs may fail -if bridge windows programmed by firmware are not large enough. - -Reproducer: - $ qemu-kvm -monitor stdio -M q35 -m 4G \ - -global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=on \ - -device id=rp1,pcie-root-port,bus=pcie.0,chassis=4 \ - disk_image - - wait till linux guest boots, then hotplug device: - (qemu) device_add qxl,bus=rp1 - - hotplug on guest side fails with: - pci 0000:01:00.0: [1b36:0100] type 00 class 0x038000 - pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x03ffffff] - pci 0000:01:00.0: reg 0x14: [mem 0x00000000-0x03ffffff] - pci 0000:01:00.0: reg 0x18: [mem 0x00000000-0x00001fff] - pci 0000:01:00.0: reg 0x1c: [io 0x0000-0x001f] - pci 0000:01:00.0: BAR 0: no space for [mem size 0x04000000] - pci 0000:01:00.0: BAR 0: failed to assign [mem size 0x04000000] - pci 0000:01:00.0: BAR 1: no space for [mem size 0x04000000] - pci 0000:01:00.0: BAR 1: failed to assign [mem size 0x04000000] - pci 0000:01:00.0: BAR 2: assigned [mem 0xfe800000-0xfe801fff] - pci 0000:01:00.0: BAR 3: assigned [io 0x1000-0x101f] - qxl 0000:01:00.0: enabling device (0000 -> 0003) - Unable to create vram_mapping - qxl: probe of 0000:01:00.0 failed with error -12 - -However when using native PCIe hotplug - '-global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off' -it works fine, since kernel attempts to reassign unused resources. - -Use the same machinery as native PCIe hotplug to (re)assign resources. - -Link: https://lore.kernel.org/r/20230424191557.2464760-1-imammedo@redhat.com -Signed-off-by: Igor Mammedov -Signed-off-by: Bjorn Helgaas -Acked-by: Michael S. Tsirkin -Acked-by: Rafael J. Wysocki -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - drivers/pci/hotplug/acpiphp_glue.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - ---- a/drivers/pci/hotplug/acpiphp_glue.c -+++ b/drivers/pci/hotplug/acpiphp_glue.c -@@ -496,7 +496,6 @@ static void enable_slot(struct acpiphp_s - acpiphp_native_scan_bridge(dev); - } - } else { -- LIST_HEAD(add_list); - int max, pass; - - acpiphp_rescan_slot(slot); -@@ -510,12 +509,10 @@ static void enable_slot(struct acpiphp_s - if (pass && dev->subordinate) { - check_hotplug_bridge(slot, dev); - pcibios_resource_survey_bus(dev->subordinate); -- __pci_bus_size_bridges(dev->subordinate, -- &add_list); - } - } - } -- __pci_bus_assign_resources(bus, &add_list, NULL); -+ pci_assign_unassigned_bridge_resources(bus->self); - } - - acpiphp_sanitize_bus(bus); diff --git a/queue-4.19/series b/queue-4.19/series index bc8746da19d..b96909a44a4 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -161,7 +161,6 @@ ext4-only-update-i_reserved_data_blocks-on-successful-block-allocation.patch jfs-jfs_dmap-validate-db_l2nbperpage-while-mounting.patch pci-pm-avoid-putting-elopos-e2-s2-h2-pcie-ports-in-d3cold.patch pci-add-function-1-dma-alias-quirk-for-marvell-88se9235.patch -pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch pci-qcom-disable-write-access-to-read-only-registers-for-ip-v2.3.3.patch pci-rockchip-assert-pci-configuration-enable-bit-after-probe.patch pci-rockchip-write-pci-device-id-to-correct-register.patch diff --git a/queue-5.10/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch b/queue-5.10/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch deleted file mode 100644 index 0953b6ea730..00000000000 --- a/queue-5.10/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 40613da52b13fb21c5566f10b287e0ca8c12c4e9 Mon Sep 17 00:00:00 2001 -From: Igor Mammedov -Date: Mon, 24 Apr 2023 21:15:57 +0200 -Subject: PCI: acpiphp: Reassign resources on bridge if necessary - -From: Igor Mammedov - -commit 40613da52b13fb21c5566f10b287e0ca8c12c4e9 upstream. - -When using ACPI PCI hotplug, hotplugging a device with large BARs may fail -if bridge windows programmed by firmware are not large enough. - -Reproducer: - $ qemu-kvm -monitor stdio -M q35 -m 4G \ - -global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=on \ - -device id=rp1,pcie-root-port,bus=pcie.0,chassis=4 \ - disk_image - - wait till linux guest boots, then hotplug device: - (qemu) device_add qxl,bus=rp1 - - hotplug on guest side fails with: - pci 0000:01:00.0: [1b36:0100] type 00 class 0x038000 - pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x03ffffff] - pci 0000:01:00.0: reg 0x14: [mem 0x00000000-0x03ffffff] - pci 0000:01:00.0: reg 0x18: [mem 0x00000000-0x00001fff] - pci 0000:01:00.0: reg 0x1c: [io 0x0000-0x001f] - pci 0000:01:00.0: BAR 0: no space for [mem size 0x04000000] - pci 0000:01:00.0: BAR 0: failed to assign [mem size 0x04000000] - pci 0000:01:00.0: BAR 1: no space for [mem size 0x04000000] - pci 0000:01:00.0: BAR 1: failed to assign [mem size 0x04000000] - pci 0000:01:00.0: BAR 2: assigned [mem 0xfe800000-0xfe801fff] - pci 0000:01:00.0: BAR 3: assigned [io 0x1000-0x101f] - qxl 0000:01:00.0: enabling device (0000 -> 0003) - Unable to create vram_mapping - qxl: probe of 0000:01:00.0 failed with error -12 - -However when using native PCIe hotplug - '-global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off' -it works fine, since kernel attempts to reassign unused resources. - -Use the same machinery as native PCIe hotplug to (re)assign resources. - -Link: https://lore.kernel.org/r/20230424191557.2464760-1-imammedo@redhat.com -Signed-off-by: Igor Mammedov -Signed-off-by: Bjorn Helgaas -Acked-by: Michael S. Tsirkin -Acked-by: Rafael J. Wysocki -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - drivers/pci/hotplug/acpiphp_glue.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - ---- a/drivers/pci/hotplug/acpiphp_glue.c -+++ b/drivers/pci/hotplug/acpiphp_glue.c -@@ -489,7 +489,6 @@ static void enable_slot(struct acpiphp_s - acpiphp_native_scan_bridge(dev); - } - } else { -- LIST_HEAD(add_list); - int max, pass; - - acpiphp_rescan_slot(slot); -@@ -503,12 +502,10 @@ static void enable_slot(struct acpiphp_s - if (pass && dev->subordinate) { - check_hotplug_bridge(slot, dev); - pcibios_resource_survey_bus(dev->subordinate); -- __pci_bus_size_bridges(dev->subordinate, -- &add_list); - } - } - } -- __pci_bus_assign_resources(bus, &add_list, NULL); -+ pci_assign_unassigned_bridge_resources(bus->self); - } - - acpiphp_sanitize_bus(bus); diff --git a/queue-5.10/series b/queue-5.10/series index 499228db222..36b5ccde4df 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -395,7 +395,6 @@ jfs-jfs_dmap-validate-db_l2nbperpage-while-mounting.patch hwrng-imx-rngc-fix-the-timeout-for-init-and-self-check.patch pci-pm-avoid-putting-elopos-e2-s2-h2-pcie-ports-in-d3cold.patch pci-add-function-1-dma-alias-quirk-for-marvell-88se9235.patch -pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch pci-qcom-disable-write-access-to-read-only-registers-for-ip-v2.3.3.patch pci-rockchip-assert-pci-configuration-enable-bit-after-probe.patch pci-rockchip-write-pci-device-id-to-correct-register.patch diff --git a/queue-5.15/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch b/queue-5.15/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch deleted file mode 100644 index 0953b6ea730..00000000000 --- a/queue-5.15/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 40613da52b13fb21c5566f10b287e0ca8c12c4e9 Mon Sep 17 00:00:00 2001 -From: Igor Mammedov -Date: Mon, 24 Apr 2023 21:15:57 +0200 -Subject: PCI: acpiphp: Reassign resources on bridge if necessary - -From: Igor Mammedov - -commit 40613da52b13fb21c5566f10b287e0ca8c12c4e9 upstream. - -When using ACPI PCI hotplug, hotplugging a device with large BARs may fail -if bridge windows programmed by firmware are not large enough. - -Reproducer: - $ qemu-kvm -monitor stdio -M q35 -m 4G \ - -global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=on \ - -device id=rp1,pcie-root-port,bus=pcie.0,chassis=4 \ - disk_image - - wait till linux guest boots, then hotplug device: - (qemu) device_add qxl,bus=rp1 - - hotplug on guest side fails with: - pci 0000:01:00.0: [1b36:0100] type 00 class 0x038000 - pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x03ffffff] - pci 0000:01:00.0: reg 0x14: [mem 0x00000000-0x03ffffff] - pci 0000:01:00.0: reg 0x18: [mem 0x00000000-0x00001fff] - pci 0000:01:00.0: reg 0x1c: [io 0x0000-0x001f] - pci 0000:01:00.0: BAR 0: no space for [mem size 0x04000000] - pci 0000:01:00.0: BAR 0: failed to assign [mem size 0x04000000] - pci 0000:01:00.0: BAR 1: no space for [mem size 0x04000000] - pci 0000:01:00.0: BAR 1: failed to assign [mem size 0x04000000] - pci 0000:01:00.0: BAR 2: assigned [mem 0xfe800000-0xfe801fff] - pci 0000:01:00.0: BAR 3: assigned [io 0x1000-0x101f] - qxl 0000:01:00.0: enabling device (0000 -> 0003) - Unable to create vram_mapping - qxl: probe of 0000:01:00.0 failed with error -12 - -However when using native PCIe hotplug - '-global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off' -it works fine, since kernel attempts to reassign unused resources. - -Use the same machinery as native PCIe hotplug to (re)assign resources. - -Link: https://lore.kernel.org/r/20230424191557.2464760-1-imammedo@redhat.com -Signed-off-by: Igor Mammedov -Signed-off-by: Bjorn Helgaas -Acked-by: Michael S. Tsirkin -Acked-by: Rafael J. Wysocki -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - drivers/pci/hotplug/acpiphp_glue.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - ---- a/drivers/pci/hotplug/acpiphp_glue.c -+++ b/drivers/pci/hotplug/acpiphp_glue.c -@@ -489,7 +489,6 @@ static void enable_slot(struct acpiphp_s - acpiphp_native_scan_bridge(dev); - } - } else { -- LIST_HEAD(add_list); - int max, pass; - - acpiphp_rescan_slot(slot); -@@ -503,12 +502,10 @@ static void enable_slot(struct acpiphp_s - if (pass && dev->subordinate) { - check_hotplug_bridge(slot, dev); - pcibios_resource_survey_bus(dev->subordinate); -- __pci_bus_size_bridges(dev->subordinate, -- &add_list); - } - } - } -- __pci_bus_assign_resources(bus, &add_list, NULL); -+ pci_assign_unassigned_bridge_resources(bus->self); - } - - acpiphp_sanitize_bus(bus); diff --git a/queue-5.15/series b/queue-5.15/series index 220ef9a4cd3..f3cd78e0558 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -470,7 +470,6 @@ hwrng-imx-rngc-fix-the-timeout-for-init-and-self-check.patch dm-integrity-reduce-vmalloc-space-footprint-on-32-bit-architectures.patch pci-pm-avoid-putting-elopos-e2-s2-h2-pcie-ports-in-d3cold.patch pci-add-function-1-dma-alias-quirk-for-marvell-88se9235.patch -pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch pci-qcom-disable-write-access-to-read-only-registers-for-ip-v2.3.3.patch pci-rockchip-assert-pci-configuration-enable-bit-after-probe.patch pci-rockchip-write-pci-device-id-to-correct-register.patch diff --git a/queue-5.4/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch b/queue-5.4/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch deleted file mode 100644 index f33c7cbda64..00000000000 --- a/queue-5.4/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 40613da52b13fb21c5566f10b287e0ca8c12c4e9 Mon Sep 17 00:00:00 2001 -From: Igor Mammedov -Date: Mon, 24 Apr 2023 21:15:57 +0200 -Subject: PCI: acpiphp: Reassign resources on bridge if necessary - -From: Igor Mammedov - -commit 40613da52b13fb21c5566f10b287e0ca8c12c4e9 upstream. - -When using ACPI PCI hotplug, hotplugging a device with large BARs may fail -if bridge windows programmed by firmware are not large enough. - -Reproducer: - $ qemu-kvm -monitor stdio -M q35 -m 4G \ - -global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=on \ - -device id=rp1,pcie-root-port,bus=pcie.0,chassis=4 \ - disk_image - - wait till linux guest boots, then hotplug device: - (qemu) device_add qxl,bus=rp1 - - hotplug on guest side fails with: - pci 0000:01:00.0: [1b36:0100] type 00 class 0x038000 - pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x03ffffff] - pci 0000:01:00.0: reg 0x14: [mem 0x00000000-0x03ffffff] - pci 0000:01:00.0: reg 0x18: [mem 0x00000000-0x00001fff] - pci 0000:01:00.0: reg 0x1c: [io 0x0000-0x001f] - pci 0000:01:00.0: BAR 0: no space for [mem size 0x04000000] - pci 0000:01:00.0: BAR 0: failed to assign [mem size 0x04000000] - pci 0000:01:00.0: BAR 1: no space for [mem size 0x04000000] - pci 0000:01:00.0: BAR 1: failed to assign [mem size 0x04000000] - pci 0000:01:00.0: BAR 2: assigned [mem 0xfe800000-0xfe801fff] - pci 0000:01:00.0: BAR 3: assigned [io 0x1000-0x101f] - qxl 0000:01:00.0: enabling device (0000 -> 0003) - Unable to create vram_mapping - qxl: probe of 0000:01:00.0 failed with error -12 - -However when using native PCIe hotplug - '-global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off' -it works fine, since kernel attempts to reassign unused resources. - -Use the same machinery as native PCIe hotplug to (re)assign resources. - -Link: https://lore.kernel.org/r/20230424191557.2464760-1-imammedo@redhat.com -Signed-off-by: Igor Mammedov -Signed-off-by: Bjorn Helgaas -Acked-by: Michael S. Tsirkin -Acked-by: Rafael J. Wysocki -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - drivers/pci/hotplug/acpiphp_glue.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - ---- a/drivers/pci/hotplug/acpiphp_glue.c -+++ b/drivers/pci/hotplug/acpiphp_glue.c -@@ -496,7 +496,6 @@ static void enable_slot(struct acpiphp_s - acpiphp_native_scan_bridge(dev); - } - } else { -- LIST_HEAD(add_list); - int max, pass; - - acpiphp_rescan_slot(slot); -@@ -510,12 +509,10 @@ static void enable_slot(struct acpiphp_s - if (pass && dev->subordinate) { - check_hotplug_bridge(slot, dev); - pcibios_resource_survey_bus(dev->subordinate); -- __pci_bus_size_bridges(dev->subordinate, -- &add_list); - } - } - } -- __pci_bus_assign_resources(bus, &add_list, NULL); -+ pci_assign_unassigned_bridge_resources(bus->self); - } - - acpiphp_sanitize_bus(bus); diff --git a/queue-5.4/series b/queue-5.4/series index a741f1b10cb..d83233d408b 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -242,7 +242,6 @@ ext4-only-update-i_reserved_data_blocks-on-successful-block-allocation.patch jfs-jfs_dmap-validate-db_l2nbperpage-while-mounting.patch pci-pm-avoid-putting-elopos-e2-s2-h2-pcie-ports-in-d3cold.patch pci-add-function-1-dma-alias-quirk-for-marvell-88se9235.patch -pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch pci-qcom-disable-write-access-to-read-only-registers-for-ip-v2.3.3.patch pci-rockchip-assert-pci-configuration-enable-bit-after-probe.patch pci-rockchip-write-pci-device-id-to-correct-register.patch diff --git a/queue-6.1/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch b/queue-6.1/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch deleted file mode 100644 index 4eb66a5136c..00000000000 --- a/queue-6.1/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 40613da52b13fb21c5566f10b287e0ca8c12c4e9 Mon Sep 17 00:00:00 2001 -From: Igor Mammedov -Date: Mon, 24 Apr 2023 21:15:57 +0200 -Subject: PCI: acpiphp: Reassign resources on bridge if necessary - -From: Igor Mammedov - -commit 40613da52b13fb21c5566f10b287e0ca8c12c4e9 upstream. - -When using ACPI PCI hotplug, hotplugging a device with large BARs may fail -if bridge windows programmed by firmware are not large enough. - -Reproducer: - $ qemu-kvm -monitor stdio -M q35 -m 4G \ - -global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=on \ - -device id=rp1,pcie-root-port,bus=pcie.0,chassis=4 \ - disk_image - - wait till linux guest boots, then hotplug device: - (qemu) device_add qxl,bus=rp1 - - hotplug on guest side fails with: - pci 0000:01:00.0: [1b36:0100] type 00 class 0x038000 - pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x03ffffff] - pci 0000:01:00.0: reg 0x14: [mem 0x00000000-0x03ffffff] - pci 0000:01:00.0: reg 0x18: [mem 0x00000000-0x00001fff] - pci 0000:01:00.0: reg 0x1c: [io 0x0000-0x001f] - pci 0000:01:00.0: BAR 0: no space for [mem size 0x04000000] - pci 0000:01:00.0: BAR 0: failed to assign [mem size 0x04000000] - pci 0000:01:00.0: BAR 1: no space for [mem size 0x04000000] - pci 0000:01:00.0: BAR 1: failed to assign [mem size 0x04000000] - pci 0000:01:00.0: BAR 2: assigned [mem 0xfe800000-0xfe801fff] - pci 0000:01:00.0: BAR 3: assigned [io 0x1000-0x101f] - qxl 0000:01:00.0: enabling device (0000 -> 0003) - Unable to create vram_mapping - qxl: probe of 0000:01:00.0 failed with error -12 - -However when using native PCIe hotplug - '-global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off' -it works fine, since kernel attempts to reassign unused resources. - -Use the same machinery as native PCIe hotplug to (re)assign resources. - -Link: https://lore.kernel.org/r/20230424191557.2464760-1-imammedo@redhat.com -Signed-off-by: Igor Mammedov -Signed-off-by: Bjorn Helgaas -Acked-by: Michael S. Tsirkin -Acked-by: Rafael J. Wysocki -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - drivers/pci/hotplug/acpiphp_glue.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - ---- a/drivers/pci/hotplug/acpiphp_glue.c -+++ b/drivers/pci/hotplug/acpiphp_glue.c -@@ -490,7 +490,6 @@ static void enable_slot(struct acpiphp_s - acpiphp_native_scan_bridge(dev); - } - } else { -- LIST_HEAD(add_list); - int max, pass; - - acpiphp_rescan_slot(slot); -@@ -504,12 +503,10 @@ static void enable_slot(struct acpiphp_s - if (pass && dev->subordinate) { - check_hotplug_bridge(slot, dev); - pcibios_resource_survey_bus(dev->subordinate); -- __pci_bus_size_bridges(dev->subordinate, -- &add_list); - } - } - } -- __pci_bus_assign_resources(bus, &add_list, NULL); -+ pci_assign_unassigned_bridge_resources(bus->self); - } - - acpiphp_sanitize_bus(bus); diff --git a/queue-6.1/series b/queue-6.1/series index 07583ef4948..cc808723f8d 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -118,7 +118,6 @@ s390-zcrypt-do-not-retry-administrative-requests.patch pci-pm-avoid-putting-elopos-e2-s2-h2-pcie-ports-in-d3cold.patch pci-release-resource-invalidated-by-coalescing.patch pci-add-function-1-dma-alias-quirk-for-marvell-88se9235.patch -pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch pci-qcom-disable-write-access-to-read-only-registers-for-ip-v2.3.3.patch pci-epf-test-fix-dma-transfer-completion-initialization.patch pci-epf-test-fix-dma-transfer-completion-detection.patch diff --git a/queue-6.4/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch b/queue-6.4/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch deleted file mode 100644 index c68d90eda33..00000000000 --- a/queue-6.4/pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 40613da52b13fb21c5566f10b287e0ca8c12c4e9 Mon Sep 17 00:00:00 2001 -From: Igor Mammedov -Date: Mon, 24 Apr 2023 21:15:57 +0200 -Subject: PCI: acpiphp: Reassign resources on bridge if necessary - -From: Igor Mammedov - -commit 40613da52b13fb21c5566f10b287e0ca8c12c4e9 upstream. - -When using ACPI PCI hotplug, hotplugging a device with large BARs may fail -if bridge windows programmed by firmware are not large enough. - -Reproducer: - $ qemu-kvm -monitor stdio -M q35 -m 4G \ - -global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=on \ - -device id=rp1,pcie-root-port,bus=pcie.0,chassis=4 \ - disk_image - - wait till linux guest boots, then hotplug device: - (qemu) device_add qxl,bus=rp1 - - hotplug on guest side fails with: - pci 0000:01:00.0: [1b36:0100] type 00 class 0x038000 - pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x03ffffff] - pci 0000:01:00.0: reg 0x14: [mem 0x00000000-0x03ffffff] - pci 0000:01:00.0: reg 0x18: [mem 0x00000000-0x00001fff] - pci 0000:01:00.0: reg 0x1c: [io 0x0000-0x001f] - pci 0000:01:00.0: BAR 0: no space for [mem size 0x04000000] - pci 0000:01:00.0: BAR 0: failed to assign [mem size 0x04000000] - pci 0000:01:00.0: BAR 1: no space for [mem size 0x04000000] - pci 0000:01:00.0: BAR 1: failed to assign [mem size 0x04000000] - pci 0000:01:00.0: BAR 2: assigned [mem 0xfe800000-0xfe801fff] - pci 0000:01:00.0: BAR 3: assigned [io 0x1000-0x101f] - qxl 0000:01:00.0: enabling device (0000 -> 0003) - Unable to create vram_mapping - qxl: probe of 0000:01:00.0 failed with error -12 - -However when using native PCIe hotplug - '-global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off' -it works fine, since kernel attempts to reassign unused resources. - -Use the same machinery as native PCIe hotplug to (re)assign resources. - -Link: https://lore.kernel.org/r/20230424191557.2464760-1-imammedo@redhat.com -Signed-off-by: Igor Mammedov -Signed-off-by: Bjorn Helgaas -Acked-by: Michael S. Tsirkin -Acked-by: Rafael J. Wysocki -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - drivers/pci/hotplug/acpiphp_glue.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - ---- a/drivers/pci/hotplug/acpiphp_glue.c -+++ b/drivers/pci/hotplug/acpiphp_glue.c -@@ -498,7 +498,6 @@ static void enable_slot(struct acpiphp_s - acpiphp_native_scan_bridge(dev); - } - } else { -- LIST_HEAD(add_list); - int max, pass; - - acpiphp_rescan_slot(slot); -@@ -512,12 +511,10 @@ static void enable_slot(struct acpiphp_s - if (pass && dev->subordinate) { - check_hotplug_bridge(slot, dev); - pcibios_resource_survey_bus(dev->subordinate); -- __pci_bus_size_bridges(dev->subordinate, -- &add_list); - } - } - } -- __pci_bus_assign_resources(bus, &add_list, NULL); -+ pci_assign_unassigned_bridge_resources(bus->self); - } - - acpiphp_sanitize_bus(bus); diff --git a/queue-6.4/series b/queue-6.4/series index 3a43bb59e6f..3e018e952c1 100644 --- a/queue-6.4/series +++ b/queue-6.4/series @@ -167,7 +167,6 @@ s390-zcrypt-do-not-retry-administrative-requests.patch pci-pm-avoid-putting-elopos-e2-s2-h2-pcie-ports-in-d3cold.patch pci-release-resource-invalidated-by-coalescing.patch pci-add-function-1-dma-alias-quirk-for-marvell-88se9235.patch -pci-acpiphp-reassign-resources-on-bridge-if-necessary.patch pci-qcom-disable-write-access-to-read-only-registers-for-ip-v2.3.3.patch pci-epf-test-fix-dma-transfer-completion-initialization.patch pci-epf-test-fix-dma-transfer-completion-detection.patch