From: Rajesh Shah <rajesh.shah@intel.com>
With root bridge and pci bridge hot-plug, new buses and devices can be added
or removed at run time. Protect the pci bus and device lists with the pci
lock when doing so.
Signed-off-by: Rajesh Shah <rajesh.shah@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/pci/probe.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletion(-)
diff -puN drivers/pci/probe.c~acpi-bridge-hotadd-take-the-pci-lock-when-modifying-pci-bus-or-device-lists drivers/pci/probe.c
--- 25/drivers/pci/probe.c~acpi-bridge-hotadd-take-the-pci-lock-when-modifying-pci-bus-or-device-lists 2005-03-30 18:01:12.000000000 -0800
+++ 25-akpm/drivers/pci/probe.c 2005-03-30 18:01:12.000000000 -0800
@@ -9,6 +9,7 @@
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/cpumask.h>
+#include "pci.h"
#define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */
#define CARDBUS_RESERVE_BUSNR 3
@@ -369,8 +370,11 @@ struct pci_bus * __devinit pci_add_new_b
struct pci_bus *child;
child = pci_alloc_child_bus(parent, dev, busnr);
- if (child)
+ if (child) {
+ spin_lock(&pci_bus_lock);
list_add_tail(&child->node, &parent->children);
+ spin_unlock(&pci_bus_lock);
+ }
return child;
}
@@ -760,7 +764,9 @@ pci_scan_single_device(struct pci_bus *b
* and the bus list for fixup functions, etc.
*/
INIT_LIST_HEAD(&dev->global_list);
+ spin_lock(&pci_bus_lock);
list_add_tail(&dev->bus_list, &bus->devices);
+ spin_unlock(&pci_bus_lock);
return dev;
}
@@ -881,7 +887,9 @@ struct pci_bus * __devinit pci_scan_bus_
pr_debug("PCI: Bus %04x:%02x already known\n", pci_domain_nr(b), bus);
goto err_out;
}
+ spin_lock(&pci_bus_lock);
list_add_tail(&b->node, &pci_root_buses);
+ spin_unlock(&pci_bus_lock);
memset(dev, 0, sizeof(*dev));
dev->parent = parent;
@@ -923,7 +931,9 @@ class_dev_create_file_err:
class_dev_reg_err:
device_unregister(dev);
dev_reg_err:
+ spin_lock(&pci_bus_lock);
list_del(&b->node);
+ spin_unlock(&pci_bus_lock);
err_out:
kfree(dev);
kfree(b);
_