9 files changed, 87 insertions, 18 deletions

diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 8cdd48ea4391..1448af92c6a9 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -809,8 +809,9 @@ system_reset_iSeries:
         mtmsrd  r24                     /* RI on */
         lhz     r24,PACAPACAINDEX(r13)  /* Get processor # */
         cmpwi   0,r24,0                 /* Are we processor 0? */
-        beq     .__start_initialization_iSeries /* Start up the first processor */
-        mfspr   r4,SPRN_CTRLF
+        bne     1f
+        b       .__start_initialization_iSeries /* Start up the first processor */
+1:      mfspr   r4,SPRN_CTRLF
         li      r5,CTRL_RUNLATCH        /* Turn off the run light */
         andc    r4,r4,r5
         mtspr   SPRN_CTRLT,r4
@@ -1611,7 +1612,7 @@ _GLOBAL(generic_secondary_smp_init)
 #endif
 
 #ifdef CONFIG_PPC_ISERIES
-_STATIC(__start_initialization_iSeries)
+_INIT_STATIC(__start_initialization_iSeries)
         /* Clear out the BSS */
         LOAD_REG_IMMEDIATE(r11,__bss_stop)
         LOAD_REG_IMMEDIATE(r8,__bss_start)
diff --git a/arch/powerpc/kernel/iomap.c b/arch/powerpc/kernel/iomap.c
index 601ef79a5916..2a5cf8680370 100644
--- a/arch/powerpc/kernel/iomap.c
+++ b/arch/powerpc/kernel/iomap.c
@@ -7,6 +7,7 @@
 #include <linux/pci.h>
 #include <linux/mm.h>
 #include <asm/io.h>
+#include <asm/pci-bridge.h>
 
 /*
  * Here comes the ppc64 implementation of the IOMAP 
@@ -136,7 +137,12 @@ void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
 
 void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
 {
-        /* Nothing to do */
+        if (isa_vaddr_is_ioport(addr))
+                return;
+        if (pcibios_vaddr_is_ioport(addr))
+                return;
+        iounmap(addr);
 }
+
 EXPORT_SYMBOL(pci_iomap);
 EXPORT_SYMBOL(pci_iounmap);
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 2fc87862146c..24bea97c736c 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -418,10 +418,10 @@ irq_hw_number_t virq_to_hw(unsigned int virq)
 }
 EXPORT_SYMBOL_GPL(virq_to_hw);
 
-struct irq_host *irq_alloc_host(unsigned int revmap_type,
-                                unsigned int revmap_arg,
-                                struct irq_host_ops *ops,
-                                irq_hw_number_t inval_irq)
+__init_refok struct irq_host *irq_alloc_host(unsigned int revmap_type,
+                                                unsigned int revmap_arg,
+                                                struct irq_host_ops *ops,
+                                                irq_hw_number_t inval_irq)
 {
         struct irq_host *host;
         unsigned int size = sizeof(struct irq_host);
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index fe7d1255e11e..083cfbdbe0b2 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -65,7 +65,7 @@ static void __devinit pci_setup_pci_controller(struct pci_controller *hose)
         spin_unlock(&hose_spinlock);
 }
 
-struct pci_controller * pcibios_alloc_controller(struct device_node *dev)
+__init_refok struct pci_controller * pcibios_alloc_controller(struct device_node *dev)
 {
         struct pci_controller *phb;
 
@@ -101,6 +101,29 @@ void pcibios_free_controller(struct pci_controller *phb)
                 kfree(phb);
 }
 
+int pcibios_vaddr_is_ioport(void __iomem *address)
+{
+        int ret = 0;
+        struct pci_controller *hose;
+        unsigned long size;
+
+        spin_lock(&hose_spinlock);
+        list_for_each_entry(hose, &hose_list, list_node) {
+#ifdef CONFIG_PPC64
+                size = hose->pci_io_size;
+#else
+                size = hose->io_resource.end - hose->io_resource.start + 1;
+#endif
+                if (address >= hose->io_base_virt &&
+                    address < (hose->io_base_virt + size)) {
+                        ret = 1;
+                        break;
+                }
+        }
+        spin_unlock(&hose_spinlock);
+        return ret;
+}
+
 /*
  * Return the domain number for this bus.
  */
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 0adf077f3f3a..cd35c969bb28 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -60,6 +60,24 @@ LIST_HEAD(hose_list);
 static int pci_bus_count;
 
 static void
