[POWERPC] Merge 32 and 64 bits pcibios_enable_device

This merge the two implementations, based on the previously
fixed up 32 bits one.  The pcibios_enable_device_hook in ppc_md
is now available for ppc64 use.  Also remove the new unused
"initial" parameter from it and fixup users.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

6 files changed, 53 insertions, 86 deletions

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index f706b7e83d7e..8935661d12d0 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1127,3 +1127,41 @@ void __devinit pcibios_claim_one_bus(struct pci_bus *bus)
 }
 EXPORT_SYMBOL_GPL(pcibios_claim_one_bus);
 #endif /* CONFIG_HOTPLUG */
+
+int pcibios_enable_device(struct pci_dev *dev, int mask)
+{
+        u16 cmd, old_cmd;
+        int idx;
+        struct resource *r;
+
+        if (ppc_md.pcibios_enable_device_hook)
+                if (ppc_md.pcibios_enable_device_hook(dev))
+                        return -EINVAL;
+
+        pci_read_config_word(dev, PCI_COMMAND, &cmd);
+        old_cmd = cmd;
+        for (idx = 0; idx < PCI_NUM_RESOURCES; idx++) {
+                /* Only set up the requested stuff */
+                if (!(mask & (1 << idx)))
+                        continue;
+                r = &dev->resource[idx];
+                if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
+                        continue;
+                if (r->flags & IORESOURCE_UNSET) {
+                        printk(KERN_ERR "PCI: Device %s not available because"
+                               " of resource collisions\n", pci_name(dev));
+                        return -EINVAL;
+                }
+                if (r->flags & IORESOURCE_IO)
+                        cmd |= PCI_COMMAND_IO;
+                if (r->flags & IORESOURCE_MEM)
+                        cmd |= PCI_COMMAND_MEMORY;
+        }
+        if (cmd != old_cmd) {
+                printk("PCI: Enabling device %s (%04x -> %04x)\n",
+                       pci_name(dev), old_cmd, cmd);
+                pci_write_config_word(dev, PCI_COMMAND, cmd);
+        }
+        return 0;
+}
+
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 12b74fd098ee..37cb7b944319 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -518,43 +518,6 @@ pcibios_update_irq(struct pci_dev *dev, int irq)
         /* XXX FIXME - update OF device tree node interrupt property */
 }
 
-int pcibios_enable_device(struct pci_dev *dev, int mask)
-{
-        u16 cmd, old_cmd;
-        int idx;
-        struct resource *r;
-
-        if (ppc_md.pcibios_enable_device_hook)
-                if (ppc_md.pcibios_enable_device_hook(dev, 0))
-                        return -EINVAL;
-                
-        pci_read_config_word(dev, PCI_COMMAND, &cmd);
-        old_cmd = cmd;
-        for (idx = 0; idx < PCI_NUM_RESOURCES; idx++) {
-                /* Only set up the requested stuff */
-                if (!(mask & (1 << idx)))
-                        continue;
-                r = &dev->resource[idx];
-                if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
-                        continue;
-                if (r->flags & IORESOURCE_UNSET) {
-                        printk(KERN_ERR "PCI: Device %s not available because"
-                               " of resource collisions\n", pci_name(dev));
-                        return -EINVAL;
-                }
-                if (r->flags & IORESOURCE_IO)
-                        cmd |= PCI_COMMAND_IO;
-                if (r->flags & IORESOURCE_MEM)
-                        cmd |= PCI_COMMAND_MEMORY;
-        }
-        if (cmd != old_cmd) {
-                printk("PCI: Enabling device %s (%04x -> %04x)\n",
-                       pci_name(dev), old_cmd, cmd);
-                pci_write_config_word(dev, PCI_COMMAND, cmd);
-        }
-        return 0;
-}
-
 static struct pci_controller*
 pci_bus_to_hose(int bus)
 {
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 2ec040b314d4..5949bbabd7fb 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -436,36 +436,6 @@ static int __init pcibios_init(void)
 
 subsys_initcall(pcibios_init);
 
-int pcibios_enable_device(struct pci_dev *dev, int mask)
-{
-        u16 cmd, oldcmd;
-        int i;
-
-        pci_read_config_word(dev, PCI_COMMAND, &cmd);
-        oldcmd = cmd;
-
-        for (i = 0; i < PCI_NUM_RESOURCES; i++) {
-                struct resource *res = &dev->resource[i];
-
-                /* Only set up the requested stuff */
-                if (!(mask & (1<<i)))
-                        continue;
-
-                if (res->flags & IORESOURCE_IO)
-                        cmd |= PCI_COMMAND_IO;
-                if (res->flags & IORESOURCE_MEM)
-                        cmd |= PCI_COMMAND_MEMORY;
-        }
-
-        if (cmd != oldcmd) {
-                printk(KERN_DEBUG "PCI: Enabling device: (%s), cmd %x\n",
-                       pci_name(dev), cmd);
-                /* Enable the appropriate bits in the PCI command register.  */
-                pci_write_config_word(dev, PCI_COMMAND, cmd);
-        }
-        return 0;
-}
-
 #ifdef CONFIG_HOTPLUG
 
 int pcibios_unmap_io_space(struct pci_bus *bus)
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 6bbf3c881711..1e51a8ee2b7d 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -1058,8 +1058,7 @@ void __init pmac_pci_init(void)
 #endif
 }
 
