[PATCH] [correction] promote hose_list to an "official" list

[John Rose]

Hi Paul-

> I get lots of errors compiling this, starting with:
...
> Send me a revised patch, please.
>
> Regards,
> Paul.

My apologies, here's a revised patch.

Thanks-
John

Signed-off-by: John Rose <johnrose at austin.ibm.com>

diff -Nru a/arch/ppc64/kernel/pSeries_iommu.c b/arch/ppc64/kernel/pSeries_iommu.c
--- a/arch/ppc64/kernel/pSeries_iommu.c	Mon Aug 23 11:11:16 2004
+++ b/arch/ppc64/kernel/pSeries_iommu.c	Mon Aug 23 11:11:16 2004
@@ -90,7 +90,7 @@

 static void iommu_buses_init(void)
 {
-	struct pci_controller* phb;
+	struct pci_controller *phb, *tmp;
 	struct device_node *dn, *first_dn;
 	int num_slots, num_slots_ilog2;
 	int first_phb = 1;
@@ -109,7 +109,7 @@
 	/* XXX Should we be using pci_root_buses instead?  -ojn
 	 */

-	for (phb=hose_head; phb; phb=phb->next) {
+	list_for_each_entry_safe(phb, tmp, &hose_list, list_node) {
 		first_dn = ((struct device_node *)phb->arch_data)->child;

 		/* Carve 2GB into the largest dma_window_size possible */
diff -Nru a/arch/ppc64/kernel/pSeries_pci.c b/arch/ppc64/kernel/pSeries_pci.c
--- a/arch/ppc64/kernel/pSeries_pci.c	Mon Aug 23 11:11:16 2004
+++ b/arch/ppc64/kernel/pSeries_pci.c	Mon Aug 23 11:11:16 2004
@@ -728,9 +728,9 @@

 static void phbs_fixup_io(void)
 {
-	struct pci_controller *hose;
+	struct pci_controller *hose, *tmp;

-	for (hose=hose_head;hose;hose=hose->next)
+	list_for_each_entry_safe(hose, tmp, &hose_list, list_node)
 		remap_bus_range(hose->bus);
 }

@@ -763,8 +763,8 @@
 pci_find_hose_for_OF_device(struct device_node *node)
 {
 	while (node) {
-		struct pci_controller *hose;
-		for (hose=hose_head;hose;hose=hose->next)
+		struct pci_controller *hose, *tmp;
+		list_for_each_entry_safe(hose, tmp, &hose_list, list_node)
 			if (hose->arch_data == node)
 				return hose;
 		node=node->parent;
diff -Nru a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c
--- a/arch/ppc64/kernel/pci.c	Mon Aug 23 11:11:16 2004
+++ b/arch/ppc64/kernel/pci.c	Mon Aug 23 11:11:16 2004
@@ -23,6 +23,7 @@
 #include <linux/bootmem.h>
 #include <linux/module.h>
 #include <linux/mm.h>
+#include <linux/list.h>

 #include <asm/processor.h>
 #include <asm/io.h>
@@ -63,8 +64,7 @@

 void iSeries_pcibios_init(void);

-struct pci_controller *hose_head;
-struct pci_controller **hose_tail = &hose_head;
+LIST_HEAD(hose_list);

 struct pci_dma_ops pci_dma_ops;
 EXPORT_SYMBOL(pci_dma_ops);
@@ -240,8 +240,8 @@
         hose->type = controller_type;
         hose->global_number = global_phb_number++;

-        *hose_tail = hose;
-        hose_tail = &hose->next;
+	list_add_tail(&hose->list_node, &hose_list);
+
         return hose;
 }

@@ -281,7 +281,7 @@

 static int __init pcibios_init(void)
 {
-	struct pci_controller *hose;
+	struct pci_controller *hose, *tmp;
 	struct pci_bus *bus;

 #ifdef CONFIG_PPC_ISERIES
@@ -292,7 +292,7 @@
 	printk("PCI: Probing PCI hardware\n");

 	/* Scan all of the recorded PCI controllers.  */
-	for (hose = hose_head; hose; hose = hose->next) {
+	list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
 		hose->last_busno = 0xff;
 		bus = pci_scan_bus(hose->first_busno, hose->ops,
 				   hose->arch_data);
diff -Nru a/arch/ppc64/kernel/pci.h b/arch/ppc64/kernel/pci.h
--- a/arch/ppc64/kernel/pci.h	Mon Aug 23 11:11:16 2004
+++ b/arch/ppc64/kernel/pci.h	Mon Aug 23 11:11:16 2004
@@ -17,9 +17,7 @@
 extern struct pci_controller* pci_alloc_pci_controller(enum phb_types controller_type);
 extern struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node);

-extern struct pci_controller* hose_head;
-extern struct pci_controller** hose_tail;
-
+extern struct list_head hose_list;
 extern int global_phb_number;

 /*******************************************************************
diff -Nru a/arch/ppc64/kernel/pci_dn.c b/arch/ppc64/kernel/pci_dn.c
--- a/arch/ppc64/kernel/pci_dn.c	Mon Aug 23 11:11:16 2004
+++ b/arch/ppc64/kernel/pci_dn.c	Mon Aug 23 11:11:16 2004
@@ -129,10 +129,10 @@
  */
 static void *traverse_all_pci_devices(traverse_func pre)
 {
-	struct pci_controller *phb;
+	struct pci_controller *phb, *tmp;
 	void *ret;

-	for (phb = hose_head; phb; phb = phb->next)
+	list_for_each_entry_safe(phb, tmp, &hose_list, list_node)
 		if ((ret = traverse_pci_devices(phb->arch_data, pre, phb))
 				!= NULL)
 			return ret;
diff -Nru a/arch/ppc64/kernel/pmac_pci.c b/arch/ppc64/kernel/pmac_pci.c
--- a/arch/ppc64/kernel/pmac_pci.c	Mon Aug 23 11:11:16 2004
+++ b/arch/ppc64/kernel/pmac_pci.c	Mon Aug 23 11:11:16 2004
@@ -672,9 +672,9 @@

 static void __init pmac_fixup_phb_resources(void)
 {
-	struct pci_controller *hose;
+	struct pci_controller *hose, *tmp;

-	for (hose = hose_head; hose; hose = hose->next) {
+	list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
 		unsigned long offset = (unsigned long)hose->io_base_virt - pci_io_base;
 		hose->io_resource.start += offset;
 		hose->io_resource.end += offset;
diff -Nru a/include/asm-ppc64/pci-bridge.h b/include/asm-ppc64/pci-bridge.h
--- a/include/asm-ppc64/pci-bridge.h	Mon Aug 23 11:11:16 2004
+++ b/include/asm-ppc64/pci-bridge.h	Mon Aug 23 11:11:16 2004
@@ -33,9 +33,9 @@
 struct pci_controller {
 	char what[8];                     /* Eye catcher      */
 	enum phb_types type;              /* Type of hardware */
-	struct pci_controller *next;
 	struct pci_bus *bus;
 	void *arch_data;
+	struct list_head list_node;

 	int first_busno;
 	int last_busno;


** Sent via the linuxppc64-dev mail list. See http://lists.linuxppc.org/