diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2026-06-23 17:32:05 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2026-06-23 17:32:05 -0500 |
| commit | 34de2910286cad2fe67d7342b4732d3e52d3301d (patch) | |
| tree | ac783a48fb498d84457cd000b8bfe13a08c8404a /drivers/pci | |
| parent | ae385ca8123256618d259efbb132586002e77e70 (diff) | |
| parent | fda8749ba73638f5bbca3ffb39bc6861eb3b23fa (diff) | |
| download | linux-next-34de2910286cad2fe67d7342b4732d3e52d3301d.tar.gz linux-next-34de2910286cad2fe67d7342b4732d3e52d3301d.zip | |
Merge branch 'pci/controller/host-common'
- Request bus reassignment when not probe-only to fix an enumeration
regression on Marvell CN106XX and possibly other DT-based systems
(Ratheesh Kannoth)
* pci/controller/host-common:
PCI: host-common: Request bus reassignment when not probe-only
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/controller/pci-host-common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/pci/controller/pci-host-common.c b/drivers/pci/controller/pci-host-common.c index d6258c1cffe5..99952fb7189b 100644 --- a/drivers/pci/controller/pci-host-common.c +++ b/drivers/pci/controller/pci-host-common.c @@ -68,6 +68,10 @@ int pci_host_common_init(struct platform_device *pdev, if (IS_ERR(cfg)) return PTR_ERR(cfg); + /* 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->enable_device = ops->enable_device; |