-int
-pmac_pci_enable_device_hook(struct pci_dev *dev, int initial)
+int pmac_pci_enable_device_hook(struct pci_dev *dev)
 {
         struct device_node* node;
         int updatecfg = 0;
@@ -1101,26 +1100,25 @@ pmac_pci_enable_device_hook(struct pci_dev *dev, int initial)
                 updatecfg = 1;
         }
 
+        /*
+         * Fixup various header fields on 32 bits. We don't do that on
+         * 64 bits as some of these have strange values behind the HT
+         * bridge and we must not, for example, enable MWI or set the
+         * cache line size on them.
+         */
+#ifdef CONFIG_PPC32
         if (updatecfg) {
                 u16 cmd;
 
-                /*
-                 * Make sure PCI is correctly configured
-                 *
-                 * We use old pci_bios versions of the function since, by
-                 * default, gmac is not powered up, and so will be absent
-                 * from the kernel initial PCI lookup.
-                 *
-                 * Should be replaced by 2.4 new PCI mechanisms and really
-                 * register the device.
-                 */
                 pci_read_config_word(dev, PCI_COMMAND, &cmd);
                 cmd |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER
                         | PCI_COMMAND_INVALIDATE;
                 pci_write_config_word(dev, PCI_COMMAND, cmd);
                 pci_write_config_byte(dev, PCI_LATENCY_TIMER, 16);
+
                 pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE,
                                       L1_CACHE_BYTES >> 2);
+#endif
         }
 
         return 0;
diff --git a/arch/powerpc/platforms/powermac/pmac.h b/arch/powerpc/platforms/powermac/pmac.h
index fcde070f7054..b3abaaf61eb4 100644
--- a/arch/powerpc/platforms/powermac/pmac.h
+++ b/arch/powerpc/platforms/powermac/pmac.h
@@ -26,7 +26,7 @@ extern void pmac_pci_init(void);
 extern void pmac_nvram_update(void);
 extern unsigned char pmac_nvram_read_byte(int addr);
 extern void pmac_nvram_write_byte(int addr, unsigned char val);
-extern int pmac_pci_enable_device_hook(struct pci_dev *dev, int initial);
+extern int pmac_pci_enable_device_hook(struct pci_dev *dev);
 extern void pmac_pcibios_after_init(void);
 extern int of_show_percpuinfo(struct seq_file *m, int i);
 
diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index ed9103148690..79c704ed5381 100644
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -204,12 +204,6 @@ struct machdep_calls {
         /*
          * optional PCI "hooks"
          */
-
-        /* Called when pci_enable_device() is called (initial=0) or
-         * when a device with no assigned resource is found (initial=1).
-         * Returns 0 to allow assignment/enabling of the device. */
-        int  (*pcibios_enable_device_hook)(struct pci_dev *, int initial);
-
         /* Called in indirect_* to avoid touching devices */
         int (*pci_exclude_device)(struct pci_controller *, unsigned char, unsigned char);
 
@@ -225,6 +219,10 @@ struct machdep_calls {
         /* Called for each PCI bus in the system when it's probed */
         void (*pcibios_fixup_bus)(struct pci_bus *);
 
+        /* Called when pci_enable_device() is called. Returns 0 to
+         * allow assignment/enabling of the device. */
+        int  (*pcibios_enable_device_hook)(struct pci_dev *);
+
         /* Called to shutdown machine specific hardware not already controlled
          * by other drivers.
          */