iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parisc: advertise PCI devs after "assign_resources"

Browse Source 
Alex Chiang asked me why PARISC was calling pci_bus_add_devices()
and pci_bus_assign_resources() in the opposite order from everyone else.
No reason and I couldn't see any data dependency.
Patch below applies cleanly to 2.6.30-rc2.

Later, I suspected the code worked only because no drivers would be
loaded/ready until much later in the system initialization sequence.

Tested "LBA" code on J6000 (32-bit) and A500 (64-bit SMP) with 2.6.30-rc2.
Not tested with any Dino controllers.
Not tested with PCI-PCI Bridge (TBD).

Reported-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
This commit is contained in:
Grant Grundler 2009-04-20 04:28:22 +00:00 committed by Kyle McMartin
parent 7d17e27631
commit fed99b1e86
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/parisc/dino.c
View File

@ -1019,22 +1019,22 @@ static int __init dino_probe(struct parisc_device *dev)
** It's not used to avoid chicken/egg problems ** It's not used to avoid chicken/egg problems
** with configuration accessor functions. ** with configuration accessor functions.
*/ */
bus = pci_scan_bus_parented(&dev->dev, dino_current_bus, dino_dev->hba.hba_bus = bus = pci_scan_bus_parented(&dev->dev,
&dino_cfg_ops, NULL); dino_current_bus, &dino_cfg_ops, NULL);
if(bus) { if(bus) {
pci_bus_add_devices(bus);
/* This code *depends* on scanning being single threaded /* This code *depends* on scanning being single threaded
* if it isn't, this global bus number count will fail * if it isn't, this global bus number count will fail
*/ */
dino_current_bus = bus->subordinate + 1; dino_current_bus = bus->subordinate + 1;
pci_bus_assign_resources(bus); pci_bus_assign_resources(bus);
pci_bus_add_devices(bus);
} else { } else {
printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (probably duplicate bus number %d)\n", printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (duplicate bus number %d?)\n",
dev_name(&dev->dev), dino_current_bus); dev_name(&dev->dev), dino_current_bus);
/* increment the bus number in case of duplicates */ /* increment the bus number in case of duplicates */
dino_current_bus++; dino_current_bus++;
} }
dino_dev->hba.hba_bus = bus;
return 0; return 0;
} }

10
drivers/parisc/lba_pci.c
View File

@ -1509,10 +1509,6 @@ lba_driver_probe(struct parisc_device *dev)
lba_bus = lba_dev->hba.hba_bus = lba_bus = lba_dev->hba.hba_bus =
pci_scan_bus_parented(&dev->dev, lba_dev->hba.bus_num.start, pci_scan_bus_parented(&dev->dev, lba_dev->hba.bus_num.start,
cfg_ops, NULL); cfg_ops, NULL);
if (lba_bus) {
lba_next_bus = lba_bus->subordinate + 1;
pci_bus_add_devices(lba_bus);
}
/* This is in lieu of calling pci_assign_unassigned_resources() */ /* This is in lieu of calling pci_assign_unassigned_resources() */
if (is_pdc_pat()) { if (is_pdc_pat()) {
@ -1533,7 +1529,6 @@ lba_driver_probe(struct parisc_device *dev)
} }
pci_enable_bridges(lba_bus); pci_enable_bridges(lba_bus);
/* /*
** Once PCI register ops has walked the bus, access to config ** Once PCI register ops has walked the bus, access to config
** space is restricted. Avoids master aborts on config cycles. ** space is restricted. Avoids master aborts on config cycles.
@ -1543,6 +1538,11 @@ lba_driver_probe(struct parisc_device *dev)
lba_dev->flags |= LBA_FLAG_SKIP_PROBE; lba_dev->flags |= LBA_FLAG_SKIP_PROBE;
} }
if (lba_bus) {
lba_next_bus = lba_bus->subordinate + 1;
pci_bus_add_devices(lba_bus);
}
/* Whew! Finally done! Tell services we got this one covered. */ /* Whew! Finally done! Tell services we got this one covered. */
return 0; return 0;
} }