From: Greg Kroah-Hartman Date: Mon, 13 Jul 2026 13:24:28 +0000 (+0200) Subject: 5.15-stable patches X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e39dc2cd8e5d2abf18761a805b2cfb4558e3ead;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: pci-host-common-request-bus-reassignment-when-not-probe-only.patch --- diff --git a/queue-5.15/pci-host-common-request-bus-reassignment-when-not-probe-only.patch b/queue-5.15/pci-host-common-request-bus-reassignment-when-not-probe-only.patch new file mode 100644 index 0000000000..64f0f50ac4 --- /dev/null +++ b/queue-5.15/pci-host-common-request-bus-reassignment-when-not-probe-only.patch @@ -0,0 +1,47 @@ +From fda8749ba73638f5bbca3ffb39bc6861eb3b23fa Mon Sep 17 00:00:00 2001 +From: Ratheesh Kannoth +Date: Tue, 14 Apr 2026 13:47:30 +0530 +Subject: PCI: host-common: Request bus reassignment when not probe-only + +From: Ratheesh Kannoth + +commit fda8749ba73638f5bbca3ffb39bc6861eb3b23fa upstream. + +pci_host_common_init() is used by several generic ECAM host drivers. +After PCI core changes around pci_flags and preserve_config, these hosts +no longer opted into full bus number reassignment the way they did +before, which broke enumeration of devices on a Marvell CN106XX board. + +When PCI_PROBE_ONLY is not set, add PCI_REASSIGN_ALL_BUS so +pci_scan_bridge_extend() takes the reassignment path: bus numbers can be +assigned from firmware EA data (e.g. pci_ea_fixed_busnrs()). Skip the +flag in probe-only mode so existing assignments are not overridden. + +Fixes: 7246a4520b4b ("PCI: Use preserve_config in place of pci_flags") +Closes: https://lore.kernel.org/all/abkqm_LCd9zAM8cW@rkannoth-OptiPlex-7090/ +Signed-off-by: Ratheesh Kannoth +[mani: added stable tag] +Signed-off-by: Manivannan Sadhasivam +[bhelgaas: add problem report link] +Signed-off-by: Bjorn Helgaas +Cc: stable@vger.kernel.org +Cc: Vidya Sagar +Link: https://patch.msgid.link/20260414081730.3864372-1-rkannoth@marvell.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pci/controller/pci-host-common.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/pci/controller/pci-host-common.c ++++ b/drivers/pci/controller/pci-host-common.c +@@ -77,6 +77,10 @@ int pci_host_common_probe(struct platfor + if (!pci_has_flag(PCI_PROBE_ONLY)) + pci_add_flags(PCI_REASSIGN_ALL_BUS); + ++ /* Do not reassign bus numbers if probe only */ ++ if (!pci_has_flag(PCI_PROBE_ONLY)) ++ pci_add_flags(PCI_REASSIGN_ALL_BUS); ++ + bridge->sysdata = cfg; + bridge->ops = (struct pci_ops *)&ops->pci_ops; + bridge->msi_domain = true; diff --git a/queue-5.15/series b/queue-5.15/series index 07cb6c18e8..9c259af35d 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -81,3 +81,4 @@ binder-fix-uaf-in-binder_thread_release.patch binder-fix-uaf-in-binder_free_transaction.patch usb-xhci-fix-sleep-in-atomic-context-in-xhci_free_streams.patch pci-altera-do-not-dispose-parent-irq-mapping.patch +pci-host-common-request-bus-reassignment-when-not-probe-only.patch