pci: make sure to activate devices on the root bus
PATCH 1/1 pci: make sure to activate devices on the root bus
Commit b8a1bb1dd215 (pci: defer device registration until after bridge setup) changed the activation order of devices, so that bridges above the devices could be configured properly before activating the devices below. This commit failed to acknowledge that there may be devices located directly on the root bus without any bridge in between and so those devices would never get enabled.
--- drivers/pci/pci.c | 7 +++++++ include/linux/pci.h | 1 + 2 files changed, 8 insertions(+)
drivers/pci/pci.c +7 -0
@@ -348,6 +348,12 @@ unsigned int pci_scan_bus(struct pci_bus *bus) dev->rom_address = (l ==0xffffffff ) ?0 : l;setup_device (dev,6 ); +/* +* If this device is on the root bus, there is no bridge +* to configure, so we can activate it right away. +*/ +if (!bus->parent_bus) +pci_register_device (dev);break ;case PCI_HEADER_TYPE_BRIDGE :setup_device (dev,2 );
@@ -356,6 +362,7 @@ unsigned int pci_scan_bus(struct pci_bus *bus)/* inherit parent properties */ child_bus->host = bus->host; child_bus->ops = bus->host->pci_ops; + child_bus->parent_bus = bus; child_bus->resource[PCI_BUS_RESOURCE_MEM ] = bus->resource[PCI_BUS_RESOURCE_MEM ]; child_bus->resource[PCI_BUS_RESOURCE_MEM_PREF] =
include/linux/pci.h +1 -0
@@ -123,6 +123,7 @@ enum {struct pci_bus {struct pci_controller *host;/* associated host controller */ struct device_d *parent; +struct pci_bus *parent_bus;/* parent bus */ struct list_head node;/* node in list of buses */ struct list_head children;/* list of child buses */ struct list_head devices;/* list of devices on this bus */
Signature · 7 lines
2.1.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Quoted 7 lines · Lucas Stach
Commit
b8a1bb1dd215(pci: defer device registration until after bridge setup) changed the activation order of devices, so that bridges above the devices could be configured properly before activating the devices below. This commit failed to acknowledge that there may be devices located directly on the root bus without any bridge in between and so those devices would never get enabled.Signed-off-by Lucas Stach <[email protected]>
The patch properly fixes registration for root bus attached devices, so
Thanks.
Quoted 36 lines
--- drivers/pci/pci.c | 7 +++++++ include/linux/pci.h | 1 + 2 files changed, 8 insertions(+)drivers/pci/pci.c +7
-0@@ -348,6 +348,12 @@ unsigned int pci_scan_bus(struct pci_bus *bus) dev->rom_address = (l ==0xffffffff ) ?0 : l;setup_device (dev,6 ); +/* +* If this device is on the root bus, there is no bridge +* to configure, so we can activate it right away. +*/ +if (!bus->parent_bus) +pci_register_device (dev);break ;case PCI_HEADER_TYPE_BRIDGE :setup_device (dev,2 );@@ -356,6 +362,7 @@ unsigned int pci_scan_bus(struct pci_bus *bus)/* inherit parent properties */ child_bus->host = bus->host; child_bus->ops = bus->host->pci_ops; + child_bus->parent_bus = bus; child_bus->resource[PCI_BUS_RESOURCE_MEM ] = bus->resource[PCI_BUS_RESOURCE_MEM ]; child_bus->resource[PCI_BUS_RESOURCE_MEM_PREF] =include/linux/pci.h +0
-0
include/linux/pci.h enum { · line 129
Quoted 7 lines
include/linux/pci.h +1
-0@@ -123,6 +123,7 @@ enum {struct pci_bus {struct pci_controller *host;/* associated host controller */ struct device_d *parent; +struct pci_bus *parent_bus;/* parent bus */ struct list_head node;/* node in list of buses */ struct list_head children;/* list of child buses */ struct list_head devices;/* list of devices on this bus */
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Sascha Hauer
AppliedQuoted 11 lines · Lucas Stach
Commit
b8a1bb1dd215(pci: defer device registration until after bridge setup) changed the activation order of devices, so that bridges above the devices could be configured properly before activating the devices below. This commit failed to acknowledge that there may be devices located directly on the root bus without any bridge in between and so those devices would never get enabled.Signed-off-by Lucas Stach <[email protected]>--- drivers/pci/pci.c | 7 +++++++ include/linux/pci.h | 1 + 2 files changed, 8 insertions(+)
Applied, thanks
Sascha
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox