1 files changed, 29 insertions, 6 deletions

diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 523f35087e81..f73a16e9867a 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -34,7 +34,7 @@
 
 #ifdef DEBUG
 #include <asm/udbg.h>
-#define DBG(fmt...) udbg_printf(fmt)
+#define DBG(fmt...) printk(fmt)
 #else
 #define DBG(fmt...)
 #endif
@@ -323,6 +323,7 @@ static void pci_parse_of_addrs(struct device_node *node, struct pci_dev *dev)
         addrs = (u32 *) get_property(node, "assigned-addresses", &proplen);
         if (!addrs)
                 return;
+        DBG("    parse addresses (%d bytes) @ %p\n", proplen, addrs);
         for (; proplen >= 20; proplen -= 20, addrs += 5) {
                 flags = pci_parse_of_flags(addrs[0]);
                 if (!flags)
@@ -332,6 +333,9 @@ static void pci_parse_of_addrs(struct device_node *node, struct pci_dev *dev)
                 if (!size)
                         continue;
                 i = addrs[0] & 0xff;
+                DBG("  base: %llx, size: %llx, i: %x\n",
+                    (unsigned long long)base, (unsigned long long)size, i);
+
                 if (PCI_BASE_ADDRESS_0 <= i && i <= PCI_BASE_ADDRESS_5) {
                         res = &dev->resource[(i - PCI_BASE_ADDRESS_0) >> 2];
                 } else if (i == dev->rom_base_reg) {
@@ -362,6 +366,8 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
         if (type == NULL)
                 type = "";
 
+        DBG("    create device, devfn: %x, type: %s\n", devfn, type);
+
         memset(dev, 0, sizeof(struct pci_dev));
         dev->bus = bus;
         dev->sysdata = node;
@@ -381,6 +387,8 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
                 dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));
         dev->class = get_int_prop(node, "class-code", 0);
 
+        DBG("    class: 0x%x\n", dev->class);
+
         dev->current_state = 4;         /* unknown power state */
 
         if (!strcmp(type, "pci")) {
@@ -402,6 +410,8 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
 
         pci_parse_of_addrs(node, dev);
 
+        DBG("    adding to system ...\n");
+
         pci_device_add(dev, bus);
 
         /* XXX pci_scan_msi_device(dev); */
@@ -418,15 +428,21 @@ void __devinit of_scan_bus(struct device_node *node,
         int reglen, devfn;
         struct pci_dev *dev;
 
+        DBG("of_scan_bus(%s) bus no %d... \n", node->full_name, bus->number);
+
         while ((child = of_get_next_child(node, child)) != NULL) {
+                DBG("  * %s\n", child->full_name);
                 reg = (u32 *) get_property(child, "reg", &reglen);
                 if (reg == NULL || reglen < 20)
                         continue;
                 devfn = (reg[0] >> 8) & 0xff;
+
                 /* create a new pci_dev for this device */
                 dev = of_create_pci_dev(child, bus, devfn);
                 if (!dev)
                         continue;
+                DBG("dev header type: %x\n", dev->hdr_type);
+
                 if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
                     dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
                         of_scan_pci_bridge(child, dev);
@@ -446,16 +462,18 @@ void __devinit of_scan_pci_bridge(struct device_node *node,
         unsigned int flags;
         u64 size;
 
+        DBG("of_scan_pci_bridge(%s)\n", node->full_name);
+
         /* parse bus-range property */
         busrange = (u32 *) get_property(node, "bus-range", &len);
         if (busrange == NULL || len != 8) {
-                printk(KERN_ERR "Can't get bus-range for PCI-PCI bridge %s\n",
+                printk(KERN_DEBUG "Can't get bus-range for PCI-PCI bridge %s\n",
                        node->full_name);
                 return;
         }
         ranges = (u32 *) get_property(node, "ranges", &len);
         if (ranges == NULL) {
-                printk(KERN_ERR "Can't get ranges for PCI-PCI bridge %s\n",
+                printk(KERN_DEBUG "Can't get ranges for PCI-PCI bridge %s\n",
                        node->full_name);
                 return;
         }
@@ -509,10 +527,13 @@ void __devinit of_scan_pci_bridge(struct device_node *node,
         }
         sprintf(bus->name, "PCI Bus %04x:%02x", pci_domain_nr(bus),
                 bus->number);
+        DBG("    bus name: %s\n", bus->name);
 
         mode = PCI_PROBE_NORMAL;
         if (ppc_md.pci_probe_mode)
                 mode = ppc_md.pci_probe_mode(bus);
+        DBG("    probe mode: %d\n", mode);
+
         if (mode == PCI_PROBE_DEVTREE)
                 of_scan_bus(node, bus);
         else if (mode == PCI_PROBE_NORMAL)
@@ -528,6 +549,8 @@ void __devinit scan_phb(struct pci_controller *hose)
         int i, mode;
         struct resource *res;
 
+        DBG("Scanning PHB %s\n", node ? node->full_name : "<NO NAME>");
+
         bus = pci_create_bus(NULL, hose->first_busno, hose->ops, node);
         if (bus == NULL) {
                 printk(KERN_ERR "Failed to create bus for PCI domain %04x\n",
@@ -552,8 +575,9 @@ void __devinit scan_phb(struct pci_controller *hose)
 
         mode = PCI_PROBE_NORMAL;
 #ifdef CONFIG_PPC_MULTIPLATFORM
-        if (ppc_md.pci_probe_mode)
+        if (node && ppc_md.pci_probe_mode)
                 mode = ppc_md.pci_probe_mode(bus);
+        DBG("    probe mode: %d\n", mode);
         if (mode == PCI_PROBE_DEVTREE) {
                 bus->subordinate = hose->last_busno;
                 of_scan_bus(node, bus);
@@ -842,8 +866,7 @@ pgprot_t pci_phys_mem_access_prot(struct file *file,
  * Returns a negative error code on failure, zero on success.
  */
 int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
-                        enum pci_mmap_state mmap_state,
-                        int write_combine)
+                        enum pci_mmap_state mmap_state, int write_combine)
 {
         unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
         struct resource *rp;