From: Jiang Liu <liuj97@xxxxxxxxx>
This patch turns on PCI bus lock mechanism for IA64 platforms.
Signed-off-by: Jiang Liu <liuj97@xxxxxxxxx>
---
arch/ia64/pci/pci.c | 2 ++
arch/ia64/sn/kernel/io_init.c | 1 +
arch/ia64/sn/pci/tioca_provider.c | 4 +++-
drivers/pci/Kconfig | 2 +-
4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index d173a88..259a2e1 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -387,6 +387,8 @@ pci_acpi_scan_root(struct acpi_pci_root *root)
}
pci_scan_child_bus(pbus);
+ pci_bus_unlock(pbus);
+
return pbus;
out3:
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 238e2c5..67e8ce9 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -329,6 +329,7 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
goto error_return; /* error, or bus already scanned */
bus->sysdata = controller;
+ pci_bus_unlock(bus);
return;
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index a70b11f..79f8226 100644
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
@@ -624,7 +624,7 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
nasid_to_cnodeid(tioca_common->ca_closest_nasid);
tioca_common->ca_kernel_private = (u64) tioca_kern;
- bus = pci_find_bus(tioca_common->ca_common.bs_persist_segment,
+ bus = pci_get_bus(tioca_common->ca_common.bs_persist_segment,
tioca_common->ca_common.bs_persist_busnum);
BUG_ON(!bus);
tioca_kern->ca_devices = &bus->devices;
@@ -634,6 +634,7 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
if (tioca_gart_init(tioca_kern) < 0) {
kfree(tioca_kern);
kfree(tioca_common);
+ pci_bus_put(bus);
return NULL;
}
@@ -654,6 +655,7 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
/* Setup locality information */
controller->node = tioca_kern->ca_closest_node;
+ pci_bus_put(bus);
return tioca_common;
}
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 1bbe924..5a796c0 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -122,4 +122,4 @@ config PCI_LABEL
select NLS
config PCI_BUS_LOCK
- def_bool y if X86
+ def_bool y if (X86 || IA64)
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