+fixup_hide_host_resource_fsl(struct pci_dev* dev)
+{
+        int i, class = dev->class >> 8;
+
+        if ((class == PCI_CLASS_PROCESSOR_POWERPC) &&
+                (dev->hdr_type == PCI_HEADER_TYPE_NORMAL) &&
+                (dev->bus->parent == NULL)) {
+                for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+                        dev->resource[i].start = 0;
+                        dev->resource[i].end = 0;
+                        dev->resource[i].flags = 0;
+                }
+        }
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MOTOROLA, PCI_ANY_ID, fixup_hide_host_resource_fsl); 
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_FREESCALE, PCI_ANY_ID, fixup_hide_host_resource_fsl); 
+
+static void
 fixup_broken_pcnet32(struct pci_dev* dev)
 {
         if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) {
@@ -415,15 +433,13 @@ probe_resource(struct pci_bus *parent, struct resource *pr,
         return 0;
 }
 
-static void __init
-update_bridge_base(struct pci_bus *bus, int i)
+void __init
+update_bridge_resource(struct pci_dev *dev, struct resource *res)
 {
-        struct resource *res = bus->resource[i];
         u8 io_base_lo, io_limit_lo;
         u16 mem_base, mem_limit;
         u16 cmd;
         unsigned long start, end, off;
-        struct pci_dev *dev = bus->self;
         struct pci_controller *hose = dev->sysdata;
 
         if (!hose) {
@@ -467,12 +483,20 @@ update_bridge_base(struct pci_bus *bus, int i)
                 pci_write_config_word(dev, PCI_PREF_MEMORY_LIMIT, mem_limit);
 
         } else {
-                DBG(KERN_ERR "PCI: ugh, bridge %s res %d has flags=%lx\n",
-                    pci_name(dev), i, res->flags);
+                DBG(KERN_ERR "PCI: ugh, bridge %s res has flags=%lx\n",
+                    pci_name(dev), res->flags);
         }
         pci_write_config_word(dev, PCI_COMMAND, cmd);
 }
 
+static void __init
+update_bridge_base(struct pci_bus *bus, int i)
+{
+        struct resource *res = bus->resource[i];
+        struct pci_dev *dev = bus->self;
+        update_bridge_resource(dev, res);
+}
+
 static inline void alloc_resource(struct pci_dev *dev, int idx)
 {
         struct resource *pr, *r = &dev->resource[idx];
@@ -1223,7 +1247,7 @@ pcibios_init(void)
 
 subsys_initcall(pcibios_init);
 
-void __init pcibios_fixup_bus(struct pci_bus *bus)
+void pcibios_fixup_bus(struct pci_bus *bus)
 {
         struct pci_controller *hose = (struct pci_controller *) bus->sysdata;
         unsigned long io_offset;
@@ -1468,3 +1492,10 @@ EARLY_PCI_OP(read, dword, u32 *)
 EARLY_PCI_OP(write, byte, u8)
 EARLY_PCI_OP(write, word, u16)
 EARLY_PCI_OP(write, dword, u32)
+
+extern int pci_bus_find_capability (struct pci_bus *bus, unsigned int devfn, int cap);
+int early_find_capability(struct pci_controller *hose, int bus, int devfn,
+                          int cap)
+{
+        return pci_bus_find_capability(fake_pci_bus(hose, bus), devfn, cap);
+}
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 84f000a45e36..a83727b308a0 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -423,7 +423,11 @@ void show_regs(struct pt_regs * regs)
         printk("  CR: %08lx  XER: %08lx\n", regs->ccr, regs->xer);
         trap = TRAP(regs);
         if (trap == 0x300 || trap == 0x600)
+#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
+                printk("DEAR: "REG", ESR: "REG"\n", regs->dar, regs->dsisr);
+#else
                 printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
+#endif
         printk("TASK = %p[%d] '%s' THREAD: %p",
                current, current->pid, current->comm, task_thread_info(current));
 
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index 3786dcc8a7b6..b5c96af955c6 100644
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -24,7 +24,7 @@
 /* Max address size we deal with */
 #define OF_MAX_ADDR_CELLS       4
 #define OF_CHECK_COUNTS(na, ns) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS && \
-                        (ns) >= 0)
+                        (ns) > 0)
 
 static struct of_bus *of_match_bus(struct device_node *np);
 static int __of_address_to_resource(struct device_node *dev,
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 4924c48cb1ff..50ef38cffdbf 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -496,6 +496,10 @@ int check_legacy_ioport(unsigned long base_port)
                         break;
                 }
                 np = of_find_node_by_type(NULL, "8042");
+                /* Pegasos has no device_type on its 8042 node, look for the
+                 * name instead */
+                if (!np)
+                        np = of_find_node_by_name(NULL, "8042");
                 break;
         case FDC_BASE: /* FDC1 */
                 np = of_find_node_by_type(NULL, "fdc");
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c
index cbca1df8bc60..0f9b4eadfbcb 100644
--- a/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
@@ -155,7 +155,7 @@ static int early_console_initialized;
  * Called by setup_system after ppc_md->probe and ppc_md->early_init.
  * Call it again after setting udbg_putc in ppc_md->setup_arch.
  */
-void register_early_udbg_console(void)
+void __init register_early_udbg_console(void)
 {
         if (early_console_initialized)
                 return;