PCI: host-generic: Fix driver_data overwriting bugs
Subsystems (5)
Marc Zyngier
maintainercover PCI: host-generic: Fix driver_data overwriting bugs
Geert reports that some drivers do rely on the device driver_data field containing a pointer to the bridge structure at the point of initialising the root port, while this has been recently changed to contain some other data for the benefit of the Apple PCIe driver.
This small series builds on top of Geert previously posted (and included as a prefix for reference) fix for the Microchip driver, which breaks the Apple driver. This is basically swapping a regression for another, which isn't a massive deal at this stage, as the follow-up patch fixes things for the Apple driver by adding extra tracking.
Finally, we can revert a one-liner that glued the whole thing together, and that isn't needed anymore.
All of this is candidate for 6.16, as we have regressed the Microchip driver in -rc1, and that fixing it breaks the Apple driver.
Geert Uytterhoeven (1):
PCI: host-generic: Set driver_data before calling gen_pci_init()
Marc Zyngier (2):
PCI: apple: Add tracking of probed root ports
Revert "PCI: ecam: Allow cfg->priv to be pre-populated from the root
port device"
drivers/pci/controller/pci-host-common.c | 4 +- drivers/pci/controller/pcie-apple.c | 53 ++++++++++++++++++++++-- drivers/pci/ecam.c | 2 - 3 files changed, 51 insertions(+), 8 deletions(-)
Signature · 1 line
2.39.2
Marc Zyngier
maintainerPATCH 1/3 PCI: host-generic: Set driver_data before calling gen_pci_init()
From: Geert Uytterhoeven <[email protected]>
On MicroChip MPFS Icicle:
microchip-pcie 2000000000.pcie: host bridge /soc/pcie@2000000000 ranges:
microchip-pcie 2000000000.pcie: Parsing ranges property...
microchip-pcie 2000000000.pcie: MEM 0x2008000000..0x2087ffffff -> 0x0008000000
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000368
Current swapper/0 pgtable: 4K pagesize, 39-bit VAs, pgdp=0x00000000814f1000
[0000000000000368] pgd=0000000000000000, p4d=0000000000000000, pud=0000000000000000
Oops [#1]
Modules linked in:
CPU: 0 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.15.0-rc1-icicle-00003-gafc0a570bb61 #232 NONE
Hardware name: Microchip PolarFire-SoC Icicle Kit (DT)
[...]
[<ffffffff803fb8a4>] plda_pcie_setup_iomems+0xe/0x78
[<ffffffff803fc246>] mc_platform_init+0x80/0x1d2
[<ffffffff803f9c88>] pci_ecam_create+0x104/0x1e2
[<ffffffff8000adbe>] pci_host_common_init+0x120/0x228
[<ffffffff8000af42>] pci_host_common_probe+0x7c/0x8aThe initialization of driver_data was moved after the call to gen_pci_init(), while the pci_ecam_ops.init() callback mc_platform_init() expects it has already been initialized.
Fix this by moving the initialization of driver_data up.
--- drivers/pci/controller/pci-host-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/pci-host-common.c +2 -2
@@ -64,13 +64,13 @@ int pci_host_common_init(struct platform_device *pdev,of_pci_check_probe_only (); +platform_set_drvdata (pdev, bridge); +/* Parse and map our Configuration Space windows */ cfg =gen_pci_init (dev, bridge, ops);if (IS_ERR (cfg))return PTR_ERR (cfg); -platform_set_drvdata (pdev, bridge); - bridge->sysdata = cfg; bridge->ops = (struct pci_ops *)&ops->pci_ops; bridge->enable_device = ops->enable_device;
Signature · 1 line
2.39.2
Marc Zyngier
maintainerPATCH 2/3 PCI: apple: Add tracking of probed root ports
In reply to Marc ZyngierThe apple driver relies on being able to directly find the matching root port structure from the platform device that represents this port.
A previous hack stashed a pointer to the root port structure in the config window private pointer, but that ended up relying on assumptions that break other drivers.
Instead, bite the bullet and track the association as part of the driver itself as a list of probed root ports.
--- drivers/pci/controller/pcie-apple.c | 53 ++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 4 deletions(-)
drivers/pci/controller/pcie-apple.c +49 -4
@@ -187,6 +187,7 @@ struct apple_pcie {const struct hw_info *hw;unsigned long *bitmap;struct list_head ports; +struct list_head entry;struct completion event;struct irq_fwspec fwspec;u32 nvecs;
@@ -205,6 +206,9 @@ struct apple_pcie_port {int idx; }; +static LIST_HEAD (pcie_list); +static DEFINE_MUTEX (pcie_list_lock); +static void rmw_set (u32 set,void __iomem *addr) {writel_relaxed (readl_relaxed (addr) | set, addr);
@@ -720,13 +724,45 @@ static int apple_msi_init(struct apple_pcie *pcie)return 0 ; } +static void apple_pcie_register (struct apple_pcie *pcie) +{ +guard (mutex)(&pcie_list_lock); + +list_add_tail (&pcie->entry, &pcie_list); +} + +static void apple_pcie_unregister (struct apple_pcie *pcie) +{ +guard (mutex)(&pcie_list_lock); + +list_del (&pcie->entry); +} + +static struct apple_pcie *apple_pcie_lookup (struct device *dev) +{ +struct apple_pcie *pcie; + +guard (mutex)(&pcie_list_lock); + +list_for_each_entry (pcie, &pcie_list, entry) { +if (pcie->dev == dev) +return pcie; + } + +return NULL ; +} +static struct apple_pcie_port *apple_pcie_get_port (struct pci_dev *pdev) {struct pci_config_window *cfg = pdev->sysdata; -struct apple_pcie *pcie = cfg->priv; +struct apple_pcie *pcie;struct pci_dev *port_pdev;struct apple_pcie_port *port; + pcie =apple_pcie_lookup (cfg->parent); +if (WARN_ON (!pcie)) +return NULL ; +/* Find the root port this device is on */ port_pdev =pcie_find_root_port (pdev);
@@ -806,10 +842,14 @@ static void apple_pcie_disable_device(struct pci_host_bridge *bridge, struct pcistatic int apple_pcie_init (struct pci_config_window *cfg) { -struct apple_pcie *pcie = cfg->priv;struct device *dev = cfg->parent; +struct apple_pcie *pcie;int ret; + pcie =apple_pcie_lookup (dev); +if (WARN_ON (!pcie)) +return -ENOENT ; +for_each_available_child_of_node_scoped (dev->of_node, of_port) { ret =apple_pcie_setup_port (pcie, of_port);if (ret) {
@@ -852,13 +892,18 @@ static int apple_pcie_probe(struct platform_device *pdev)mutex_init (&pcie->lock);INIT_LIST_HEAD (&pcie->ports); -dev_set_drvdata (dev, pcie); ret =apple_msi_init (pcie);if (ret)return ret; -return pci_host_common_init (pdev, &apple_pcie_cfg_ecam_ops); +apple_pcie_register (pcie); + + ret =pci_host_common_init (pdev, &apple_pcie_cfg_ecam_ops); +if (ret) +apple_pcie_unregister (pcie); + +return ret; }static const struct of_device_id apple_pcie_of_match[] = {
Signature · 1 line
2.39.2
Re: [PATCH 2/3] PCI: apple: Add tracking of probed root ports
Quoted 4 lines · Marc Zyngier
The apple driver relies on being able to directly find the matching root port structure from the platform device that represents this port.
Quoted 8 lines
A previous hack stashed a pointer to the root port structure in the config window private pointer, but that ended up relying on assumptions that break other drivers.
Instead, bite the bullet and track the association as part of the driver itself as a list of probed root ports.
Signed-off-by Marc Zyngier <[email protected]>
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Marc Zyngier
maintainerPATCH 3/3 Revert "PCI: ecam: Allow cfg->priv to be pre-populated from the root port device"
In reply to Marc ZyngierThis reverts commit 4900454b4f819e88e9c57ed93542bf9325d7e161.
Now that nobody relies of cfg->priv containing anything useful before the .init() callback is used, restore the previous behaviour.
--- drivers/pci/ecam.c | 2 -- 1 file changed, 2 deletions(-)
drivers/pci/ecam.c +0 -2
@@ -84,8 +84,6 @@ struct pci_config_window *pci_ecam_create(struct device *dev, goto err_exit_iomap; } - cfg->priv =dev_get_drvdata (dev); -if (ops->init) { err = ops->init (cfg);if (err)
Signature · 1 line
2.39.2
Re: [PATCH 3/3] Revert "PCI: ecam: Allow cfg->priv to be pre-populated from the root port device"
Quoted 6 lines · Marc Zyngier
This reverts commit
4900454b4f819e88e9c57ed93542bf9325d7e161.Now that nobody relies of
cfg->privcontaining anything useful before the .init() callback is used, restore the previous behaviour.Signed-off-by Marc Zyngier <[email protected]>
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Marc,
Quoted 12 lines · Marc Zyngier
Geert reports that some drivers do rely on the device
driver_datafield containing a pointer to the bridge structure at the point of initialising the root port, while this has been recently changed to contain some other data for the benefit of the Apple PCIe driver.This small series builds on top of Geert previously posted (and included as a prefix for reference) fix for the Microchip driver, which breaks the Apple driver. This is basically swapping a regression for another, which isn't a massive deal at this stage, as the follow-up patch fixes things for the Apple driver by adding extra tracking.
Quoted 2 lines
Finally, we can revert a one-liner that glued the whole thing together, and that isn't needed anymore.
Thanks, works fine on Icicle.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Quoted 11 lines · Marc Zyngier
Geert reports that some drivers do rely on the device
driver_datafield containing a pointer to the bridge structure at the point of initialising the root port, while this has been recently changed to contain some other data for the benefit of the Apple PCIe driver.This small series builds on top of Geert previously posted (and included as a prefix for reference) fix for the Microchip driver, which breaks the Apple driver. This is basically swapping a regression for another, which isn't a massive deal at this stage, as the follow-up patch fixes things for the Apple driver by adding extra tracking.
Is there a bisection hole between patches 1 and 2?
1: PCI: host-generic: Set driver_data before calling gen_pci_init() 2: PCI: apple: Add tracking of probed root ports
If so, would it be practical to avoid the hole by reordering those patches?
Quoted 22 lines
Finally, we can revert a one-liner that glued the whole thing together, and that isn't needed anymore.
All of this is candidate for 6.16, as we have regressed the Microchip driver in -rc1, and that fixing it breaks the Apple driver.
Geert Uytterhoeven (1):
PCI: host-generic: Setdriver_databefore callinggen_pci_init()Marc Zyngier (2):
PCI: apple: Add tracking of probed root ports
Revert "PCI: ecam: Allowcfg->privto be pre-populated from the root
port device"drivers/pci/controller/pci-host-common.c | 4 +- drivers/pci/controller/pcie-apple.c | 53 ++++++++++++++++++++++-- drivers/pci/ecam.c | 2 - 3 files changed, 51 insertions(+), 8 deletions(-)Signature · 1 line
2.39.2
Marc Zyngier
maintainerQuoted 14 lines · Bjorn Helgaas
Quoted 11 lines · Marc Zyngier
Geert reports that some drivers do rely on the device
driver_datafield containing a pointer to the bridge structure at the point of initialising the root port, while this has been recently changed to contain some other data for the benefit of the Apple PCIe driver.This small series builds on top of Geert previously posted (and included as a prefix for reference) fix for the Microchip driver, which breaks the Apple driver. This is basically swapping a regression for another, which isn't a massive deal at this stage, as the follow-up patch fixes things for the Apple driver by adding extra tracking.
Quoted 7 lines
Is there a bisection hole between patches 1 and 2?
1: PCI: host-generic: Set
driver_databefore callinggen_pci_init()2: PCI: apple: Add tracking of probed root portsIf so, would it be practical to avoid the hole by reordering those patches?
Sure, but you said you already had queued patch #1, and what is in -rc1 already breaks Geert's box. So no matter the order, we break something at some point.
If you want to only break one thing, then yes, swapping these two patches is the correct thing to do.
Thanks,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Quoted 21 lines · Marc Zyngier
Quoted 19 lines · Bjorn Helgaas
Quoted 11 lines · Marc Zyngier
Geert reports that some drivers do rely on the device
driver_datafield containing a pointer to the bridge structure at the point of initialising the root port, while this has been recently changed to contain some other data for the benefit of the Apple PCIe driver.This small series builds on top of Geert previously posted (and included as a prefix for reference) fix for the Microchip driver, which breaks the Apple driver. This is basically swapping a regression for another, which isn't a massive deal at this stage, as the follow-up patch fixes things for the Apple driver by adding extra tracking.
Is there a bisection hole between patches 1 and 2?
1: PCI: host-generic: Set
driver_databefore callinggen_pci_init()2: PCI: apple: Add tracking of probed root ports
Quoted 6 lines
Quoted 2 lines
If so, would it be practical to avoid the hole by reordering those patches?
Sure, but you said you already had queued patch #1, and what is in -rc1 already breaks Geert's box. So no matter the order, we break something at some point.
I did, but when I saw your problem report and subsequent updates, I put Geert's patch on hold.
Quoted 2 lines
If you want to only break one thing, then yes, swapping these two patches is the correct thing to do.
I swapped them and put them back on pci/for-linus for v6.16:
https://git.kernel.org/cgit/linux/kernel/git/pci/pci.git/log/?h=for-linus&id=ba74278c638d
Marc Zyngier
maintainerQuoted 33 lines · Bjorn Helgaas
Quoted 21 lines · Marc Zyngier
Quoted 19 lines · Bjorn Helgaas
Quoted 11 lines · Marc Zyngier
Geert reports that some drivers do rely on the device
driver_datafield containing a pointer to the bridge structure at the point of initialising the root port, while this has been recently changed to contain some other data for the benefit of the Apple PCIe driver.This small series builds on top of Geert previously posted (and included as a prefix for reference) fix for the Microchip driver, which breaks the Apple driver. This is basically swapping a regression for another, which isn't a massive deal at this stage, as the follow-up patch fixes things for the Apple driver by adding extra tracking.
Is there a bisection hole between patches 1 and 2?
1: PCI: host-generic: Set
driver_databefore callinggen_pci_init()2: PCI: apple: Add tracking of probed root portsQuoted 6 lines
Quoted 2 lines
If so, would it be practical to avoid the hole by reordering those patches?
Sure, but you said you already had queued patch #1, and what is in -rc1 already breaks Geert's box. So no matter the order, we break something at some point.
I did, but when I saw your problem report and subsequent updates, I put Geert's patch on hold.
Quoted 7 lines
Quoted 2 lines
If you want to only break one thing, then yes, swapping these two patches is the correct thing to do.
I swapped them and put them back on pci/for-linus for v6.16:
https://git.kernel.org/cgit/linux/kernel/git/pci/pci.git/log/?h=for-linus&id=ba74278c638d
LGTM, thanks for picking these up!
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
This series was applied to riscv/linux.git (fixes) by Bjorn Helgaas <[email protected]>:
Hello:
This series was applied to riscv/linux.git (fixes) by Bjorn Helgaas <[email protected]>:
Quoted 5 lines · On Wed, 25 Jun 2025 12:18:03 +0100 you wrote:
Geert reports that some drivers do rely on the device
driver_datafield containing a pointer to the bridge structure at the point of initialising the root port, while this has been recently changed to contain some other data for the benefit of the Apple PCIe driver.
Quoted 8 lines
This small series builds on top of Geert previously posted (and included as a prefix for reference) fix for the Microchip driver, which breaks the Apple driver. This is basically swapping a regression for another, which isn't a massive deal at this stage, as the follow-up patch fixes things for the Apple driver by adding extra tracking.
[...]
Here is the summary with links:
- [1/3] PCI: host-generic: Set driver_data before calling gen_pci_init()
https://git.kernel.org/riscv/c/bdb32a0f6780 - [2/3] PCI: apple: Add tracking of probed root ports https://git.kernel.org/riscv/c/643c0c9d0496 - [3/3] Revert "PCI: ecam: Allow cfg->priv to be pre-populated from the root port device" https://git.kernel.org/riscv/c/ba74278c638d
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html