173 files changed, 6345 insertions, 3097 deletions

diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index b72176434ebe..d733d7ca939c 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -57,6 +57,8 @@ config KILAUEA
         select 405EX
         select PPC40x_SIMPLE
         select PPC4xx_PCI_EXPRESS
+        select PCI_MSI
+        select PPC4xx_MSI
         help
           This option enables support for the AMCC PPC405EX evaluation board.
 
diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c
index 546bbc229d19..2521d93ef136 100644
--- a/arch/powerpc/platforms/40x/ppc40x_simple.c
+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
@@ -50,7 +50,7 @@ machine_device_initcall(ppc40x_simple, ppc40x_device_probe);
  * Again, if your board needs to do things differently then create a
  * board.c file for it rather than adding it to this list.
  */
-static char *board[] __initdata = {
+static const char *board[] __initdata = {
         "amcc,acadia",
         "amcc,haleakala",
         "amcc,kilauea",
@@ -60,14 +60,9 @@ static char *board[] __initdata = {
 
 static int __init ppc40x_probe(void)
 {
-        unsigned long root = of_get_flat_dt_root();
-        int i = 0;
-
-        for (i = 0; i < ARRAY_SIZE(board); i++) {
-                if (of_flat_dt_is_compatible(root, board[i])) {
-                        ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC);
-                        return 1;
-                }
+        if (of_flat_dt_match(of_get_flat_dt_root(), board)) {
+                ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC);
+                return 1;
         }
 
         return 0;
diff --git a/arch/powerpc/platforms/44x/44x.h b/arch/powerpc/platforms/44x/44x.h
index dbc4d2b4301a..63f703ecd23c 100644
--- a/arch/powerpc/platforms/44x/44x.h
+++ b/arch/powerpc/platforms/44x/44x.h
@@ -4,4 +4,8 @@
 extern u8 as1_readb(volatile u8 __iomem  *addr);
 extern void as1_writeb(u8 data, volatile u8 __iomem *addr);
 
+#define GPIO0_OSRH      0xC
+#define GPIO0_TSRH      0x14
+#define GPIO0_ISR1H     0x34
+
 #endif /* __POWERPC_PLATFORMS_44X_44X_H */
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 69d668c072ae..e958b6f48ec2 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -17,6 +17,16 @@ config BAMBOO
         help
           This option enables support for the IBM PPC440EP evaluation board.
 
+config BLUESTONE
+        bool "Bluestone"
+        depends on 44x
+        default n
+        select PPC44x_SIMPLE
+        select APM821xx
+        select IBM_NEW_EMAC_RGMII
+        help
+          This option enables support for the APM APM821xx Evaluation board.
+
 config EBONY
         bool "Ebony"
         depends on 44x
@@ -64,6 +74,8 @@ config KATMAI
         select 440SPe
         select PCI
         select PPC4xx_PCI_EXPRESS
+        select PCI_MSI
+        select PCC4xx_MSI
         help
           This option enables support for the AMCC PPC440SPe evaluation board.
 
@@ -105,10 +117,11 @@ config CANYONLANDS
         bool "Canyonlands"
         depends on 44x
         default n
-        select PPC44x_SIMPLE
         select 460EX
         select PCI
         select PPC4xx_PCI_EXPRESS
+        select PCI_MSI
+        select PPC4xx_MSI
         select IBM_NEW_EMAC_RGMII
         select IBM_NEW_EMAC_ZMII
         help
@@ -135,6 +148,8 @@ config REDWOOD
         select 460SX
         select PCI
         select PPC4xx_PCI_EXPRESS
+        select PCI_MSI
+        select PPC4xx_MSI
         help
           This option enables support for the AMCC PPC460SX Redwood board.
 
@@ -293,6 +308,12 @@ config 460SX
         select IBM_NEW_EMAC_ZMII
         select IBM_NEW_EMAC_TAH
 
+config APM821xx
+        bool
+        select PPC_FPU
+        select IBM_NEW_EMAC_EMAC4
+        select IBM_NEW_EMAC_TAH
+
 # 44x errata/workaround config symbols, selected by the CPU models above
 config IBM440EP_ERR42
         bool
diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile
index 82ff326e0795..553db6007217 100644
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile
@@ -1,4 +1,7 @@
-obj-$(CONFIG_44x)       := misc_44x.o idle.o
+obj-$(CONFIG_44x)       += misc_44x.o
+ifneq ($(CONFIG_PPC4xx_CPM),y)
+obj-$(CONFIG_44x)       += idle.o
+endif
 obj-$(CONFIG_PPC44x_SIMPLE) += ppc44x_simple.o
 obj-$(CONFIG_EBONY)     += ebony.o
 obj-$(CONFIG_SAM440EP)  += sam440ep.o
@@ -6,3 +9,4 @@ obj-$(CONFIG_WARP)	+= warp.o
 obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o
 obj-$(CONFIG_XILINX_ML510) += virtex_ml510.o
 obj-$(CONFIG_ISS4xx)    += iss4xx.o
+obj-$(CONFIG_CANYONLANDS)+= canyonlands.o
diff --git a/arch/powerpc/platforms/44x/canyonlands.c b/arch/powerpc/platforms/44x/canyonlands.c
new file mode 100644
index 000000000000..afc5e8ea3775
--- /dev/null
+++ b/arch/powerpc/platforms/44x/canyonlands.c
@@ -0,0 +1,134 @@
+/*
+ * This contain platform specific code for APM PPC460EX based Canyonlands
+ * board.
+ *
+ * Copyright (c) 2010, Applied Micro Circuits Corporation
+ * Author: Rupjyoti Sarmah <rsarmah@apm.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <asm/pci-bridge.h>
+#include <asm/ppc4xx.h>
+#include <asm/udbg.h>
+#include <asm/uic.h>
+#include <linux/of_platform.h>
+#include <linux/delay.h>
+#include "44x.h"
+
+#define BCSR_USB_EN     0x11
+
+static __initdata struct of_device_id ppc460ex_of_bus[] = {
+        { .compatible = "ibm,plb4", },
+        { .compatible = "ibm,opb", },
+        { .compatible = "ibm,ebc", },
+        { .compatible = "simple-bus", },
+        {},
+};
+
+static int __init ppc460ex_device_probe(void)
+{
+        of_platform_bus_probe(NULL, ppc460ex_of_bus, NULL);
+
+        return 0;
+}
+machine_device_initcall(canyonlands, ppc460ex_device_probe);
+
+/* Using this code only for the Canyonlands board.  */
+
+static int __init ppc460ex_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+        if (of_flat_dt_is_compatible(root, "amcc,canyonlands")) {
+                ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC);
+                return 1;
+                }
+        return 0;
+}
+
+/* USB PHY fixup code on Canyonlands kit. */
+
+static int __init ppc460ex_canyonlands_fixup(void)
+{
+        u8 __iomem *bcsr ;
+        void __iomem *vaddr;
+        struct device_node *np;
+        int ret = 0;
+
+        np = of_find_compatible_node(NULL, NULL, "amcc,ppc460ex-bcsr");
+        if (!np) {
+                printk(KERN_ERR "failed did not find amcc, ppc460ex bcsr node\n");
+                return -ENODEV;
+        }
+
+        bcsr = of_iomap(np, 0);
+        of_node_put(np);
+
+        if (!bcsr) {
+                printk(KERN_CRIT "Could not remap bcsr\n");
+                ret = -ENODEV;
+                goto err_bcsr;
+        }
+
+        np = of_find_compatible_node(NULL, NULL, "ibm,ppc4xx-gpio");
+        if (!np) {
+                printk(KERN_ERR "failed did not find ibm,ppc4xx-gpio node\n");
+                return -ENODEV;
+        }
+
+        vaddr = of_iomap(np, 0);
+        of_node_put(np);
+
+        if (!vaddr) {
+                printk(KERN_CRIT "Could not get gpio node address\n");
+                ret = -ENODEV;
+                goto err_gpio;
+        }
+        /* Disable USB, through the BCSR7 bits */
+        setbits8(&bcsr[7], BCSR_USB_EN);
+
+        /* Wait for a while after reset */
+        msleep(100);
+
+        /* Enable USB here */
+        clrbits8(&bcsr[7], BCSR_USB_EN);
+
+        /*
+         * Configure multiplexed gpio16 and gpio19 as alternate1 output
+         * source after USB reset. In this configuration gpio16 will be
+         * USB2HStop and gpio19 will be USB2DStop. For more details refer to
+         * table 34-7 of PPC460EX user manual.
+         */
+        setbits32((vaddr + GPIO0_OSRH), 0x42000000);
+        setbits32((vaddr + GPIO0_TSRH), 0x42000000);
+err_gpio:
+        iounmap(vaddr);
+err_bcsr:
+        iounmap(bcsr);
+        return ret;
+}
+machine_device_initcall(canyonlands, ppc460ex_canyonlands_fixup);
+define_machine(canyonlands) {
+        .name = "Canyonlands",
+        .probe = ppc460ex_probe,
+        .progress = udbg_progress,
+        .init_IRQ = uic_init_tree,
+        .get_irq = uic_get_irq,
+        .restart = ppc4xx_reset_system,
+        .calibrate_decr = generic_calibrate_decr,
+};
diff --git a/arch/powerpc/platforms/44x/iss4xx.c b/arch/powerpc/platforms/44x/iss4xx.c
index aa46e9d1e771..19395f18b1db 100644
--- a/arch/powerpc/platforms/44x/iss4xx.c
+++ b/arch/powerpc/platforms/44x/iss4xx.c
@@ -87,7 +87,7 @@ static void __cpuinit smp_iss4xx_setup_cpu(int cpu)
         mpic_setup_this_cpu();
 }
 
-static void __cpuinit smp_iss4xx_kick_cpu(int cpu)
+static int __cpuinit smp_iss4xx_kick_cpu(int cpu)
 {
         struct device_node *cpunode = of_get_cpu_node(cpu, NULL);
         const u64 *spin_table_addr_prop;
@@ -104,7 +104,7 @@ static void __cpuinit smp_iss4xx_kick_cpu(int cpu)
                                                NULL);
         if (spin_table_addr_prop == NULL) {
                 pr_err("CPU%d: Can't start, missing cpu-release-addr !\n", cpu);
-                return;
+                return -ENOENT;
         }
 
         /* Assume it's mapped as part of the linear mapping. This is a bit
@@ -117,6 +117,8 @@ static void __cpuinit smp_iss4xx_kick_cpu(int cpu)
         smp_wmb();
         spin_table[1] = __pa(start_secondary_47x);
         mb();
+
+        return 0;
 }
 
 static struct smp_ops_t iss_smp_ops = {
diff --git a/arch/powerpc/platforms/44x/ppc44x_simple.c b/arch/powerpc/platforms/44x/ppc44x_simple.c
index 5f7a29d7f590..c81c19c0b3d4 100644
--- a/arch/powerpc/platforms/44x/ppc44x_simple.c
+++ b/arch/powerpc/platforms/44x/ppc44x_simple.c
@@ -52,7 +52,7 @@ machine_device_initcall(ppc44x_simple, ppc44x_device_probe);
 static char *board[] __initdata = {
         "amcc,arches",
         "amcc,bamboo",
-        "amcc,canyonlands",
+        "amcc,bluestone",
         "amcc,glacier",
         "ibm,ebony",
         "amcc,eiger",
diff --git a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
index 4ecf4cf9a51b..9f09319352c0 100644
--- a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
+++ b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
@@ -59,9 +59,9 @@ irq_to_pic_bit(unsigned int irq)
 }
 
 static void
-cpld_mask_irq(unsigned int irq)
+cpld_mask_irq(struct irq_data *d)
 {
-        unsigned int cpld_irq = (unsigned int)irq_map[irq].hwirq;
+        unsigned int cpld_irq = (unsigned int)irqd_to_hwirq(d);
         void __iomem *pic_mask = irq_to_pic_mask(cpld_irq);
 
         out_8(pic_mask,
@@ -69,9 +69,9 @@ cpld_mask_irq(unsigned int irq)
 }
 
 static void
-cpld_unmask_irq(unsigned int irq)
+cpld_unmask_irq(struct irq_data *d)
 {
-        unsigned int cpld_irq = (unsigned int)irq_map[irq].hwirq;
+        unsigned int cpld_irq = (unsigned int)irqd_to_hwirq(d);
         void __iomem *pic_mask = irq_to_pic_mask(cpld_irq);
 
         out_8(pic_mask,
@@ -80,9 +80,9 @@ cpld_unmask_irq(unsigned int irq)
 
 static struct irq_chip cpld_pic = {
         .name = "CPLD PIC",
-        .mask = cpld_mask_irq,
-        .ack = cpld_mask_irq,
-        .unmask = cpld_unmask_irq,
+        .irq_mask = cpld_mask_irq,
+        .irq_ack = cpld_mask_irq,
+        .irq_unmask = cpld_unmask_irq,
 };
 
 static int
@@ -97,7 +97,7 @@ cpld_pic_get_irq(int offset, u8 ignore, u8 __iomem *statusp,
         status |= (ignore | mask);
 
         if (status == 0xff)
-                return NO_IRQ_IGNORE;
+                return NO_IRQ;
 
         cpld_irq = ffz(status) + offset;
 
@@ -109,14 +109,14 @@ cpld_pic_cascade(unsigned int irq, struct irq_desc *desc)
 {
         irq = cpld_pic_get_irq(0, PCI_IGNORE, &cpld_regs->pci_status,
                 &cpld_regs->pci_mask);
-        if (irq != NO_IRQ && irq != NO_IRQ_IGNORE) {
+        if (irq != NO_IRQ) {
                 generic_handle_irq(irq);
                 return;
         }
 
         irq = cpld_pic_get_irq(8, MISC_IGNORE, &cpld_regs->misc_status,
                 &cpld_regs->misc_mask);
-        if (irq != NO_IRQ && irq != NO_IRQ_IGNORE) {
+        if (irq != NO_IRQ) {
                 generic_handle_irq(irq);
                 return;
         }
@@ -132,8 +132,8 @@ static int
 cpld_pic_host_map(struct irq_host *h, unsigned int virq,
                              irq_hw_number_t hw)
 {
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, &cpld_pic, handle_level_irq);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &cpld_pic, handle_level_irq);
         return 0;
 }
 
@@ -198,7 +198,7 @@ mpc5121_ads_cpld_pic_init(void)
                 goto end;
         }
 
-        set_irq_chained_handler(cascade_irq, cpld_pic_cascade);
+        irq_set_chained_handler(cascade_irq, cpld_pic_cascade);
 end:
         of_node_put(np);
 }
diff --git a/arch/powerpc/platforms/512x/mpc5121_generic.c b/arch/powerpc/platforms/512x/mpc5121_generic.c
index e487eb06ec6b..926731f1ff01 100644
--- a/arch/powerpc/platforms/512x/mpc5121_generic.c
+++ b/arch/powerpc/platforms/512x/mpc5121_generic.c
@@ -26,7 +26,7 @@
 /*
  * list of supported boards
  */
-static char *board[] __initdata = {
+static const char *board[] __initdata = {
         "prt,prtlvt",
         NULL
 };
@@ -36,16 +36,7 @@ static char *board[] __initdata = {
  */
 static int __init mpc5121_generic_probe(void)
 {
-        unsigned long node = of_get_flat_dt_root();
-        int i = 0;
-
-        while (board[i]) {
-                if (of_flat_dt_is_compatible(node, board[i]))
-                        break;
-                i++;
-        }
-
-        return board[i] != NULL;
+        return of_flat_dt_match(of_get_flat_dt_root(), board);
 }
 
 define_machine(mpc5121_generic) {
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index de55bc0584b5..01ffa64d2aa7 100644
--- a/arch/powerpc/platforms/52xx/lite5200.c
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -172,20 +172,18 @@ static void __init lite5200_setup_arch(void)
         mpc52xx_setup_pci();
 }
 
+static const char *board[] __initdata = {
+        "fsl,lite5200",
+        "fsl,lite5200b",
+        NULL,
+};
+
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
  */
 static int __init lite5200_probe(void)
 {
-        unsigned long node = of_get_flat_dt_root();
-        const char *model = of_get_flat_dt_prop(node, "model", NULL);
-
-        if (!of_flat_dt_is_compatible(node, "fsl,lite5200") &&
-            !of_flat_dt_is_compatible(node, "fsl,lite5200b"))
-                return 0;
-        pr_debug("%s board found\n", model ? model : "unknown");
-
-        return 1;
+        return of_flat_dt_match(of_get_flat_dt_root(), board);
 }
 
 define_machine(lite5200) {
diff --git a/arch/powerpc/platforms/52xx/lite5200_pm.c b/arch/powerpc/platforms/52xx/lite5200_pm.c
index 80234e5921f5..eda0fc2a3914 100644
--- a/arch/powerpc/platforms/52xx/lite5200_pm.c
+++ b/arch/powerpc/platforms/52xx/lite5200_pm.c
@@ -232,7 +232,7 @@ static void lite5200_pm_end(void)
         lite5200_pm_target_state = PM_SUSPEND_ON;
 }
 
-static struct platform_suspend_ops lite5200_pm_ops = {
+static const struct platform_suspend_ops lite5200_pm_ops = {
         .valid          = lite5200_pm_valid,
         .begin          = lite5200_pm_begin,
         .prepare        = lite5200_pm_prepare,
diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c
index 0bac3a3dbecf..96f85e5e0cd3 100644
--- a/arch/powerpc/platforms/52xx/media5200.c
+++ b/arch/powerpc/platforms/52xx/media5200.c
@@ -49,45 +49,46 @@ struct media5200_irq {
 };
 struct media5200_irq media5200_irq;
 
-static void media5200_irq_unmask(unsigned int virq)
+static void media5200_irq_unmask(struct irq_data *d)
 {
         unsigned long flags;
         u32 val;
 
         spin_lock_irqsave(&media5200_irq.lock, flags);
         val = in_be32(media5200_irq.regs + MEDIA5200_IRQ_ENABLE);
-        val |= 1 << (MEDIA5200_IRQ_SHIFT + irq_map[virq].hwirq);
+        val |= 1 << (MEDIA5200_IRQ_SHIFT + irqd_to_hwirq(d));
         out_be32(media5200_irq.regs + MEDIA5200_IRQ_ENABLE, val);
         spin_unlock_irqrestore(&media5200_irq.lock, flags);
 }
 
-static void media5200_irq_mask(unsigned int virq)
+static void media5200_irq_mask(struct irq_data *d)
 {
         unsigned long flags;
         u32 val;
 
         spin_lock_irqsave(&media5200_irq.lock, flags);
         val = in_be32(media5200_irq.regs + MEDIA5200_IRQ_ENABLE);
-        val &= ~(1 << (MEDIA5200_IRQ_SHIFT + irq_map[virq].hwirq));
+        val &= ~(1 << (MEDIA5200_IRQ_SHIFT + irqd_to_hwirq(d)));
         out_be32(media5200_irq.regs + MEDIA5200_IRQ_ENABLE, val);
         spin_unlock_irqrestore(&media5200_irq.lock, flags);
 }
 
 static struct irq_chip media5200_irq_chip = {
         .name = "Media5200 FPGA",
-        .unmask = media5200_irq_unmask,
-        .mask = media5200_irq_mask,
-        .mask_ack = media5200_irq_mask,
+        .irq_unmask = media5200_irq_unmask,
+        .irq_mask = media5200_irq_mask,
+        .irq_mask_ack = media5200_irq_mask,
 };
 
 void media5200_irq_cascade(unsigned int virq, struct irq_desc *desc)
 {
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         int sub_virq, val;
         u32 status, enable;
 
         /* Mask off the cascaded IRQ */
         raw_spin_lock(&desc->lock);
-        desc->chip->mask(virq);
+        chip->irq_mask(&desc->irq_data);
         raw_spin_unlock(&desc->lock);
 
         /* Ask the FPGA for IRQ status.  If 'val' is 0, then no irqs
@@ -105,24 +106,19 @@ void media5200_irq_cascade(unsigned int virq, struct irq_desc *desc)
 
         /* Processing done; can reenable the cascade now */
         raw_spin_lock(&desc->lock);
-        desc->chip->ack(virq);
-        if (!(desc->status & IRQ_DISABLED))
-                desc->chip->unmask(virq);
+        chip->irq_ack(&desc->irq_data);
+        if (!irqd_irq_disabled(&desc->irq_data))
+                chip->irq_unmask(&desc->irq_data);
         raw_spin_unlock(&desc->lock);
 }
 
 static int media5200_irq_map(struct irq_host *h, unsigned int virq,
                              irq_hw_number_t hw)
 {
-        struct irq_desc *desc = irq_to_desc(virq);
-
         pr_debug("%s: h=%p, virq=%i, hwirq=%i\n", __func__, h, virq, (int)hw);
-        set_irq_chip_data(virq, &media5200_irq);
-        set_irq_chip_and_handler(virq, &media5200_irq_chip, handle_level_irq);
-        set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
-        desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
-        desc->status |= IRQ_TYPE_LEVEL_LOW | IRQ_LEVEL;
-
+        irq_set_chip_data(virq, &media5200_irq);
+        irq_set_chip_and_handler(virq, &media5200_irq_chip, handle_level_irq);
+        irq_set_status_flags(virq, IRQ_LEVEL);
         return 0;
 }
 
@@ -186,8 +182,8 @@ static void __init media5200_init_irq(void)
 
         media5200_irq.irqhost->host_data = &media5200_irq;
 
-        set_irq_data(cascade_virq, &media5200_irq);
-        set_irq_chained_handler(cascade_virq, media5200_irq_cascade);
+        irq_set_handler_data(cascade_virq, &media5200_irq);
+        irq_set_chained_handler(cascade_virq, media5200_irq_cascade);
 
         return;
 
@@ -239,7 +235,7 @@ static void __init media5200_setup_arch(void)
 }
 
 /* list of the supported boards */
-static char *board[] __initdata = {
+static const char *board[] __initdata = {
         "fsl,media5200",
         NULL
 };
@@ -249,16 +245,7 @@ static char *board[] __initdata = {
  */
 static int __init media5200_probe(void)
 {
-        unsigned long node = of_get_flat_dt_root();
-        int i = 0;
-
-        while (board[i]) {
-                if (of_flat_dt_is_compatible(node, board[i]))
-                        break;
-                i++;
-        }
-
-        return (board[i] != NULL);
+        return of_flat_dt_match(of_get_flat_dt_root(), board);
 }
 
 define_machine(media5200_platform) {
diff --git a/arch/powerpc/platforms/52xx/mpc5200_simple.c b/arch/powerpc/platforms/52xx/mpc5200_simple.c
index d45be5b5ad49..e36d6e232ae6 100644
--- a/arch/powerpc/platforms/52xx/mpc5200_simple.c
+++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c
@@ -49,7 +49,7 @@ static void __init mpc5200_simple_setup_arch(void)
 }
 
 /* list of the supported boards */
-static char *board[] __initdata = {
+static const char *board[] __initdata = {
         "intercontrol,digsy-mtc",
         "manroland,mucmc52",
         "manroland,uc101",
@@ -66,16 +66,7 @@ static char *board[] __initdata = {
  */
 static int __init mpc5200_simple_probe(void)
 {
-        unsigned long node = of_get_flat_dt_root();
-        int i = 0;
-
-        while (board[i]) {
-                if (of_flat_dt_is_compatible(node, board[i]))
-                        break;
-                i++;
-        }
-        
-        return (board[i] != NULL);
+        return of_flat_dt_match(of_get_flat_dt_root(), board);
 }
 
 define_machine(mpc5200_simple_platform) {
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
index 0dad9a935eb5..1757d1db4b51 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
@@ -147,8 +147,7 @@ mpc52xx_wkup_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
         return 0;
 }
 
-static int __devinit mpc52xx_wkup_gpiochip_probe(struct platform_device *ofdev,
-                                        const struct of_device_id *match)
+static int __devinit mpc52xx_wkup_gpiochip_probe(struct platform_device *ofdev)
 {
         struct mpc52xx_gpiochip *chip;
         struct mpc52xx_gpio_wkup __iomem *regs;
@@ -191,7 +190,7 @@ static const struct of_device_id mpc52xx_wkup_gpiochip_match[] = {
         {}
 };
 
-static struct of_platform_driver mpc52xx_wkup_gpiochip_driver = {
+static struct platform_driver mpc52xx_wkup_gpiochip_driver = {
         .driver = {
                 .name = "gpio_wkup",
                 .owner = THIS_MODULE,
@@ -310,8 +309,7 @@ mpc52xx_simple_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
         return 0;
 }
 
-static int __devinit mpc52xx_simple_gpiochip_probe(struct platform_device *ofdev,
-                                        const struct of_device_id *match)
+static int __devinit mpc52xx_simple_gpiochip_probe(struct platform_device *ofdev)
 {
         struct mpc52xx_gpiochip *chip;
         struct gpio_chip *gc;
@@ -349,7 +347,7 @@ static const struct of_device_id mpc52xx_simple_gpiochip_match[] = {
         {}
 };
 
-static struct of_platform_driver mpc52xx_simple_gpiochip_driver = {
+static struct platform_driver mpc52xx_simple_gpiochip_driver = {
         .driver = {
                 .name = "gpio",
                 .owner = THIS_MODULE,
@@ -361,10 +359,10 @@ static struct of_platform_driver mpc52xx_simple_gpiochip_driver = {
 
 static int __init mpc52xx_gpio_init(void)
 {
-        if (of_register_platform_driver(&mpc52xx_wkup_gpiochip_driver))
+        if (platform_driver_register(&mpc52xx_wkup_gpiochip_driver))
                 printk(KERN_ERR "Unable to register wakeup GPIO driver\n");
 
-        if (of_register_platform_driver(&mpc52xx_simple_gpiochip_driver))
+        if (platform_driver_register(&mpc52xx_simple_gpiochip_driver))
                 printk(KERN_ERR "Unable to register simple GPIO driver\n");
 
         return 0;
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index fea833e18ad5..6c39b9cc2fa3 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -63,6 +63,7 @@
 #include <linux/of_gpio.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/fs.h>
 #include <linux/watchdog.h>
 #include <linux/miscdevice.h>
 #include <linux/uaccess.h>
@@ -134,9 +135,9 @@ DEFINE_MUTEX(mpc52xx_gpt_list_mutex);
  * Cascaded interrupt controller hooks
  */
 
-static void mpc52xx_gpt_irq_unmask(unsigned int virq)
+static void mpc52xx_gpt_irq_unmask(struct irq_data *d)
 {
-        struct mpc52xx_gpt_priv *gpt = get_irq_chip_data(virq);
+        struct mpc52xx_gpt_priv *gpt = irq_data_get_irq_chip_data(d);
         unsigned long flags;
 
         spin_lock_irqsave(&gpt->lock, flags);
@@ -144,9 +145,9 @@ static void mpc52xx_gpt_irq_unmask(unsigned int virq)
         spin_unlock_irqrestore(&gpt->lock, flags);
 }
 
-static void mpc52xx_gpt_irq_mask(unsigned int virq)
+static void mpc52xx_gpt_irq_mask(struct irq_data *d)
 {
-        struct mpc52xx_gpt_priv *gpt = get_irq_chip_data(virq);
+        struct mpc52xx_gpt_priv *gpt = irq_data_get_irq_chip_data(d);
         unsigned long flags;
 
         spin_lock_irqsave(&gpt->lock, flags);
@@ -154,20 +155,20 @@ static void mpc52xx_gpt_irq_mask(unsigned int virq)
         spin_unlock_irqrestore(&gpt->lock, flags);
 }
 
-static void mpc52xx_gpt_irq_ack(unsigned int virq)
+static void mpc52xx_gpt_irq_ack(struct irq_data *d)
 {
-        struct mpc52xx_gpt_priv *gpt = get_irq_chip_data(virq);
+        struct mpc52xx_gpt_priv *gpt = irq_data_get_irq_chip_data(d);
 
         out_be32(&gpt->regs->status, MPC52xx_GPT_STATUS_IRQMASK);
 }
 
-static int mpc52xx_gpt_irq_set_type(unsigned int virq, unsigned int flow_type)
+static int mpc52xx_gpt_irq_set_type(struct irq_data *d, unsigned int flow_type)
 {
-        struct mpc52xx_gpt_priv *gpt = get_irq_chip_data(virq);
+        struct mpc52xx_gpt_priv *gpt = irq_data_get_irq_chip_data(d);
         unsigned long flags;
         u32 reg;
 
-        dev_dbg(gpt->dev, "%s: virq=%i type=%x\n", __func__, virq, flow_type);
+        dev_dbg(gpt->dev, "%s: virq=%i type=%x\n", __func__, d->irq, flow_type);
 
         spin_lock_irqsave(&gpt->lock, flags);
         reg = in_be32(&gpt->regs->mode) & ~MPC52xx_GPT_MODE_ICT_MASK;
@@ -183,15 +184,15 @@ static int mpc52xx_gpt_irq_set_type(unsigned int virq, unsigned int flow_type)
 
 static struct irq_chip mpc52xx_gpt_irq_chip = {
         .name = "MPC52xx GPT",
-        .unmask = mpc52xx_gpt_irq_unmask,
-        .mask = mpc52xx_gpt_irq_mask,
-        .ack = mpc52xx_gpt_irq_ack,
-        .set_type = mpc52xx_gpt_irq_set_type,
+        .irq_unmask = mpc52xx_gpt_irq_unmask,
+        .irq_mask = mpc52xx_gpt_irq_mask,
+        .irq_ack = mpc52xx_gpt_irq_ack,
+        .irq_set_type = mpc52xx_gpt_irq_set_type,
 };
 
 void mpc52xx_gpt_irq_cascade(unsigned int virq, struct irq_desc *desc)
 {
-        struct mpc52xx_gpt_priv *gpt = get_irq_data(virq);
+        struct mpc52xx_gpt_priv *gpt = irq_get_handler_data(virq);
         int sub_virq;
         u32 status;
 
@@ -208,8 +209,8 @@ static int mpc52xx_gpt_irq_map(struct irq_host *h, unsigned int virq,
         struct mpc52xx_gpt_priv *gpt = h->host_data;
 
         dev_dbg(gpt->dev, "%s: h=%p, virq=%i\n", __func__, h, virq);
-        set_irq_chip_data(virq, gpt);
-        set_irq_chip_and_handler(virq, &mpc52xx_gpt_irq_chip, handle_edge_irq);
+        irq_set_chip_data(virq, gpt);
+        irq_set_chip_and_handler(virq, &mpc52xx_gpt_irq_chip, handle_edge_irq);
 
         return 0;
 }
@@ -258,8 +259,8 @@ mpc52xx_gpt_irq_setup(struct mpc52xx_gpt_priv *gpt, struct device_node *node)
         }
 
         gpt->irqhost->host_data = gpt;
-        set_irq_data(cascade_virq, gpt);
-        set_irq_chained_handler(cascade_virq, mpc52xx_gpt_irq_cascade);
+        irq_set_handler_data(cascade_virq, gpt);
+        irq_set_chained_handler(cascade_virq, mpc52xx_gpt_irq_cascade);
 
         /* If the GPT is currently disabled, then change it to be in Input
          * Capture mode.  If the mode is non-zero, then the pin could be
@@ -720,8 +721,7 @@ static inline int mpc52xx_gpt_wdt_setup(struct mpc52xx_gpt_priv *gpt,
 /* ---------------------------------------------------------------------
  * of_platform bus binding code
  */
-static int __devinit mpc52xx_gpt_probe(struct platform_device *ofdev,
-                                       const struct of_device_id *match)
+static int __devinit mpc52xx_gpt_probe(struct platform_device *ofdev)
 {
         struct mpc52xx_gpt_priv *gpt;
 
@@ -780,7 +780,7 @@ static const struct of_device_id mpc52xx_gpt_match[] = {
         {}
 };
 
-static struct of_platform_driver mpc52xx_gpt_driver = {
+static struct platform_driver mpc52xx_gpt_driver = {
         .driver = {
                 .name = "mpc52xx-gpt",
                 .owner = THIS_MODULE,
@@ -792,10 +792,7 @@ static struct of_platform_driver mpc52xx_gpt_driver = {
 
 static int __init mpc52xx_gpt_init(void)
 {
-        if (of_register_platform_driver(&mpc52xx_gpt_driver))
-                pr_err("error registering MPC52xx GPT driver\n");
-
-        return 0;
+        return platform_driver_register(&mpc52xx_gpt_driver);
 }
 
 /* Make sure GPIOs and IRQs get set up before anyone tries to use them */
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
index f4ac213c89c0..9940ce8a2d4e 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
@@ -57,7 +57,7 @@ struct mpc52xx_lpbfifo {
 static struct mpc52xx_lpbfifo lpbfifo;
 
 /**
- * mpc52xx_lpbfifo_kick - Trigger the next block of data to be transfered
+ * mpc52xx_lpbfifo_kick - Trigger the next block of data to be transferred
  */
 static void mpc52xx_lpbfifo_kick(struct mpc52xx_lpbfifo_request *req)
 {
@@ -179,7 +179,7 @@ static void mpc52xx_lpbfifo_kick(struct mpc52xx_lpbfifo_request *req)
  *
  * On transmit, the dma completion irq triggers before the fifo completion
  * triggers.  Handle the dma completion here instead of the LPB FIFO Bestcomm
- * task completion irq becuase everyting is not really done until the LPB FIFO
+ * task completion irq because everything is not really done until the LPB FIFO
  * completion irq triggers.
  *
  * In other words:
@@ -195,7 +195,7 @@ static void mpc52xx_lpbfifo_kick(struct mpc52xx_lpbfifo_request *req)
  * Exit conditions:
  * 1) Transfer aborted
  * 2) FIFO complete without DMA; more data to do
- * 3) FIFO complete without DMA; all data transfered
+ * 3) FIFO complete without DMA; all data transferred
  * 4) FIFO complete using DMA
  *
  * Condition 1 can occur regardless of whether or not DMA is used.
@@ -436,8 +436,7 @@ void mpc52xx_lpbfifo_abort(struct mpc52xx_lpbfifo_request *req)
 }
 EXPORT_SYMBOL(mpc52xx_lpbfifo_abort);
 
-static int __devinit mpc52xx_lpbfifo_probe(struct platform_device *op,
-                                           const struct of_device_id *match)
+static int __devinit mpc52xx_lpbfifo_probe(struct platform_device *op)
 {
         struct resource res;
         int rc = -ENOMEM;
@@ -536,7 +535,7 @@ static struct of_device_id mpc52xx_lpbfifo_match[] __devinitconst = {
         {},
 };
 
-static struct of_platform_driver mpc52xx_lpbfifo_driver = {
+static struct platform_driver mpc52xx_lpbfifo_driver = {
         .driver = {
                 .name = "mpc52xx-lpbfifo",
                 .owner = THIS_MODULE,
@@ -551,14 +550,12 @@ static struct of_platform_driver mpc52xx_lpbfifo_driver = {
  */
 static int __init mpc52xx_lpbfifo_init(void)
 {
-        pr_debug("Registering LocalPlus bus FIFO driver\n");
-        return of_register_platform_driver(&mpc52xx_lpbfifo_driver);
+        return platform_driver_register(&mpc52xx_lpbfifo_driver);
 }
 module_init(mpc52xx_lpbfifo_init);
 
 static void __exit mpc52xx_lpbfifo_exit(void)
 {
-        pr_debug("Unregistering LocalPlus bus FIFO driver\n");
-        of_unregister_platform_driver(&mpc52xx_lpbfifo_driver);
+        platform_driver_unregister(&mpc52xx_lpbfifo_driver);
 }
 module_exit(mpc52xx_lpbfifo_exit);
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index 4bf4bf7b063e..1a9a49570579 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -155,50 +155,32 @@ static inline void io_be_clrbit(u32 __iomem *addr, int bitno)
 /*
  * IRQ[0-3] interrupt irq_chip
  */
-static void mpc52xx_extirq_mask(unsigned int virq)
+static void mpc52xx_extirq_mask(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[virq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_clrbit(&intr->ctrl, 11 - l2irq);
 }
 
-static void mpc52xx_extirq_unmask(unsigned int virq)
+static void mpc52xx_extirq_unmask(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[virq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_setbit(&intr->ctrl, 11 - l2irq);
 }
 
-static void mpc52xx_extirq_ack(unsigned int virq)
+static void mpc52xx_extirq_ack(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[virq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_setbit(&intr->ctrl, 27-l2irq);
 }
 
-static int mpc52xx_extirq_set_type(unsigned int virq, unsigned int flow_type)
+static int mpc52xx_extirq_set_type(struct irq_data *d, unsigned int flow_type)
 {
         u32 ctrl_reg, type;
-        int irq;
-        int l2irq;
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         void *handler = handle_level_irq;
 
-        irq = irq_map[virq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
-        pr_debug("%s: irq=%x. l2=%d flow_type=%d\n", __func__, irq, l2irq, flow_type);
+        pr_debug("%s: irq=%x. l2=%d flow_type=%d\n", __func__,
+                (int) irqd_to_hwirq(d), l2irq, flow_type);
 
         switch (flow_type) {
         case IRQF_TRIGGER_HIGH: type = 0; break;
@@ -214,132 +196,97 @@ static int mpc52xx_extirq_set_type(unsigned int virq, unsigned int flow_type)
         ctrl_reg |= (type << (22 - (l2irq * 2)));
         out_be32(&intr->ctrl, ctrl_reg);
 
-        __set_irq_handler_unlocked(virq, handler);
+        __irq_set_handler_locked(d->irq, handler);
 
         return 0;
 }
 
 static struct irq_chip mpc52xx_extirq_irqchip = {
         .name = "MPC52xx External",
-        .mask = mpc52xx_extirq_mask,
-        .unmask = mpc52xx_extirq_unmask,
-        .ack = mpc52xx_extirq_ack,
-        .set_type = mpc52xx_extirq_set_type,
+        .irq_mask = mpc52xx_extirq_mask,
+        .irq_unmask = mpc52xx_extirq_unmask,
+        .irq_ack = mpc52xx_extirq_ack,
+        .irq_set_type = mpc52xx_extirq_set_type,
 };
 
 /*
  * Main interrupt irq_chip
  */
-static int mpc52xx_null_set_type(unsigned int virq, unsigned int flow_type)
+static int mpc52xx_null_set_type(struct irq_data *d, unsigned int flow_type)
 {
         return 0; /* Do nothing so that the sense mask will get updated */
 }
 
-static void mpc52xx_main_mask(unsigned int virq)
+static void mpc52xx_main_mask(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[virq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_setbit(&intr->main_mask, 16 - l2irq);
 }
 
-static void mpc52xx_main_unmask(unsigned int virq)
+static void mpc52xx_main_unmask(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[virq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_clrbit(&intr->main_mask, 16 - l2irq);
 }
 
 static struct irq_chip mpc52xx_main_irqchip = {
         .name = "MPC52xx Main",
-        .mask = mpc52xx_main_mask,
-        .mask_ack = mpc52xx_main_mask,
-        .unmask = mpc52xx_main_unmask,
-        .set_type = mpc52xx_null_set_type,
+        .irq_mask = mpc52xx_main_mask,
+        .irq_mask_ack = mpc52xx_main_mask,
+        .irq_unmask = mpc52xx_main_unmask,
+        .irq_set_type = mpc52xx_null_set_type,
 };
 
 /*
  * Peripherals interrupt irq_chip
  */
-static void mpc52xx_periph_mask(unsigned int virq)
+static void mpc52xx_periph_mask(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[virq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_setbit(&intr->per_mask, 31 - l2irq);
 }
 
-static void mpc52xx_periph_unmask(unsigned int virq)
+static void mpc52xx_periph_unmask(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[virq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_clrbit(&intr->per_mask, 31 - l2irq);
 }
 
 static struct irq_chip mpc52xx_periph_irqchip = {
         .name = "MPC52xx Peripherals",
-        .mask = mpc52xx_periph_mask,
-        .mask_ack = mpc52xx_periph_mask,
-        .unmask = mpc52xx_periph_unmask,
-        .set_type = mpc52xx_null_set_type,
+        .irq_mask = mpc52xx_periph_mask,
+        .irq_mask_ack = mpc52xx_periph_mask,
+        .irq_unmask = mpc52xx_periph_unmask,
+        .irq_set_type = mpc52xx_null_set_type,
 };
 
 /*
  * SDMA interrupt irq_chip
  */
-static void mpc52xx_sdma_mask(unsigned int virq)
+static void mpc52xx_sdma_mask(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[virq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_setbit(&sdma->IntMask, l2irq);
 }
 
-static void mpc52xx_sdma_unmask(unsigned int virq)
+static void mpc52xx_sdma_unmask(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[virq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_clrbit(&sdma->IntMask, l2irq);
 }
 
-static void mpc52xx_sdma_ack(unsigned int virq)
+static void mpc52xx_sdma_ack(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[virq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         out_be32(&sdma->IntPend, 1 << l2irq);
 }
 
 static struct irq_chip mpc52xx_sdma_irqchip = {
         .name = "MPC52xx SDMA",
-        .mask = mpc52xx_sdma_mask,
-        .unmask = mpc52xx_sdma_unmask,
-        .ack = mpc52xx_sdma_ack,
-        .set_type = mpc52xx_null_set_type,
+        .irq_mask = mpc52xx_sdma_mask,
+        .irq_unmask = mpc52xx_sdma_unmask,
+        .irq_ack = mpc52xx_sdma_ack,
+        .irq_set_type = mpc52xx_null_set_type,
 };
 
 /**
@@ -414,7 +361,7 @@ static int mpc52xx_irqhost_map(struct irq_host *h, unsigned int virq,
                 else
                         hndlr = handle_level_irq;
 
-                set_irq_chip_and_handler(virq, &mpc52xx_extirq_irqchip, hndlr);
+                irq_set_chip_and_handler(virq, &mpc52xx_extirq_irqchip, hndlr);
                 pr_debug("%s: External IRQ%i virq=%x, hw=%x. type=%x\n",
                          __func__, l2irq, virq, (int)irq, type);
                 return 0;
@@ -431,7 +378,7 @@ static int mpc52xx_irqhost_map(struct irq_host *h, unsigned int virq,
                 return -EINVAL;
         }
 
-        set_irq_chip_and_handler(virq, irqchip, handle_level_irq);
+        irq_set_chip_and_handler(virq, irqchip, handle_level_irq);
         pr_debug("%s: virq=%x, l1=%i, l2=%i\n", __func__, virq, l1irq, l2irq);
 
         return 0;
@@ -512,7 +459,7 @@ void __init mpc52xx_init_irq(void)
 /**
  * mpc52xx_get_irq - Get pending interrupt number hook function
  *
- * Called by the interupt handler to determine what IRQ handler needs to be
+ * Called by the interrupt handler to determine what IRQ handler needs to be
  * executed.
  *
  * Status of pending interrupts is determined by reading the encoded status
@@ -539,7 +486,7 @@ void __init mpc52xx_init_irq(void)
 unsigned int mpc52xx_get_irq(void)
 {
         u32 status;
-        int irq = NO_IRQ_IGNORE;
+        int irq;
 
         status = in_be32(&intr->enc_status);
         if (status & 0x00000400) {      /* critical */
@@ -562,6 +509,8 @@ unsigned int mpc52xx_get_irq(void)
                 } else {
                         irq |= (MPC52xx_IRQ_L1_PERP << MPC52xx_IRQ_L1_OFFSET);
                 }
+        } else {
+                return NO_IRQ;
         }
 
         return irq_linear_revmap(mpc52xx_irqhost, irq);
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pm.c b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
index 568cef636275..8310e8b5b57f 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
@@ -186,7 +186,7 @@ void mpc52xx_pm_finish(void)
         iounmap(mbar);
 }
 
-static struct platform_suspend_ops mpc52xx_pm_ops = {
+static const struct platform_suspend_ops mpc52xx_pm_ops = {
         .valid          = mpc52xx_pm_valid,
         .prepare        = mpc52xx_pm_prepare,
         .enter          = mpc52xx_pm_enter,
diff --git a/arch/powerpc/platforms/82xx/Makefile b/arch/powerpc/platforms/82xx/Makefile
index d982793f4dbd..455fe21e37c4 100644
--- a/arch/powerpc/platforms/82xx/Makefile
+++ b/arch/powerpc/platforms/82xx/Makefile
@@ -6,4 +6,4 @@ obj-$(CONFIG_CPM2) += pq2.o
 obj-$(CONFIG_PQ2_ADS_PCI_PIC) += pq2ads-pci-pic.o
 obj-$(CONFIG_PQ2FADS) += pq2fads.o
 obj-$(CONFIG_EP8248E) += ep8248e.o
-obj-$(CONFIG_MGCOGE) += mgcoge.o
+obj-$(CONFIG_MGCOGE) += km82xx.o
diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c
index 1565e0446dc8..10ff526cd046 100644
--- a/arch/powerpc/platforms/82xx/ep8248e.c
+++ b/arch/powerpc/platforms/82xx/ep8248e.c
@@ -111,8 +111,7 @@ static struct mdiobb_ctrl ep8248e_mdio_ctrl = {
         .ops = &ep8248e_mdio_ops,
 };
 
-static int __devinit ep8248e_mdio_probe(struct platform_device *ofdev,
-                                        const struct of_device_id *match)
+static int __devinit ep8248e_mdio_probe(struct platform_device *ofdev)
 {
         struct mii_bus *bus;
         struct resource res;
@@ -167,7 +166,7 @@ static const struct of_device_id ep8248e_mdio_match[] = {
         {},
 };
 
-static struct of_platform_driver ep8248e_mdio_driver = {
+static struct platform_driver ep8248e_mdio_driver = {
         .driver = {
                 .name = "ep8248e-mdio-bitbang",
                 .owner = THIS_MODULE,
@@ -308,7 +307,7 @@ static  __initdata struct of_device_id of_bus_ids[] = {
 static int __init declare_of_platform_devices(void)
 {
         of_platform_bus_probe(NULL, of_bus_ids, NULL);
-        of_register_platform_driver(&ep8248e_mdio_driver);
+        platform_driver_register(&ep8248e_mdio_driver);
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/82xx/mgcoge.c b/arch/powerpc/platforms/82xx/km82xx.c
index 7a5de9eb3c73..428c5e0a0e75 100644
--- a/arch/powerpc/platforms/82xx/mgcoge.c
+++ b/arch/powerpc/platforms/82xx/km82xx.c
@@ -1,6 +1,6 @@
 /*
- * Keymile mgcoge support
- * Copyright 2008 DENX Software Engineering GmbH
+ * Keymile km82xx support
+ * Copyright 2008-2011 DENX Software Engineering GmbH
  * Author: Heiko Schocher <hs@denx.de>
  *
  * based on code from:
@@ -31,9 +31,10 @@
 
 #include "pq2.h"
 
-static void __init mgcoge_pic_init(void)
+static void __init km82xx_pic_init(void)
 {
-        struct device_node *np = of_find_compatible_node(NULL, NULL, "fsl,pq2-pic");
+        struct device_node *np = of_find_compatible_node(NULL, NULL,
+                                                        "fsl,pq2-pic");
         if (!np) {
                 printk(KERN_ERR "PIC init: can not find cpm-pic node\n");
                 return;
@@ -47,12 +48,18 @@ struct cpm_pin {
         int port, pin, flags;
 };
 
-static __initdata struct cpm_pin mgcoge_pins[] = {
+static __initdata struct cpm_pin km82xx_pins[] = {
 
         /* SMC2 */
         {0, 8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
         {0, 9, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
 
+        /* SCC1 */
+        {2, 21, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {2, 15, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {3, 31, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {3, 30, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+
         /* SCC4 */
         {2, 25, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
         {2, 24, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
@@ -107,30 +114,49 @@ static __initdata struct cpm_pin mgcoge_pins[] = {
         {3, 14, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_OPENDRAIN},
         {3, 15, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_OPENDRAIN},
 #endif
+
+        /* USB */
+        {0, 10, CPM_PIN_OUTPUT | CPM_PIN_GPIO},    /* FULL_SPEED */
+        {0, 11, CPM_PIN_OUTPUT | CPM_PIN_GPIO},    /*/SLAVE */
+        {2, 10, CPM_PIN_INPUT  | CPM_PIN_PRIMARY}, /* RXN */
+        {2, 11, CPM_PIN_INPUT  | CPM_PIN_PRIMARY}, /* RXP */
+        {2, 20, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY}, /* /OE */
+        {2, 27, CPM_PIN_INPUT  | CPM_PIN_PRIMARY}, /* RXCLK */
+        {3, 23, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY}, /* TXP */
+        {3, 24, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY}, /* TXN */
+        {3, 25, CPM_PIN_INPUT  | CPM_PIN_PRIMARY}, /* RXD */
 };
 
 static void __init init_ioports(void)
 {
         int i;
 
-        for (i = 0; i < ARRAY_SIZE(mgcoge_pins); i++) {
-                const struct cpm_pin *pin = &mgcoge_pins[i];
+        for (i = 0; i < ARRAY_SIZE(km82xx_pins); i++) {
+                const struct cpm_pin *pin = &km82xx_pins[i];
                 cpm2_set_pin(pin->port, pin->pin, pin->flags);
         }
 
         cpm2_smc_clk_setup(CPM_CLK_SMC2, CPM_BRG8);
+        cpm2_clk_setup(CPM_CLK_SCC1, CPM_CLK11, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_SCC1, CPM_CLK11, CPM_CLK_TX);
+        cpm2_clk_setup(CPM_CLK_SCC3, CPM_CLK5, CPM_CLK_RTX);
         cpm2_clk_setup(CPM_CLK_SCC4, CPM_CLK7, CPM_CLK_RX);
         cpm2_clk_setup(CPM_CLK_SCC4, CPM_CLK8, CPM_CLK_TX);
         cpm2_clk_setup(CPM_CLK_FCC1, CPM_CLK10, CPM_CLK_RX);
         cpm2_clk_setup(CPM_CLK_FCC1, CPM_CLK9,  CPM_CLK_TX);
         cpm2_clk_setup(CPM_CLK_FCC2, CPM_CLK13, CPM_CLK_RX);
         cpm2_clk_setup(CPM_CLK_FCC2, CPM_CLK14, CPM_CLK_TX);
+
+        /* Force USB FULL SPEED bit to '1' */
+        setbits32(&cpm2_immr->im_ioport.iop_pdata, 1 << (31 - 10));
+        /* clear USB_SLAVE */
+        clrbits32(&cpm2_immr->im_ioport.iop_pdata, 1 << (31 - 11));
 }
 
-static void __init mgcoge_setup_arch(void)
+static void __init km82xx_setup_arch(void)
 {
         if (ppc_md.progress)
-                ppc_md.progress("mgcoge_setup_arch()", 0);
+                ppc_md.progress("km82xx_setup_arch()", 0);
 
         cpm2_reset();
 
@@ -142,7 +168,7 @@ static void __init mgcoge_setup_arch(void)
         init_ioports();
 
         if (ppc_md.progress)
-                ppc_md.progress("mgcoge_setup_arch(), finish", 0);
+                ppc_md.progress("km82xx_setup_arch(), finish", 0);
 }
 
 static  __initdata struct of_device_id of_bus_ids[] = {
@@ -156,23 +182,23 @@ static int __init declare_of_platform_devices(void)
 
         return 0;
 }
-machine_device_initcall(mgcoge, declare_of_platform_devices);
+machine_device_initcall(km82xx, declare_of_platform_devices);
 
 /*
  * Called very early, device-tree isn't unflattened
  */
-static int __init mgcoge_probe(void)
+static int __init km82xx_probe(void)
 {
         unsigned long root = of_get_flat_dt_root();
-        return of_flat_dt_is_compatible(root, "keymile,mgcoge");
+        return of_flat_dt_is_compatible(root, "keymile,km82xx");
 }
 
-define_machine(mgcoge)
+define_machine(km82xx)
 {
-        .name = "Keymile MGCOGE",
-        .probe = mgcoge_probe,
-        .setup_arch = mgcoge_setup_arch,
-        .init_IRQ = mgcoge_pic_init,
+        .name = "Keymile km82xx",
+        .probe = km82xx_probe,
+        .setup_arch = km82xx_setup_arch,
+        .init_IRQ = km82xx_pic_init,
         .get_irq = cpm2_get_irq,
         .calibrate_decr = generic_calibrate_decr,
         .restart = pq2_restart,
diff --git a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
index 5a55d87d6bd6..8ccf9ed62fe2 100644
--- a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
+++ b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
@@ -39,10 +39,10 @@ struct pq2ads_pci_pic {
 
 #define NUM_IRQS 32
 
-static void pq2ads_pci_mask_irq(unsigned int virq)
+static void pq2ads_pci_mask_irq(struct irq_data *d)
 {
-        struct pq2ads_pci_pic *priv = get_irq_chip_data(virq);
-        int irq = NUM_IRQS - virq_to_hw(virq) - 1;
+        struct pq2ads_pci_pic *priv = irq_data_get_irq_chip_data(d);
+        int irq = NUM_IRQS - irqd_to_hwirq(d) - 1;
 
         if (irq != -1) {
                 unsigned long flags;
@@ -55,10 +55,10 @@ static void pq2ads_pci_mask_irq(unsigned int virq)
         }
 }
 
-static void pq2ads_pci_unmask_irq(unsigned int virq)
+static void pq2ads_pci_unmask_irq(struct irq_data *d)
 {
-        struct pq2ads_pci_pic *priv = get_irq_chip_data(virq);
-        int irq = NUM_IRQS - virq_to_hw(virq) - 1;
+        struct pq2ads_pci_pic *priv = irq_data_get_irq_chip_data(d);
+        int irq = NUM_IRQS - irqd_to_hwirq(d) - 1;
 
         if (irq != -1) {
                 unsigned long flags;
@@ -71,18 +71,17 @@ static void pq2ads_pci_unmask_irq(unsigned int virq)
 
 static struct irq_chip pq2ads_pci_ic = {
         .name = "PQ2 ADS PCI",
-        .end = pq2ads_pci_unmask_irq,
-        .mask = pq2ads_pci_mask_irq,
-        .mask_ack = pq2ads_pci_mask_irq,
-        .ack = pq2ads_pci_mask_irq,
-        .unmask = pq2ads_pci_unmask_irq,
-        .enable = pq2ads_pci_unmask_irq,
-        .disable = pq2ads_pci_mask_irq
+        .irq_mask = pq2ads_pci_mask_irq,
+        .irq_mask_ack = pq2ads_pci_mask_irq,
+        .irq_ack = pq2ads_pci_mask_irq,
+        .irq_unmask = pq2ads_pci_unmask_irq,
+        .irq_enable = pq2ads_pci_unmask_irq,
+        .irq_disable = pq2ads_pci_mask_irq
 };
 
 static void pq2ads_pci_irq_demux(unsigned int irq, struct irq_desc *desc)
 {
-        struct pq2ads_pci_pic *priv = desc->handler_data;
+        struct pq2ads_pci_pic *priv = irq_desc_get_handler_data(desc);
         u32 stat, mask, pend;
         int bit;
 
@@ -107,22 +106,14 @@ static void pq2ads_pci_irq_demux(unsigned int irq, struct irq_desc *desc)
 static int pci_pic_host_map(struct irq_host *h, unsigned int virq,
                             irq_hw_number_t hw)
 {
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip_data(virq, h->host_data);
-        set_irq_chip_and_handler(virq, &pq2ads_pci_ic, handle_level_irq);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_data(virq, h->host_data);
+        irq_set_chip_and_handler(virq, &pq2ads_pci_ic, handle_level_irq);
         return 0;
 }
 
-static void pci_host_unmap(struct irq_host *h, unsigned int virq)
-{
-        /* remove chip and handler */
-        set_irq_chip_data(virq, NULL);
-        set_irq_chip(virq, NULL);
-}
-
 static struct irq_host_ops pci_pic_host_ops = {
         .map = pci_pic_host_map,
-        .unmap = pci_host_unmap,
 };
 
 int __init pq2ads_pci_init_irq(void)
@@ -176,8 +167,8 @@ int __init pq2ads_pci_init_irq(void)
 
         priv->host = host;
         host->host_data = priv;
-        set_irq_data(irq, priv);
-        set_irq_chained_handler(irq, pq2ads_pci_irq_demux);
+        irq_set_handler_data(irq, priv);
+        irq_set_chained_handler(irq, pq2ads_pci_irq_demux);
 
         of_node_put(np);
         return 0;
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index 021763a32c2f..73f4135f3a1a 100644
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -10,12 +10,12 @@ menuconfig PPC_83xx
 if PPC_83xx
 
 config MPC830x_RDB
-        bool "Freescale MPC830x RDB"
+        bool "Freescale MPC830x RDB and derivatives"
         select DEFAULT_UIMAGE
         select PPC_MPC831x
         select FSL_GTM
         help
-          This option enables support for the MPC8308 RDB board.
+          This option enables support for the MPC8308 RDB and MPC8308 P1M boards.
 
 config MPC831x_RDB
         bool "Freescale MPC831x RDB"
diff --git a/arch/powerpc/platforms/83xx/Makefile b/arch/powerpc/platforms/83xx/Makefile
index 6e8bbbbcfdf8..ed95bfcbcbff 100644
--- a/arch/powerpc/platforms/83xx/Makefile
+++ b/arch/powerpc/platforms/83xx/Makefile
@@ -16,4 +16,4 @@ obj-$(CONFIG_MPC837x_MDS)	+= mpc837x_mds.o
 obj-$(CONFIG_SBC834x)           += sbc834x.o
 obj-$(CONFIG_MPC837x_RDB)       += mpc837x_rdb.o
 obj-$(CONFIG_ASP834x)           += asp834x.o
-obj-$(CONFIG_KMETER1)           += kmeter1.o
+obj-$(CONFIG_KMETER1)           += km83xx.o
diff --git a/arch/powerpc/platforms/83xx/kmeter1.c b/arch/powerpc/platforms/83xx/km83xx.c
index 903acfd851ac..a2b9b9ef1240 100644
--- a/arch/powerpc/platforms/83xx/kmeter1.c
+++ b/arch/powerpc/platforms/83xx/km83xx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 DENX Software Engineering GmbH
+ * Copyright 2008-2011 DENX Software Engineering GmbH
  * Author: Heiko Schocher <hs@denx.de>
  *
  * Description:
@@ -49,12 +49,12 @@
  * Setup the architecture
  *
  */
-static void __init kmeter1_setup_arch(void)
+static void __init mpc83xx_km_setup_arch(void)
 {
         struct device_node *np;
 
         if (ppc_md.progress)
-                ppc_md.progress("kmeter1_setup_arch()", 0);
+                ppc_md.progress("kmpbec83xx_setup_arch()", 0);
 
 #ifdef CONFIG_PCI
         for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
@@ -69,6 +69,9 @@ static void __init kmeter1_setup_arch(void)
                 par_io_init(np);
                 of_node_put(np);
 
+                for_each_node_by_name(np, "spi")
+                        par_io_of_config(np);
+
                 for (np = NULL; (np = of_find_node_by_name(np, "ucc")) != NULL;)
                         par_io_of_config(np);
         }
@@ -119,7 +122,7 @@ static void __init kmeter1_setup_arch(void)
 #endif                          /* CONFIG_QUICC_ENGINE */
 }
 
-static struct of_device_id kmeter_ids[] = {
+static struct of_device_id kmpbec83xx_ids[] = {
         { .type = "soc", },
         { .compatible = "soc", },
         { .compatible = "simple-bus", },
@@ -131,13 +134,13 @@ static struct of_device_id kmeter_ids[] = {
 static int __init kmeter_declare_of_platform_devices(void)
 {
         /* Publish the QE devices */
-        of_platform_bus_probe(NULL, kmeter_ids, NULL);
+        of_platform_bus_probe(NULL, kmpbec83xx_ids, NULL);
 
         return 0;
 }
-machine_device_initcall(kmeter1, kmeter_declare_of_platform_devices);
+machine_device_initcall(mpc83xx_km, kmeter_declare_of_platform_devices);
 
-static void __init kmeter1_init_IRQ(void)
+static void __init mpc83xx_km_init_IRQ(void)
 {
         struct device_node *np;
 
@@ -168,21 +171,34 @@ static void __init kmeter1_init_IRQ(void)
 #endif                          /* CONFIG_QUICC_ENGINE */
 }
 
+/* list of the supported boards */
+static char *board[] __initdata = {
+        "Keymile,KMETER1",
+        "Keymile,kmpbec8321",
+        NULL
+};
+
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
  */
-static int __init kmeter1_probe(void)
+static int __init mpc83xx_km_probe(void)
 {
-        unsigned long root = of_get_flat_dt_root();
+        unsigned long node = of_get_flat_dt_root();
+        int i = 0;
 
-        return of_flat_dt_is_compatible(root, "keymile,KMETER1");
+        while (board[i]) {
+                if (of_flat_dt_is_compatible(node, board[i]))
+                        break;
+                i++;
+        }
+        return (board[i] != NULL);
 }
 
-define_machine(kmeter1) {
-        .name           = "KMETER1",
-        .probe          = kmeter1_probe,
-        .setup_arch     = kmeter1_setup_arch,
-        .init_IRQ       = kmeter1_init_IRQ,
+define_machine(mpc83xx_km) {
+        .name           = "mpc83xx-km-platform",
+        .probe          = mpc83xx_km_probe,
+        .setup_arch     = mpc83xx_km_setup_arch,
+        .init_IRQ       = mpc83xx_km_init_IRQ,
         .get_irq        = ipic_get_irq,
         .restart        = mpc83xx_restart,
         .time_init      = mpc83xx_time_init,
diff --git a/arch/powerpc/platforms/83xx/mpc830x_rdb.c b/arch/powerpc/platforms/83xx/mpc830x_rdb.c
index ac102ee9abe8..d0c4e15b7794 100644
--- a/arch/powerpc/platforms/83xx/mpc830x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc830x_rdb.c
@@ -57,15 +57,19 @@ static void __init mpc830x_rdb_init_IRQ(void)
         ipic_set_default_priority();
 }
 
+static const char *board[] __initdata = {
+        "MPC8308RDB",
+        "fsl,mpc8308rdb",
+        "denx,mpc8308_p1m",
+        NULL
+};
+
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
  */
 static int __init mpc830x_rdb_probe(void)
 {
-        unsigned long root = of_get_flat_dt_root();
-
-        return of_flat_dt_is_compatible(root, "MPC8308RDB") ||
-               of_flat_dt_is_compatible(root, "fsl,mpc8308rdb");
+        return of_flat_dt_match(of_get_flat_dt_root(), board);
 }
 
 static struct of_device_id __initdata of_bus_ids[] = {
diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
index ae525e4745d2..f859ead49a8d 100644
--- a/arch/powerpc/platforms/83xx/mpc831x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
@@ -60,15 +60,18 @@ static void __init mpc831x_rdb_init_IRQ(void)
         ipic_set_default_priority();
 }
 
+static const char *board[] __initdata = {
+        "MPC8313ERDB",
+        "fsl,mpc8315erdb",
+        NULL
+};
+
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
  */
 static int __init mpc831x_rdb_probe(void)
 {
-        unsigned long root = of_get_flat_dt_root();
-
-        return of_flat_dt_is_compatible(root, "MPC8313ERDB") ||
-               of_flat_dt_is_compatible(root, "fsl,mpc8315erdb");
+        return of_flat_dt_match(of_get_flat_dt_root(), board);
 }
 
 static struct of_device_id __initdata of_bus_ids[] = {
diff --git a/arch/powerpc/platforms/83xx/mpc837x_rdb.c b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
index 910caa6b5810..7bafbf2ec0f9 100644
--- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
@@ -101,17 +101,20 @@ static void __init mpc837x_rdb_init_IRQ(void)
         ipic_set_default_priority();
 }
 
+static const char *board[] __initdata = {
+        "fsl,mpc8377rdb",
+        "fsl,mpc8378rdb",
+        "fsl,mpc8379rdb",
+        "fsl,mpc8377wlan",
+        NULL
+};
+
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
  */
 static int __init mpc837x_rdb_probe(void)
 {
-        unsigned long root = of_get_flat_dt_root();
-
-        return of_flat_dt_is_compatible(root, "fsl,mpc8377rdb") ||
-               of_flat_dt_is_compatible(root, "fsl,mpc8378rdb") ||
-               of_flat_dt_is_compatible(root, "fsl,mpc8379rdb") ||
-               of_flat_dt_is_compatible(root, "fsl,mpc8377wlan");
+        return of_flat_dt_match(of_get_flat_dt_root(), board);
 }
 
 define_machine(mpc837x_rdb) {
diff --git a/arch/powerpc/platforms/83xx/mpc83xx.h b/arch/powerpc/platforms/83xx/mpc83xx.h
index 0fea8811d45b..82a434510d83 100644
--- a/arch/powerpc/platforms/83xx/mpc83xx.h
+++ b/arch/powerpc/platforms/83xx/mpc83xx.h
@@ -35,6 +35,8 @@
 
 /* system i/o configuration register high */
 #define MPC83XX_SICRH_OFFS         0x118
+#define MPC8308_SICRH_USB_MASK     0x000c0000
+#define MPC8308_SICRH_USB_ULPI     0x00040000
 #define MPC834X_SICRH_USB_UTMI     0x00020000
 #define MPC831X_SICRH_USB_MASK     0x000000e0
 #define MPC831X_SICRH_USB_ULPI     0x000000a0
diff --git a/arch/powerpc/platforms/83xx/suspend-asm.S b/arch/powerpc/platforms/83xx/suspend-asm.S
index 1930543c98d3..3d1ecd211776 100644
--- a/arch/powerpc/platforms/83xx/suspend-asm.S
+++ b/arch/powerpc/platforms/83xx/suspend-asm.S
@@ -231,7 +231,7 @@ _GLOBAL(mpc83xx_enter_deep_sleep)
         ori     r4, r4, 0x002a
         mtspr   SPRN_DBAT0L, r4
         lis     r8, TMP_VIRT_IMMR@h
-        ori     r4, r8, 0x001e  /* 1 MByte accessable from Kernel Space only */
+        ori     r4, r8, 0x001e  /* 1 MByte accessible from Kernel Space only */
         mtspr   SPRN_DBAT0U, r4
         isync
 
@@ -241,7 +241,7 @@ _GLOBAL(mpc83xx_enter_deep_sleep)
         ori     r4, r4, 0x002a
         mtspr   SPRN_DBAT1L, r4
         lis     r9, (TMP_VIRT_IMMR + 0x01000000)@h
-        ori     r4, r9, 0x001e  /* 1 MByte accessable from Kernel Space only */
+        ori     r4, r9, 0x001e  /* 1 MByte accessible from Kernel Space only */
         mtspr   SPRN_DBAT1U, r4
         isync
 
@@ -253,7 +253,7 @@ _GLOBAL(mpc83xx_enter_deep_sleep)
         li      r4, 0x0002
         mtspr   SPRN_DBAT2L, r4
         lis     r4, KERNELBASE@h
-        ori     r4, r4, 0x001e  /* 1 MByte accessable from Kernel Space only */
+        ori     r4, r4, 0x001e  /* 1 MByte accessible from Kernel Space only */
         mtspr   SPRN_DBAT2U, r4
         isync
 
diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c
index 75ae77f1af6a..104faa8aa23c 100644
--- a/arch/powerpc/platforms/83xx/suspend.c
+++ b/arch/powerpc/platforms/83xx/suspend.c
@@ -311,21 +311,28 @@ static int mpc83xx_is_pci_agent(void)
         return ret;
 }
 
-static struct platform_suspend_ops mpc83xx_suspend_ops = {
+static const struct platform_suspend_ops mpc83xx_suspend_ops = {
         .valid = mpc83xx_suspend_valid,
         .begin = mpc83xx_suspend_begin,
         .enter = mpc83xx_suspend_enter,
         .end = mpc83xx_suspend_end,
 };
 
-static int pmc_probe(struct platform_device *ofdev,
-                     const struct of_device_id *match)
+static struct of_device_id pmc_match[];
+static int pmc_probe(struct platform_device *ofdev)
 {
+        const struct of_device_id *match;
         struct device_node *np = ofdev->dev.of_node;
         struct resource res;
-        struct pmc_type *type = match->data;
+        struct pmc_type *type;
         int ret = 0;
 
+        match = of_match_device(pmc_match, &ofdev->dev);
+        if (!match)
+                return -EINVAL;
+
+        type = match->data;
+
         if (!of_device_is_available(np))
                 return -ENODEV;
 
@@ -422,7 +429,7 @@ static struct of_device_id pmc_match[] = {
         {}
 };
 
-static struct of_platform_driver pmc_driver = {
+static struct platform_driver pmc_driver = {
         .driver = {
                 .name = "mpc83xx-pmc",
                 .owner = THIS_MODULE,
@@ -434,7 +441,7 @@ static struct of_platform_driver pmc_driver = {
 
 static int pmc_init(void)
 {
-        return of_register_platform_driver(&pmc_driver);
+        return platform_driver_register(&pmc_driver);
 }
 
 module_init(pmc_init);
diff --git a/arch/powerpc/platforms/83xx/usb.c b/arch/powerpc/platforms/83xx/usb.c
index 3ba4bb7d41bb..2c64164722d0 100644
--- a/arch/powerpc/platforms/83xx/usb.c
+++ b/arch/powerpc/platforms/83xx/usb.c
@@ -127,7 +127,8 @@ int mpc831x_usb_cfg(void)
 
         /* Configure clock */
         immr_node = of_get_parent(np);
-        if (immr_node && of_device_is_compatible(immr_node, "fsl,mpc8315-immr"))
+        if (immr_node && (of_device_is_compatible(immr_node, "fsl,mpc8315-immr") ||
+                        of_device_is_compatible(immr_node, "fsl,mpc8308-immr")))
                 clrsetbits_be32(immap + MPC83XX_SCCR_OFFS,
                                 MPC8315_SCCR_USB_MASK,
                                 MPC8315_SCCR_USB_DRCM_01);
@@ -138,7 +139,11 @@ int mpc831x_usb_cfg(void)
 
         /* Configure pin mux for ULPI.  There is no pin mux for UTMI */
         if (prop && !strcmp(prop, "ulpi")) {
-                if (of_device_is_compatible(immr_node, "fsl,mpc8315-immr")) {
+                if (of_device_is_compatible(immr_node, "fsl,mpc8308-immr")) {
+                        clrsetbits_be32(immap + MPC83XX_SICRH_OFFS,
+                                        MPC8308_SICRH_USB_MASK,
+                                        MPC8308_SICRH_USB_ULPI);
+                } else if (of_device_is_compatible(immr_node, "fsl,mpc8315-immr")) {
                         clrsetbits_be32(immap + MPC83XX_SICRL_OFFS,
                                         MPC8315_SICRL_USB_MASK,
                                         MPC8315_SICRL_USB_ULPI);
@@ -173,6 +178,9 @@ int mpc831x_usb_cfg(void)
                      !strcmp(prop, "utmi"))) {
                 u32 refsel;
 
+                if (of_device_is_compatible(immr_node, "fsl,mpc8308-immr"))
+                        goto out;
+
                 if (of_device_is_compatible(immr_node, "fsl,mpc8315-immr"))
                         refsel = CONTROL_REFSEL_24MHZ;
                 else
@@ -186,9 +194,11 @@ int mpc831x_usb_cfg(void)
                 temp = CONTROL_PHY_CLK_SEL_ULPI;
 #ifdef CONFIG_USB_OTG
                 /* Set OTG_PORT */
-                dr_mode = of_get_property(np, "dr_mode", NULL);
-                if (dr_mode && !strcmp(dr_mode, "otg"))
-                        temp |= CONTROL_OTG_PORT;
+                if (!of_device_is_compatible(immr_node, "fsl,mpc8308-immr")) {
+                        dr_mode = of_get_property(np, "dr_mode", NULL);
+                        if (dr_mode && !strcmp(dr_mode, "otg"))
+                                temp |= CONTROL_OTG_PORT;
+                }
 #endif /* CONFIG_USB_OTG */
                 out_be32(usb_regs + FSL_USB2_CONTROL_OFFS, temp);
         } else {
@@ -196,6 +206,7 @@ int mpc831x_usb_cfg(void)
                 ret = -EINVAL;
         }
 
+out:
         iounmap(usb_regs);
         of_node_put(np);
         return ret;
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index bea1f5905ad4..b6976e1726e4 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -11,6 +11,8 @@ menuconfig FSL_SOC_BOOKE
 
 if FSL_SOC_BOOKE
 
+if PPC32
+
 config MPC8540_ADS
         bool "Freescale MPC8540 ADS"
         select DEFAULT_UIMAGE
@@ -153,10 +155,20 @@ config SBC8560
         help
           This option enables support for the Wind River SBC8560 board
 
+config P3041_DS
+        bool "Freescale P3041 DS"
+        select DEFAULT_UIMAGE
+        select PPC_E500MC
+        select PHYS_64BIT
+        select SWIOTLB
+        select MPC8xxx_GPIO
+        select HAS_RAPIDIO
+        help
+          This option enables support for the P3041 DS board
+
 config P4080_DS
         bool "Freescale P4080 DS"
         select DEFAULT_UIMAGE
-        select PPC_FSL_BOOK3E
         select PPC_E500MC
         select PHYS_64BIT
         select SWIOTLB
@@ -165,6 +177,20 @@ config P4080_DS
         help
           This option enables support for the P4080 DS board
 
+endif # PPC32
+
+config P5020_DS
+        bool "Freescale P5020 DS"
+        select DEFAULT_UIMAGE
+        select E500
+        select PPC_E500MC
+        select PHYS_64BIT
+        select SWIOTLB
+        select MPC8xxx_GPIO
+        select HAS_RAPIDIO
+        help
+          This option enables support for the P5020 DS board
+
 endif # FSL_SOC_BOOKE
 
 config TQM85xx
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index a2ec3f8f4d06..dd70db77d63e 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -11,7 +11,9 @@ obj-$(CONFIG_MPC85xx_DS)  += mpc85xx_ds.o
 obj-$(CONFIG_MPC85xx_MDS) += mpc85xx_mds.o
 obj-$(CONFIG_MPC85xx_RDB) += mpc85xx_rdb.o
 obj-$(CONFIG_P1022_DS)    += p1022_ds.o
+obj-$(CONFIG_P3041_DS)    += p3041_ds.o corenet_ds.o
 obj-$(CONFIG_P4080_DS)    += p4080_ds.o corenet_ds.o
+obj-$(CONFIG_P5020_DS)    += p5020_ds.o corenet_ds.o
 obj-$(CONFIG_STX_GP3)     += stx_gp3.o
 obj-$(CONFIG_TQM85xx)     += tqm85xx.o
 obj-$(CONFIG_SBC8560)     += sbc8560.o
diff --git a/arch/powerpc/platforms/85xx/ksi8560.c b/arch/powerpc/platforms/85xx/ksi8560.c
index f4d36b5a2e00..c46f9359be15 100644
--- a/arch/powerpc/platforms/85xx/ksi8560.c
+++ b/arch/powerpc/platforms/85xx/ksi8560.c
@@ -56,12 +56,13 @@ static void machine_restart(char *cmd)
 
 static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
 {
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         int cascade_irq;
 
         while ((cascade_irq = cpm2_get_irq()) >= 0)
                 generic_handle_irq(cascade_irq);
 
-        desc->chip->eoi(irq);
+        chip->irq_eoi(&desc->irq_data);
 }
 
 static void __init ksi8560_pic_init(void)
@@ -105,7 +106,7 @@ static void __init ksi8560_pic_init(void)
 
         cpm2_pic_init(np);
         of_node_put(np);
-        set_irq_chained_handler(irq, cpm2_cascade);
+        irq_set_chained_handler(irq, cpm2_cascade);
 #endif
 }
 
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index 9438a892afc4..3b2c9bb66199 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -50,12 +50,13 @@ static int mpc85xx_exclude_device(struct pci_controller *hose,
 
 static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
 {
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         int cascade_irq;
 
         while ((cascade_irq = cpm2_get_irq()) >= 0)
                 generic_handle_irq(cascade_irq);
 
-        desc->chip->eoi(irq);
+        chip->irq_eoi(&desc->irq_data);
 }
 
 #endif /* CONFIG_CPM2 */
@@ -100,7 +101,7 @@ static void __init mpc85xx_ads_pic_init(void)
 
         cpm2_pic_init(np);
         of_node_put(np);
-        set_irq_chained_handler(irq, cpm2_cascade);
+        irq_set_chained_handler(irq, cpm2_cascade);
 #endif
 }
 
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 458d91fba91d..6299a2a51ae8 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -255,7 +255,7 @@ static int mpc85xx_cds_8259_attach(void)
         }
 
         /* Success. Connect our low-level cascade handler. */
-        set_irq_handler(cascade_irq, mpc85xx_8259_cascade_handler);
+        irq_set_handler(cascade_irq, mpc85xx_8259_cascade_handler);
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index 8190bc25bf27..c7b97f70312e 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -47,12 +47,13 @@
 #ifdef CONFIG_PPC_I8259
 static void mpc85xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
 {
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         unsigned int cascade_irq = i8259_irq();
 
         if (cascade_irq != NO_IRQ) {
                 generic_handle_irq(cascade_irq);
         }
-        desc->chip->eoi(irq);
+        chip->irq_eoi(&desc->irq_data);
 }
 #endif  /* CONFIG_PPC_I8259 */
 
@@ -121,7 +122,7 @@ void __init mpc85xx_ds_pic_init(void)
         i8259_init(cascade_node, 0);
         of_node_put(cascade_node);
 
-        set_irq_chained_handler(cascade_irq, mpc85xx_8259_cascade);
+        irq_set_chained_handler(cascade_irq, mpc85xx_8259_cascade);
 #endif  /* CONFIG_PPC_I8259 */
 }
 
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index aa34cac4eb5c..747d1ee661fd 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -309,7 +309,7 @@ static void __init mpc85xx_mds_qe_init(void)
                         /* P1021 has pins muxed for QE and other functions. To
                          * enable QE UEC mode, we need to set bit QE0 for UCC1
                          * in Eth mode, QE0 and QE3 for UCC5 in Eth mode, QE9
-                         * and QE12 for QE MII management singals in PMUXCR
+                         * and QE12 for QE MII management signals in PMUXCR
                          * register.
                          */
                                 setbits32(pmuxcr, MPC85xx_PMUXCR_QE0 |
diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
index 34e00902ce86..7eb5c40c069f 100644
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -8,7 +8,6 @@
  * Copyright 2010 Freescale Semiconductor, Inc.
  *
  * This file is taken from the Freescale P1022DS BSP, with modifications:
- * 1) No DIU support (pending rewrite of DIU code)
  * 2) No AMP support
  * 3) No PCI endpoint support
  *
@@ -20,12 +19,211 @@
 #include <linux/pci.h>
 #include <linux/of_platform.h>
 #include <linux/memblock.h>
-
+#include <asm/div64.h>
 #include <asm/mpic.h>
 #include <asm/swiotlb.h>
 
 #include <sysdev/fsl_soc.h>
 #include <sysdev/fsl_pci.h>
+#include <asm/fsl_guts.h>
+
+#if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
+
+/*
+ * Board-specific initialization of the DIU.  This code should probably be
+ * executed when the DIU is opened, rather than in arch code, but the DIU
+ * driver does not have a mechanism for this (yet).
+ *
+ * This is especially problematic on the P1022DS because the local bus (eLBC)
+ * and the DIU video signals share the same pins, which means that enabling the
+ * DIU will disable access to NOR flash.
+ */
+
+/* DIU Pixel Clock bits of the CLKDVDR Global Utilities register */
+#define CLKDVDR_PXCKEN          0x80000000
+#define CLKDVDR_PXCKINV         0x10000000
+#define CLKDVDR_PXCKDLY         0x06000000
+#define CLKDVDR_PXCLK_MASK      0x00FF0000
+
+/* Some ngPIXIS register definitions */
+#define PX_BRDCFG1_DVIEN        0x80
+#define PX_BRDCFG1_DFPEN        0x40
+#define PX_BRDCFG1_BACKLIGHT    0x20
+#define PX_BRDCFG1_DDCEN        0x10
+
+/*
+ * DIU Area Descriptor
+ *
+ * Note that we need to byte-swap the value before it's written to the AD
+ * register.  So even though the registers don't look like they're in the same
+ * bit positions as they are on the MPC8610, the same value is written to the
+ * AD register on the MPC8610 and on the P1022.
+ */
+#define AD_BYTE_F               0x10000000
+#define AD_ALPHA_C_MASK         0x0E000000
+#define AD_ALPHA_C_SHIFT        25
+#define AD_BLUE_C_MASK          0x01800000
+#define AD_BLUE_C_SHIFT         23
+#define AD_GREEN_C_MASK         0x00600000
+#define AD_GREEN_C_SHIFT        21
+#define AD_RED_C_MASK           0x00180000
+#define AD_RED_C_SHIFT          19
+#define AD_PALETTE              0x00040000
+#define AD_PIXEL_S_MASK         0x00030000
+#define AD_PIXEL_S_SHIFT        16
+#define AD_COMP_3_MASK          0x0000F000
+#define AD_COMP_3_SHIFT         12
+#define AD_COMP_2_MASK          0x00000F00
+#define AD_COMP_2_SHIFT         8
+#define AD_COMP_1_MASK          0x000000F0
+#define AD_COMP_1_SHIFT         4
+#define AD_COMP_0_MASK          0x0000000F
+#define AD_COMP_0_SHIFT         0
+
+#define MAKE_AD(alpha, red, blue, green, size, c0, c1, c2, c3) \
+        cpu_to_le32(AD_BYTE_F | (alpha << AD_ALPHA_C_SHIFT) | \
+        (blue << AD_BLUE_C_SHIFT) | (green << AD_GREEN_C_SHIFT) | \
+        (red << AD_RED_C_SHIFT) | (c3 << AD_COMP_3_SHIFT) | \
+        (c2 << AD_COMP_2_SHIFT) | (c1 << AD_COMP_1_SHIFT) | \
+        (c0 << AD_COMP_0_SHIFT) | (size << AD_PIXEL_S_SHIFT))
+
+/**
+ * p1022ds_get_pixel_format: return the Area Descriptor for a given pixel depth
+ *
+ * The Area Descriptor is a 32-bit value that determine which bits in each
+ * pixel are to be used for each color.
+ */
+static unsigned int p1022ds_get_pixel_format(unsigned int bits_per_pixel,
+        int monitor_port)
+{
+        switch (bits_per_pixel) {
+        case 32:
+                /* 0x88883316 */
+                return MAKE_AD(3, 2, 0, 1, 3, 8, 8, 8, 8);
+        case 24:
+                /* 0x88082219 */
+                return MAKE_AD(4, 0, 1, 2, 2, 0, 8, 8, 8);
+        case 16:
+                /* 0x65053118 */
+                return MAKE_AD(4, 2, 1, 0, 1, 5, 6, 5, 0);
+        default:
+                pr_err("fsl-diu: unsupported pixel depth %u\n", bits_per_pixel);
+                return 0;
+        }
+}
+
+/**
+ * p1022ds_set_gamma_table: update the gamma table, if necessary
+ *
+ * On some boards, the gamma table for some ports may need to be modified.
+ * This is not the case on the P1022DS, so we do nothing.
+*/
+static void p1022ds_set_gamma_table(int monitor_port, char *gamma_table_base)
+{
+}
+
+/**
+ * p1022ds_set_monitor_port: switch the output to a different monitor port
+ *
+ */
+static void p1022ds_set_monitor_port(int monitor_port)
+{
+        struct device_node *pixis_node;
+        u8 __iomem *brdcfg1;
+
+        pixis_node = of_find_compatible_node(NULL, NULL, "fsl,p1022ds-pixis");
+        if (!pixis_node) {
+                pr_err("p1022ds: missing ngPIXIS node\n");
+                return;
+        }
+
+        brdcfg1 = of_iomap(pixis_node, 0);
+        if (!brdcfg1) {
+                pr_err("p1022ds: could not map ngPIXIS registers\n");
+                return;
+        }
+        brdcfg1 += 9;   /* BRDCFG1 is at offset 9 in the ngPIXIS */
+
+        switch (monitor_port) {
+        case 0: /* DVI */
+                /* Enable the DVI port, disable the DFP and the backlight */
+                clrsetbits_8(brdcfg1, PX_BRDCFG1_DFPEN | PX_BRDCFG1_BACKLIGHT,
+                             PX_BRDCFG1_DVIEN);
+                break;
+        case 1: /* Single link LVDS */
+                /* Enable the DFP port, disable the DVI and the backlight */
+                clrsetbits_8(brdcfg1, PX_BRDCFG1_DVIEN | PX_BRDCFG1_BACKLIGHT,
+                             PX_BRDCFG1_DFPEN);
+                break;
+        default:
+                pr_err("p1022ds: unsupported monitor port %i\n", monitor_port);
+        }
+}
+
+/**
+ * p1022ds_set_pixel_clock: program the DIU's clock
+ *
+ * @pixclock: the wavelength, in picoseconds, of the clock
+ */
+void p1022ds_set_pixel_clock(unsigned int pixclock)
+{
+        struct device_node *guts_np = NULL;
+        struct ccsr_guts_85xx __iomem *guts;
+        unsigned long freq;
+        u64 temp;
+        u32 pxclk;
+
+        /* Map the global utilities registers. */
+        guts_np = of_find_compatible_node(NULL, NULL, "fsl,p1022-guts");
+        if (!guts_np) {
+                pr_err("p1022ds: missing global utilties device node\n");
+                return;
+        }
+
+        guts = of_iomap(guts_np, 0);
+        of_node_put(guts_np);
+        if (!guts) {
+                pr_err("p1022ds: could not map global utilties device\n");
+                return;
+        }
+
+        /* Convert pixclock from a wavelength to a frequency */
+        temp = 1000000000000ULL;
+        do_div(temp, pixclock);
+        freq = temp;
+
+        /* pixclk is the ratio of the platform clock to the pixel clock */
+        pxclk = DIV_ROUND_CLOSEST(fsl_get_sys_freq(), freq);
+
+        /* Disable the pixel clock, and set it to non-inverted and no delay */
+        clrbits32(&guts->clkdvdr,
+                  CLKDVDR_PXCKEN | CLKDVDR_PXCKDLY | CLKDVDR_PXCLK_MASK);
+
+        /* Enable the clock and set the pxclk */
+        setbits32(&guts->clkdvdr, CLKDVDR_PXCKEN | (pxclk << 16));
+}
+
+/**
+ * p1022ds_show_monitor_port: show the current monitor
+ *
+ * This function returns a string indicating whether the current monitor is
+ * set to DVI or LVDS.
+ */
+ssize_t p1022ds_show_monitor_port(int monitor_port, char *buf)
+{
+        return sprintf(buf, "%c0 - DVI\n%c1 - Single link LVDS\n",
+                monitor_port == 0 ? '*' : ' ', monitor_port == 1 ? '*' : ' ');
+}
+
+/**
+ * p1022ds_set_sysfs_monitor_port: set the monitor port for sysfs
+ */
+int p1022ds_set_sysfs_monitor_port(int val)
+{
+        return val < 2 ? val : 0;
+}
+
+#endif
 
 void __init p1022_ds_pic_init(void)
 {
@@ -92,6 +290,15 @@ static void __init p1022_ds_setup_arch(void)
         }
 #endif
 
+#if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
+        diu_ops.get_pixel_format        = p1022ds_get_pixel_format;
+        diu_ops.set_gamma_table         = p1022ds_set_gamma_table;
+        diu_ops.set_monitor_port        = p1022ds_set_monitor_port;
+        diu_ops.set_pixel_clock         = p1022ds_set_pixel_clock;
+        diu_ops.show_monitor_port       = p1022ds_show_monitor_port;
+        diu_ops.set_sysfs_monitor_port  = p1022ds_set_sysfs_monitor_port;
+#endif
+
 #ifdef CONFIG_SMP
         mpc85xx_smp_init();
 #endif
@@ -112,6 +319,8 @@ static struct of_device_id __initdata p1022_ds_ids[] = {
         { .compatible = "soc", },
         { .compatible = "simple-bus", },
         { .compatible = "gianfar", },
+        /* So that the DMA channel nodes can be probed individually: */
+        { .compatible = "fsl,eloplus-dma", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/85xx/p3041_ds.c b/arch/powerpc/platforms/85xx/p3041_ds.c
new file mode 100644
index 000000000000..0ed52e18298c
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/p3041_ds.c
@@ -0,0 +1,64 @@
+/*
+ * P3041 DS Setup
+ *
+ * Maintained by Kumar Gala (see MAINTAINERS for contact information)
+ *
+ * Copyright 2009-2010 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/kdev_t.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/phy.h>
+
+#include <asm/system.h>
+#include <asm/time.h>
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <mm/mmu_decl.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <asm/mpic.h>
+
+#include <linux/of_platform.h>
+#include <sysdev/fsl_soc.h>
+#include <sysdev/fsl_pci.h>
+
+#include "corenet_ds.h"
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init p3041_ds_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "fsl,P3041DS");
+}
+
+define_machine(p3041_ds) {
+        .name                   = "P3041 DS",
+        .probe                  = p3041_ds_probe,
+        .setup_arch             = corenet_ds_setup_arch,
+        .init_IRQ               = corenet_ds_pic_init,
+#ifdef CONFIG_PCI
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
+        .get_irq                = mpic_get_coreint_irq,
+        .restart                = fsl_rstcr_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+};
+
+machine_device_initcall(p3041_ds, corenet_ds_publish_devices);
+
+#ifdef CONFIG_SWIOTLB
+machine_arch_initcall(p3041_ds, swiotlb_setup_bus_notifier);
+#endif
diff --git a/arch/powerpc/platforms/85xx/p5020_ds.c b/arch/powerpc/platforms/85xx/p5020_ds.c
new file mode 100644
index 000000000000..7467b712ee00
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/p5020_ds.c
@@ -0,0 +1,69 @@
+/*
+ * P5020 DS Setup
+ *
+ * Maintained by Kumar Gala (see MAINTAINERS for contact information)
+ *
+ * Copyright 2009-2010 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/kdev_t.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/phy.h>
+
+#include <asm/system.h>
+#include <asm/time.h>
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <mm/mmu_decl.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <asm/mpic.h>
+
+#include <linux/of_platform.h>
+#include <sysdev/fsl_soc.h>
+#include <sysdev/fsl_pci.h>
+
+#include "corenet_ds.h"
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init p5020_ds_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "fsl,P5020DS");
+}
+
+define_machine(p5020_ds) {
+        .name                   = "P5020 DS",
+        .probe                  = p5020_ds_probe,
+        .setup_arch             = corenet_ds_setup_arch,
+        .init_IRQ               = corenet_ds_pic_init,
+#ifdef CONFIG_PCI
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
+/* coreint doesn't play nice with lazy EE, use legacy mpic for now */
+#ifdef CONFIG_PPC64
+        .get_irq                = mpic_get_irq,
+#else
+        .get_irq                = mpic_get_coreint_irq,
+#endif
+        .restart                = fsl_rstcr_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+};
+
+machine_device_initcall(p5020_ds, corenet_ds_publish_devices);
+
+#ifdef CONFIG_SWIOTLB
+machine_arch_initcall(p5020_ds, swiotlb_setup_bus_notifier);
+#endif
diff --git a/arch/powerpc/platforms/85xx/sbc8560.c b/arch/powerpc/platforms/85xx/sbc8560.c
index a5ad1c7794bf..d2dfd465fbf6 100644
--- a/arch/powerpc/platforms/85xx/sbc8560.c
+++ b/arch/powerpc/platforms/85xx/sbc8560.c
@@ -41,12 +41,13 @@
 
 static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
 {
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         int cascade_irq;
 
         while ((cascade_irq = cpm2_get_irq()) >= 0)
                 generic_handle_irq(cascade_irq);
 
-        desc->chip->eoi(irq);
+        chip->irq_eoi(&desc->irq_data);
 }
 
 #endif /* CONFIG_CPM2 */
@@ -91,7 +92,7 @@ static void __init sbc8560_pic_init(void)
 
         cpm2_pic_init(np);
         of_node_put(np);
-        set_irq_chained_handler(irq, cpm2_cascade);
+        irq_set_chained_handler(irq, cpm2_cascade);
 #endif
 }
 
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
index a6b106557be4..d6a93a10c0f5 100644
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/of.h>
 #include <linux/kexec.h>
+#include <linux/highmem.h>
 
 #include <asm/machdep.h>
 #include <asm/pgtable.h>
@@ -40,7 +41,7 @@ extern void __early_start(void);
 #define NUM_BOOT_ENTRY          8
 #define SIZE_BOOT_ENTRY         (NUM_BOOT_ENTRY * sizeof(u32))
 
-static void __init
+static int __init
 smp_85xx_kick_cpu(int nr)
 {
         unsigned long flags;
@@ -59,7 +60,7 @@ smp_85xx_kick_cpu(int nr)
 
         if (cpu_rel_addr == NULL) {
                 printk(KERN_ERR "No cpu-release-addr for cpu %d\n", nr);
-                return;
+                return -ENOENT;
         }
 
         /*
@@ -79,6 +80,7 @@ smp_85xx_kick_cpu(int nr)
         local_irq_save(flags);
 
         out_be32(bptr_vaddr + BOOT_ENTRY_PIR, nr);
+#ifdef CONFIG_PPC32
         out_be32(bptr_vaddr + BOOT_ENTRY_ADDR_LOWER, __pa(__early_start));
 
         if (!ioremappable)
@@ -88,6 +90,16 @@ smp_85xx_kick_cpu(int nr)
         /* Wait a bit for the CPU to ack. */
         while ((__secondary_hold_acknowledge != nr) && (++n < 1000))
                 mdelay(1);
+#else
+        smp_generic_kick_cpu(nr);
+
+        out_be64((u64 *)(bptr_vaddr + BOOT_ENTRY_ADDR_UPPER),
+                __pa((u64)*((unsigned long long *) generic_secondary_smp_init)));
+
+        if (!ioremappable)
+                flush_dcache_range((ulong)bptr_vaddr,
+                                (ulong)(bptr_vaddr + SIZE_BOOT_ENTRY));
+#endif
 
         local_irq_restore(flags);
 
@@ -95,6 +107,8 @@ smp_85xx_kick_cpu(int nr)
                 iounmap(bptr_vaddr);
 
         pr_debug("waited %d msecs for CPU #%d.\n", n, nr);
+
+        return 0;
 }
 
 static void __init
@@ -114,19 +128,15 @@ struct smp_ops_t smp_85xx_ops = {
 };
 
 #ifdef CONFIG_KEXEC
-static int kexec_down_cpus = 0;
+atomic_t kexec_down_cpus = ATOMIC_INIT(0);
 
 void mpc85xx_smp_kexec_cpu_down(int crash_shutdown, int secondary)
 {
-        mpic_teardown_this_cpu(1);
-
-        /* When crashing, this gets called on all CPU's we only
-         * take down the non-boot cpus */
-        if (smp_processor_id() != boot_cpuid)
-        {
-                local_irq_disable();
-                kexec_down_cpus++;
+        local_irq_disable();
 
+        if (secondary) {
+                atomic_inc(&kexec_down_cpus);
+                /* loop forever */
                 while (1);
         }
 }
@@ -137,16 +147,65 @@ static void mpc85xx_smp_kexec_down(void *arg)
                 ppc_md.kexec_cpu_down(0,1);
 }
 
-static void mpc85xx_smp_machine_kexec(struct kimage *image)
+static void map_and_flush(unsigned long paddr)
 {
-        int timeout = 2000;
+        struct page *page = pfn_to_page(paddr >> PAGE_SHIFT);
+        unsigned long kaddr  = (unsigned long)kmap(page);
+
+        flush_dcache_range(kaddr, kaddr + PAGE_SIZE);
+        kunmap(page);
+}
+
+/**
+ * Before we reset the other cores, we need to flush relevant cache
+ * out to memory so we don't get anything corrupted, some of these flushes
+ * are performed out of an overabundance of caution as interrupts are not
+ * disabled yet and we can switch cores
+ */
+static void mpc85xx_smp_flush_dcache_kexec(struct kimage *image)
+{
+        kimage_entry_t *ptr, entry;
+        unsigned long paddr;
         int i;
 
-        set_cpus_allowed(current, cpumask_of_cpu(boot_cpuid));
+        if (image->type == KEXEC_TYPE_DEFAULT) {
+                /* normal kexec images are stored in temporary pages */
+                for (ptr = &image->head; (entry = *ptr) && !(entry & IND_DONE);
+                     ptr = (entry & IND_INDIRECTION) ?
+                                phys_to_virt(entry & PAGE_MASK) : ptr + 1) {
+                        if (!(entry & IND_DESTINATION)) {
+                                map_and_flush(entry);
+                        }
+                }
+                /* flush out last IND_DONE page */
+                map_and_flush(entry);
+        } else {
+                /* crash type kexec images are copied to the crash region */
+                for (i = 0; i < image->nr_segments; i++) {
+                        struct kexec_segment *seg = &image->segment[i];
+                        for (paddr = seg->mem; paddr < seg->mem + seg->memsz;
+                             paddr += PAGE_SIZE) {
+                                map_and_flush(paddr);
+                        }
+                }
+        }
+
+        /* also flush the kimage struct to be passed in as well */
+        flush_dcache_range((unsigned long)image,
+                           (unsigned long)image + sizeof(*image));
+}
+
+static void mpc85xx_smp_machine_kexec(struct kimage *image)
+{
+        int timeout = INT_MAX;
+        int i, num_cpus = num_present_cpus();
+
+        mpc85xx_smp_flush_dcache_kexec(image);
 
-        smp_call_function(mpc85xx_smp_kexec_down, NULL, 0);
+        if (image->type == KEXEC_TYPE_DEFAULT)
+                smp_call_function(mpc85xx_smp_kexec_down, NULL, 0);
 
-        while ( (kexec_down_cpus != (num_online_cpus() - 1)) &&
+        while ( (atomic_read(&kexec_down_cpus) != (num_cpus - 1)) &&
                 ( timeout > 0 ) )
         {
                 timeout--;
@@ -155,7 +214,7 @@ static void mpc85xx_smp_machine_kexec(struct kimage *image)
         if ( !timeout )
                 printk(KERN_ERR "Unable to bring down secondary cpu(s)");
 
-        for (i = 0; i < num_present_cpus(); i++)
+        for (i = 0; i < num_cpus; i++)
         {
                 if ( i == smp_processor_id() ) continue;
                 mpic_reset_core(i);
@@ -176,8 +235,10 @@ void __init mpc85xx_smp_init(void)
                 smp_85xx_ops.message_pass = smp_mpic_message_pass;
         }
 
-        if (cpu_has_feature(CPU_FTR_DBELL))
-                smp_85xx_ops.message_pass = doorbell_message_pass;
+        if (cpu_has_feature(CPU_FTR_DBELL)) {
+                smp_85xx_ops.message_pass = smp_muxed_ipi_message_pass;
+                smp_85xx_ops.cause_ipi = doorbell_cause_ipi;
+        }
 
         BUG_ON(!smp_85xx_ops.message_pass);
 
diff --git a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
index d48527ffc425..12cb9bb2cc68 100644
--- a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
+++ b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
@@ -48,8 +48,6 @@ static struct socrates_fpga_irq_info fpga_irqs[SOCRATES_FPGA_NUM_IRQS] = {
         [8] = {0, IRQ_TYPE_LEVEL_HIGH},
 };
 
-#define socrates_fpga_irq_to_hw(virq)    ((unsigned int)irq_map[virq].hwirq)
-
 static DEFINE_RAW_SPINLOCK(socrates_fpga_pic_lock);
 
 static void __iomem *socrates_fpga_pic_iobase;
@@ -93,6 +91,7 @@ static inline unsigned int socrates_fpga_pic_get_irq(unsigned int irq)
 
 void socrates_fpga_pic_cascade(unsigned int irq, struct irq_desc *desc)
 {
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         unsigned int cascade_irq;
 
         /*
@@ -103,18 +102,15 @@ void socrates_fpga_pic_cascade(unsigned int irq, struct irq_desc *desc)
 
         if (cascade_irq != NO_IRQ)
                 generic_handle_irq(cascade_irq);
-        desc->chip->eoi(irq);
-
+        chip->irq_eoi(&desc->irq_data);
 }
 
-static void socrates_fpga_pic_ack(unsigned int virq)
+static void socrates_fpga_pic_ack(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int hwirq, irq_line;
+        unsigned int irq_line, hwirq = irqd_to_hwirq(d);
         uint32_t mask;
 
-        hwirq = socrates_fpga_irq_to_hw(virq);
-
         irq_line = fpga_irqs[hwirq].irq_line;
         raw_spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
         mask = socrates_fpga_pic_read(FPGA_PIC_IRQMASK(irq_line))
@@ -124,15 +120,13 @@ static void socrates_fpga_pic_ack(unsigned int virq)
         raw_spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
 }
 
-static void socrates_fpga_pic_mask(unsigned int virq)
+static void socrates_fpga_pic_mask(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int hwirq;
+        unsigned int hwirq = irqd_to_hwirq(d);
         int irq_line;
         u32 mask;
 
-        hwirq = socrates_fpga_irq_to_hw(virq);
-
         irq_line = fpga_irqs[hwirq].irq_line;
         raw_spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
         mask = socrates_fpga_pic_read(FPGA_PIC_IRQMASK(irq_line))
@@ -142,15 +136,13 @@ static void socrates_fpga_pic_mask(unsigned int virq)
         raw_spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
 }
 
-static void socrates_fpga_pic_mask_ack(unsigned int virq)
+static void socrates_fpga_pic_mask_ack(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int hwirq;
+        unsigned int hwirq = irqd_to_hwirq(d);
         int irq_line;
         u32 mask;
 
-        hwirq = socrates_fpga_irq_to_hw(virq);
-
         irq_line = fpga_irqs[hwirq].irq_line;
         raw_spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
         mask = socrates_fpga_pic_read(FPGA_PIC_IRQMASK(irq_line))
@@ -161,15 +153,13 @@ static void socrates_fpga_pic_mask_ack(unsigned int virq)
         raw_spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
 }
 
-static void socrates_fpga_pic_unmask(unsigned int virq)
+static void socrates_fpga_pic_unmask(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int hwirq;
+        unsigned int hwirq = irqd_to_hwirq(d);
         int irq_line;
         u32 mask;
 
-        hwirq = socrates_fpga_irq_to_hw(virq);
-
         irq_line = fpga_irqs[hwirq].irq_line;
         raw_spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
         mask = socrates_fpga_pic_read(FPGA_PIC_IRQMASK(irq_line))
@@ -179,15 +169,13 @@ static void socrates_fpga_pic_unmask(unsigned int virq)
         raw_spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
 }
 
-static void socrates_fpga_pic_eoi(unsigned int virq)
+static void socrates_fpga_pic_eoi(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int hwirq;
+        unsigned int hwirq = irqd_to_hwirq(d);
         int irq_line;
         u32 mask;
 
-        hwirq = socrates_fpga_irq_to_hw(virq);
-
         irq_line = fpga_irqs[hwirq].irq_line;
         raw_spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
         mask = socrates_fpga_pic_read(FPGA_PIC_IRQMASK(irq_line))
@@ -197,16 +185,14 @@ static void socrates_fpga_pic_eoi(unsigned int virq)
         raw_spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
 }
 
-static int socrates_fpga_pic_set_type(unsigned int virq,
+static int socrates_fpga_pic_set_type(struct irq_data *d,
                 unsigned int flow_type)
 {
         unsigned long flags;
-        unsigned int hwirq;
+        unsigned int hwirq = irqd_to_hwirq(d);
         int polarity;
         u32 mask;
 
-        hwirq = socrates_fpga_irq_to_hw(virq);
-
         if (fpga_irqs[hwirq].type != IRQ_TYPE_NONE)
                 return -EINVAL;
 
@@ -233,21 +219,21 @@ static int socrates_fpga_pic_set_type(unsigned int virq,
 
 static struct irq_chip socrates_fpga_pic_chip = {
         .name           = "FPGA-PIC",
-        .ack            = socrates_fpga_pic_ack,
-        .mask           = socrates_fpga_pic_mask,
-        .mask_ack       = socrates_fpga_pic_mask_ack,
-        .unmask         = socrates_fpga_pic_unmask,
-        .eoi            = socrates_fpga_pic_eoi,
-        .set_type       = socrates_fpga_pic_set_type,
+        .irq_ack        = socrates_fpga_pic_ack,
+        .irq_mask       = socrates_fpga_pic_mask,
+        .irq_mask_ack   = socrates_fpga_pic_mask_ack,
+        .irq_unmask     = socrates_fpga_pic_unmask,
+        .irq_eoi        = socrates_fpga_pic_eoi,
+        .irq_set_type   = socrates_fpga_pic_set_type,
 };
 
 static int socrates_fpga_pic_host_map(struct irq_host *h, unsigned int virq,
                 irq_hw_number_t hwirq)
 {
         /* All interrupts are LEVEL sensitive */
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, &socrates_fpga_pic_chip,
-                        handle_fasteoi_irq);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &socrates_fpga_pic_chip,
+                                 handle_fasteoi_irq);
 
         return 0;
 }
@@ -308,8 +294,8 @@ void socrates_fpga_pic_init(struct device_node *pic)
                         pr_warning("FPGA PIC: can't get irq%d.\n", i);
                         continue;
                 }
-                set_irq_chained_handler(socrates_fpga_irqs[i],
-                                socrates_fpga_pic_cascade);
+                irq_set_chained_handler(socrates_fpga_irqs[i],
+                                        socrates_fpga_pic_cascade);
         }
 
         socrates_fpga_pic_iobase = of_iomap(pic, 0);
diff --git a/arch/powerpc/platforms/85xx/stx_gp3.c b/arch/powerpc/platforms/85xx/stx_gp3.c
index bc33d1859ae7..5387e9f06bdb 100644
--- a/arch/powerpc/platforms/85xx/stx_gp3.c
+++ b/arch/powerpc/platforms/85xx/stx_gp3.c
@@ -46,12 +46,13 @@
 
 static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
 {
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         int cascade_irq;
 
         while ((cascade_irq = cpm2_get_irq()) >= 0)
                 generic_handle_irq(cascade_irq);
 
-        desc->chip->eoi(irq);
+        chip->irq_eoi(&desc->irq_data);
 }
 #endif /* CONFIG_CPM2 */
 
@@ -101,7 +102,7 @@ static void __init stx_gp3_pic_init(void)
 
         cpm2_pic_init(np);
         of_node_put(np);
-        set_irq_chained_handler(irq, cpm2_cascade);
+        irq_set_chained_handler(irq, cpm2_cascade);
 #endif
 }
 
diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c
index 8f29bbce5360..325de772725a 100644
--- a/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -44,12 +44,13 @@
 
 static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
 {
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         int cascade_irq;
 
         while ((cascade_irq = cpm2_get_irq()) >= 0)
                 generic_handle_irq(cascade_irq);
 
-        desc->chip->eoi(irq);
+        chip->irq_eoi(&desc->irq_data);
 }
 #endif /* CONFIG_CPM2 */
 
@@ -99,7 +100,7 @@ static void __init tqm85xx_pic_init(void)
 
         cpm2_pic_init(np);
         of_node_put(np);
-        set_irq_chained_handler(irq, cpm2_cascade);
+        irq_set_chained_handler(irq, cpm2_cascade);
 #endif
 }
 
@@ -186,21 +187,21 @@ static int __init declare_of_platform_devices(void)
 }
 machine_device_initcall(tqm85xx, declare_of_platform_devices);
 
+static const char *board[] __initdata = {
+        "tqc,tqm8540",
+        "tqc,tqm8541",
+        "tqc,tqm8548",
+        "tqc,tqm8555",
+        "tqc,tqm8560",
+        NULL
+};
+
 /*
  * Called very early, device-tree isn't unflattened
  */
 static int __init tqm85xx_probe(void)
 {
-        unsigned long root = of_get_flat_dt_root();
-
-        if ((of_flat_dt_is_compatible(root, "tqc,tqm8540")) ||
-            (of_flat_dt_is_compatible(root, "tqc,tqm8541")) ||
-            (of_flat_dt_is_compatible(root, "tqc,tqm8548")) ||
-            (of_flat_dt_is_compatible(root, "tqc,tqm8555")) ||
-            (of_flat_dt_is_compatible(root, "tqc,tqm8560")))
-                return 1;
-
-        return 0;
+        return of_flat_dt_match(of_get_flat_dt_root(), board);
 }
 
 define_machine(tqm85xx) {
diff --git a/arch/powerpc/platforms/86xx/gef_pic.c b/arch/powerpc/platforms/86xx/gef_pic.c
index 6df9e2561c06..94594e58594c 100644
--- a/arch/powerpc/platforms/86xx/gef_pic.c
+++ b/arch/powerpc/platforms/86xx/gef_pic.c
@@ -46,8 +46,6 @@
 #define GEF_PIC_CPU0_MCP_MASK   GEF_PIC_MCP_MASK(0)
 #define GEF_PIC_CPU1_MCP_MASK   GEF_PIC_MCP_MASK(1)
 
-#define gef_irq_to_hw(virq)    ((unsigned int)irq_map[virq].hwirq)
-
 
 static DEFINE_RAW_SPINLOCK(gef_pic_lock);
 
@@ -95,6 +93,7 @@ static int gef_pic_cascade_irq;
 
 void gef_pic_cascade(unsigned int irq, struct irq_desc *desc)
 {
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         unsigned int cascade_irq;
 
         /*
@@ -106,18 +105,15 @@ void gef_pic_cascade(unsigned int irq, struct irq_desc *desc)
         if (cascade_irq != NO_IRQ)
                 generic_handle_irq(cascade_irq);
 
-        desc->chip->eoi(irq);
-
+        chip->irq_eoi(&desc->irq_data);
 }
 
-static void gef_pic_mask(unsigned int virq)
+static void gef_pic_mask(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int hwirq;
+        unsigned int hwirq = irqd_to_hwirq(d);
         u32 mask;
 
-        hwirq = gef_irq_to_hw(virq);
-
         raw_spin_lock_irqsave(&gef_pic_lock, flags);
         mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0));
         mask &= ~(1 << hwirq);
@@ -125,22 +121,20 @@ static void gef_pic_mask(unsigned int virq)
         raw_spin_unlock_irqrestore(&gef_pic_lock, flags);
 }
 
-static void gef_pic_mask_ack(unsigned int virq)
+static void gef_pic_mask_ack(struct irq_data *d)
 {
         /* Don't think we actually have to do anything to ack an interrupt,
          * we just need to clear down the devices interrupt and it will go away
          */
-        gef_pic_mask(virq);
+        gef_pic_mask(d);
 }
 
-static void gef_pic_unmask(unsigned int virq)
+static void gef_pic_unmask(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int hwirq;
+        unsigned int hwirq = irqd_to_hwirq(d);
         u32 mask;
 
-        hwirq = gef_irq_to_hw(virq);
-
         raw_spin_lock_irqsave(&gef_pic_lock, flags);
         mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0));
         mask |= (1 << hwirq);
@@ -150,9 +144,9 @@ static void gef_pic_unmask(unsigned int virq)
 
 static struct irq_chip gef_pic_chip = {
         .name           = "gefp",
-        .mask           = gef_pic_mask,
-        .mask_ack       = gef_pic_mask_ack,
-        .unmask         = gef_pic_unmask,
+        .irq_mask       = gef_pic_mask,
+        .irq_mask_ack   = gef_pic_mask_ack,
+        .irq_unmask     = gef_pic_unmask,
 };
 
 
@@ -163,8 +157,8 @@ static int gef_pic_host_map(struct irq_host *h, unsigned int virq,
                           irq_hw_number_t hwirq)
 {
         /* All interrupts are LEVEL sensitive */
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, &gef_pic_chip, handle_level_irq);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &gef_pic_chip, handle_level_irq);
 
         return 0;
 }
@@ -225,7 +219,7 @@ void __init gef_pic_init(struct device_node *np)
                 return;
 
         /* Chain with parent controller */
-        set_irq_chained_handler(gef_pic_cascade_irq, gef_pic_cascade);
+        irq_set_chained_handler(gef_pic_cascade_irq, gef_pic_cascade);
 }
 
 /*
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index 018cc67be426..a896511690c2 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -66,7 +66,7 @@ static void __init mpc8610_suspend_init(void)
                 return;
         }
 
-        ret = request_irq(irq, mpc8610_sw9_irq, 0, "sw9/wakeup", NULL);
+        ret = request_irq(irq, mpc8610_sw9_irq, 0, "sw9:wakeup", NULL);
         if (ret) {
                 pr_err("%s: can't request pixis event IRQ: %d\n",
                        __func__, ret);
@@ -105,45 +105,77 @@ machine_device_initcall(mpc86xx_hpcd, mpc8610_declare_of_platform_devices);
 
 #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
 
-static u32 get_busfreq(void)
-{
-        struct device_node *node;
-
-        u32 fs_busfreq = 0;
-        node = of_find_node_by_type(NULL, "cpu");
-        if (node) {
-                unsigned int size;
-                const unsigned int *prop =
-                        of_get_property(node, "bus-frequency", &size);
-                if (prop)
-                        fs_busfreq = *prop;
-                of_node_put(node);
-        };
-        return fs_busfreq;
-}
+/*
+ * DIU Area Descriptor
+ *
+ * The MPC8610 reference manual shows the bits of the AD register in
+ * little-endian order, which causes the BLUE_C field to be split into two
+ * parts. To simplify the definition of the MAKE_AD() macro, we define the
+ * fields in big-endian order and byte-swap the result.
+ *
+ * So even though the registers don't look like they're in the
+ * same bit positions as they are on the P1022, the same value is written to
+ * the AD register on the MPC8610 and on the P1022.
+ */
+#define AD_BYTE_F               0x10000000
+#define AD_ALPHA_C_MASK         0x0E000000
+#define AD_ALPHA_C_SHIFT        25
+#define AD_BLUE_C_MASK          0x01800000
+#define AD_BLUE_C_SHIFT         23
+#define AD_GREEN_C_MASK         0x00600000
+#define AD_GREEN_C_SHIFT        21
+#define AD_RED_C_MASK           0x00180000
+#define AD_RED_C_SHIFT          19
+#define AD_PALETTE              0x00040000
+#define AD_PIXEL_S_MASK         0x00030000
+#define AD_PIXEL_S_SHIFT        16
+#define AD_COMP_3_MASK          0x0000F000
+#define AD_COMP_3_SHIFT         12
+#define AD_COMP_2_MASK          0x00000F00
+#define AD_COMP_2_SHIFT         8
+#define AD_COMP_1_MASK          0x000000F0
+#define AD_COMP_1_SHIFT         4
+#define AD_COMP_0_MASK          0x0000000F
+#define AD_COMP_0_SHIFT         0
+
+#define MAKE_AD(alpha, red, blue, green, size, c0, c1, c2, c3) \
+        cpu_to_le32(AD_BYTE_F | (alpha << AD_ALPHA_C_SHIFT) | \
+        (blue << AD_BLUE_C_SHIFT) | (green << AD_GREEN_C_SHIFT) | \
+        (red << AD_RED_C_SHIFT) | (c3 << AD_COMP_3_SHIFT) | \
+        (c2 << AD_COMP_2_SHIFT) | (c1 << AD_COMP_1_SHIFT) | \
+        (c0 << AD_COMP_0_SHIFT) | (size << AD_PIXEL_S_SHIFT))
 
 unsigned int mpc8610hpcd_get_pixel_format(unsigned int bits_per_pixel,
                                                 int monitor_port)
 {
         static const unsigned long pixelformat[][3] = {
-                {0x88882317, 0x88083218, 0x65052119},
-                {0x88883316, 0x88082219, 0x65053118},
+                {
+                        MAKE_AD(3, 0, 2, 1, 3, 8, 8, 8, 8),
+                        MAKE_AD(4, 2, 0, 1, 2, 8, 8, 8, 0),
+                        MAKE_AD(4, 0, 2, 1, 1, 5, 6, 5, 0)
+                },
+                {
+                        MAKE_AD(3, 2, 0, 1, 3, 8, 8, 8, 8),
+                        MAKE_AD(4, 0, 2, 1, 2, 8, 8, 8, 0),
+                        MAKE_AD(4, 2, 0, 1, 1, 5, 6, 5, 0)
+                },
         };
-        unsigned int pix_fmt, arch_monitor;
+        unsigned int arch_monitor;
 
+        /* The DVI port is mis-wired on revision 1 of this board. */
         arch_monitor = ((*pixis_arch == 0x01) && (monitor_port == 0))? 0 : 1;
-                /* DVI port for board version 0x01 */
-
-        if (bits_per_pixel == 32)
-                pix_fmt = pixelformat[arch_monitor][0];
-        else if (bits_per_pixel == 24)
-                pix_fmt = pixelformat[arch_monitor][1];
-        else if (bits_per_pixel == 16)
-                pix_fmt = pixelformat[arch_monitor][2];
-        else
-                pix_fmt = pixelformat[1][0];
-
-        return pix_fmt;
+
+        switch (bits_per_pixel) {
+        case 32:
+                return pixelformat[arch_monitor][0];
+        case 24:
+                return pixelformat[arch_monitor][1];
+        case 16:
+                return pixelformat[arch_monitor][2];
+        default:
+                pr_err("fsl-diu: unsupported pixel depth %u\n", bits_per_pixel);
+                return 0;
+        }
 }
 
 void mpc8610hpcd_set_gamma_table(int monitor_port, char *gamma_table_base)
@@ -190,8 +222,7 @@ void mpc8610hpcd_set_pixel_clock(unsigned int pixclock)
         }
 
         /* Pixel Clock configuration */
-        pr_debug("DIU: Bus Frequency = %d\n", get_busfreq());
-        speed_ccb = get_busfreq();
+        speed_ccb = fsl_get_sys_freq();
 
         /* Calculate the pixel clock with the smallest error */
         /* calculate the following in steps to avoid overflow */
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_smp.c b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
index eacea0e3fcc8..af09baee22cb 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_smp.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
@@ -56,7 +56,7 @@ smp_86xx_release_core(int nr)
 }
 
 
-static void __init
+static int __init
 smp_86xx_kick_cpu(int nr)
 {
         unsigned int save_vector;
@@ -65,7 +65,7 @@ smp_86xx_kick_cpu(int nr)
         unsigned int *vector = (unsigned int *)(KERNELBASE + 0x100);
 
         if (nr < 0 || nr >= NR_CPUS)
-                return;
+                return -ENOENT;
 
         pr_debug("smp_86xx_kick_cpu: kick CPU #%d\n", nr);
 
@@ -92,6 +92,8 @@ smp_86xx_kick_cpu(int nr)
         local_irq_restore(flags);
 
         pr_debug("wait CPU #%d for %d msecs.\n", nr, n);
+
+        return 0;
 }
 
 
diff --git a/arch/powerpc/platforms/86xx/pic.c b/arch/powerpc/platforms/86xx/pic.c
index 668275d9e668..8ef8960abda6 100644
--- a/arch/powerpc/platforms/86xx/pic.c
+++ b/arch/powerpc/platforms/86xx/pic.c
@@ -19,10 +19,13 @@
 #ifdef CONFIG_PPC_I8259
 static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
 {
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         unsigned int cascade_irq = i8259_irq();
+
         if (cascade_irq != NO_IRQ)
                 generic_handle_irq(cascade_irq);
-        desc->chip->eoi(irq);
+
+        chip->irq_eoi(&desc->irq_data);
 }
 #endif  /* CONFIG_PPC_I8259 */
 
@@ -74,6 +77,6 @@ void __init mpc86xx_init_irq(void)
         i8259_init(cascade_node, 0);
         of_node_put(cascade_node);
 
-        set_irq_chained_handler(cascade_irq, mpc86xx_8259_cascade);
+        irq_set_chained_handler(cascade_irq, mpc86xx_8259_cascade);
 #endif
 }
diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig
index dd35ce081cff..ee56a9ea6a79 100644
--- a/arch/powerpc/platforms/8xx/Kconfig
+++ b/arch/powerpc/platforms/8xx/Kconfig
@@ -49,12 +49,6 @@ config PPC_ADDER875
           This enables support for the Analogue & Micro Adder 875
           board.
 
-config PPC_MGSUVD
-        bool "MGSUVD"
-        select CPM1
-        help
-          This enables support for the Keymile MGSUVD board.
-
 config TQM8XX
         bool "TQM8XX"
         select CPM1
diff --git a/arch/powerpc/platforms/8xx/Makefile b/arch/powerpc/platforms/8xx/Makefile
index a491fe6b94fc..76a81c3350a8 100644
--- a/arch/powerpc/platforms/8xx/Makefile
+++ b/arch/powerpc/platforms/8xx/Makefile
@@ -6,5 +6,4 @@ obj-$(CONFIG_MPC885ADS)   += mpc885ads_setup.o
 obj-$(CONFIG_MPC86XADS)   += mpc86xads_setup.o
 obj-$(CONFIG_PPC_EP88XC)  += ep88xc.o
 obj-$(CONFIG_PPC_ADDER875) += adder875.o
-obj-$(CONFIG_PPC_MGSUVD) += mgsuvd.o
 obj-$(CONFIG_TQM8XX)      += tqm8xx_setup.o
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
index 60168c1f98fe..1e121088826f 100644
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -150,7 +150,7 @@ void __init mpc8xx_calibrate_decr(void)
          */
         cpu = of_find_node_by_type(NULL, "cpu");
         virq= irq_of_parse_and_map(cpu, 0);
-        irq = irq_map[virq].hwirq;
+        irq = virq_to_hw(virq);
 
         sys_tmr2 = immr_map(im_sit);
         out_be16(&sys_tmr2->sit_tbscr, ((1 << (7 - (irq/2))) << 8) |
@@ -218,15 +218,20 @@ void mpc8xx_restart(char *cmd)
 
 static void cpm_cascade(unsigned int irq, struct irq_desc *desc)
 {
+        struct irq_chip *chip;
         int cascade_irq;
 
         if ((cascade_irq = cpm_get_irq()) >= 0) {
                 struct irq_desc *cdesc = irq_to_desc(cascade_irq);
 
                 generic_handle_irq(cascade_irq);
-                cdesc->chip->eoi(cascade_irq);
+
+                chip = irq_desc_get_chip(cdesc);
+                chip->irq_eoi(&cdesc->irq_data);
         }
-        desc->chip->eoi(irq);
+
+        chip = irq_desc_get_chip(desc);
+        chip->irq_eoi(&desc->irq_data);
 }
 
 /* Initialize the internal interrupt controllers.  The number of
@@ -246,5 +251,5 @@ void __init mpc8xx_pics_init(void)
 
         irq = cpm_pic_init();
         if (irq != NO_IRQ)
-                set_irq_chained_handler(irq, cpm_cascade);
+                irq_set_chained_handler(irq, cpm_cascade);
 }
diff --git a/arch/powerpc/platforms/8xx/mgsuvd.c b/arch/powerpc/platforms/8xx/mgsuvd.c
deleted file mode 100644
index ca3cb071772c..000000000000
--- a/arch/powerpc/platforms/8xx/mgsuvd.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *
- * Platform setup for the Keymile mgsuvd board
- *
- * Heiko Schocher <hs@denx.de>
- *
- * Copyright 2008 DENX Software Engineering GmbH
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-
-#include <linux/ioport.h>
-#include <linux/of_platform.h>
-
-#include <asm/io.h>
-#include <asm/machdep.h>
-#include <asm/processor.h>
-#include <asm/cpm1.h>
-#include <asm/prom.h>
-#include <asm/fs_pd.h>
-
-#include "mpc8xx.h"
-
-struct cpm_pin {
-        int port, pin, flags;
-};
-
-static __initdata struct cpm_pin mgsuvd_pins[] = {
-        /* SMC1 */
-        {CPM_PORTB, 24, CPM_PIN_INPUT}, /* RX */
-        {CPM_PORTB, 25, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* TX */
-
-        /* SCC3 */
-        {CPM_PORTA, 10, CPM_PIN_INPUT},
-        {CPM_PORTA, 11, CPM_PIN_INPUT},
-        {CPM_PORTA, 3, CPM_PIN_INPUT},
-        {CPM_PORTA, 2, CPM_PIN_INPUT},
-        {CPM_PORTC, 13, CPM_PIN_INPUT},
-};
-
-static void __init init_ioports(void)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(mgsuvd_pins); i++) {
-                struct cpm_pin *pin = &mgsuvd_pins[i];
-                cpm1_set_pin(pin->port, pin->pin, pin->flags);
-        }
-
-        setbits16(&mpc8xx_immr->im_ioport.iop_pcso, 0x300);
-        cpm1_clk_setup(CPM_CLK_SCC3, CPM_CLK5, CPM_CLK_RX);
-        cpm1_clk_setup(CPM_CLK_SCC3, CPM_CLK6, CPM_CLK_TX);
-        cpm1_clk_setup(CPM_CLK_SMC1, CPM_BRG1, CPM_CLK_RTX);
-}
-
-static void __init mgsuvd_setup_arch(void)
-{
-        cpm_reset();
-        init_ioports();
-}
-
-static __initdata struct of_device_id of_bus_ids[] = {
-        { .compatible = "simple-bus" },
-        {},
-};
-
-static int __init declare_of_platform_devices(void)
-{
-        of_platform_bus_probe(NULL, of_bus_ids, NULL);
-        return 0;
-}
-machine_device_initcall(mgsuvd, declare_of_platform_devices);
-
-static int __init mgsuvd_probe(void)
-{
-        unsigned long root = of_get_flat_dt_root();
-        return of_flat_dt_is_compatible(root, "keymile,mgsuvd");
-}
-
-define_machine(mgsuvd) {
-        .name           = "MGSUVD",
-        .probe          = mgsuvd_probe,
-        .setup_arch     = mgsuvd_setup_arch,
-        .init_IRQ       = mpc8xx_pics_init,
-        .get_irq        = mpc8xx_get_irq,
-        .restart        = mpc8xx_restart,
-        .calibrate_decr = mpc8xx_calibrate_decr,
-        .set_rtc_time   = mpc8xx_set_rtc_time,
-        .get_rtc_time   = mpc8xx_get_rtc_time,
-};
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 81c9208025fa..f970ca2b180c 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -20,6 +20,17 @@ source "arch/powerpc/platforms/embedded6xx/Kconfig"
 source "arch/powerpc/platforms/44x/Kconfig"
 source "arch/powerpc/platforms/40x/Kconfig"
 source "arch/powerpc/platforms/amigaone/Kconfig"
+source "arch/powerpc/platforms/wsp/Kconfig"
+
+config KVM_GUEST
+        bool "KVM Guest support"
+        default y
+        ---help---
+          This option enables various optimizations for running under the KVM
+          hypervisor. Overhead for the kernel when not running inside KVM should
+          be minimal.
+
+          In case of doubt, say Y
 
 config PPC_NATIVE
         bool
@@ -36,7 +47,7 @@ config PPC_OF_BOOT_TRAMPOLINE
         help
           Support from booting from Open Firmware or yaboot using an
           Open Firmware client interface. This enables the kernel to
-          communicate with open firmware to retrieve system informations
+          communicate with open firmware to retrieve system information
           such as the device tree.
 
           In case of doubt, say Y
@@ -46,16 +57,19 @@ config UDBG_RTAS_CONSOLE
         depends on PPC_RTAS
         default n
 
+config PPC_SMP_MUXED_IPI
+        bool
+        help
+          Select this opton if your platform supports SMP and your
+          interrupt controller provides less than 4 interrupts to each
+          cpu.  This will enable the generic code to multiplex the 4
+          messages on to one ipi.
+
 config PPC_UDBG_BEAT
         bool "BEAT based debug console"
         depends on PPC_CELLEB
         default n
 
-config XICS
-        depends on PPC_PSERIES
-        bool
-        default y
-
 config IPIC
         bool
         default n
@@ -137,14 +151,27 @@ config PPC_970_NAP
         bool
         default n
 
+config PPC_P7_NAP
+        bool
+        default n
+
 config PPC_INDIRECT_IO
         bool
         select GENERIC_IOMAP
-        default n
+
+config PPC_INDIRECT_PIO
+        bool
+        select PPC_INDIRECT_IO
+
+config PPC_INDIRECT_MMIO
+        bool
+        select PPC_INDIRECT_IO
+
+config PPC_IO_WORKAROUNDS
+        bool
 
 config GENERIC_IOMAP
         bool
-        default n
 
 source "drivers/cpufreq/Kconfig"
 
@@ -303,13 +330,14 @@ config OF_RTC
 source "arch/powerpc/sysdev/bestcomm/Kconfig"
 
 config MPC8xxx_GPIO
-        bool "MPC8xxx GPIO support"
-        depends on PPC_MPC831x || PPC_MPC834x || PPC_MPC837x || FSL_SOC_BOOKE || PPC_86xx
+        bool "MPC512x/MPC8xxx GPIO support"
+        depends on PPC_MPC512x || PPC_MPC831x || PPC_MPC834x || PPC_MPC837x || \
+                   FSL_SOC_BOOKE || PPC_86xx
         select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         help
           Say Y here if you're going to use hardware that connects to the
-          MPC831x/834x/837x/8572/8610 GPIOs.
+          MPC512x/831x/834x/837x/8572/8610 GPIOs.
 
 config SIMPLE_GPIO
         bool "Support for simple, memory-mapped GPIO controllers"
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index d361f8119b1e..2165b65876f9 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -73,6 +73,7 @@ config PPC_BOOK3S_64
 config PPC_BOOK3E_64
         bool "Embedded processors"
         select PPC_FPU # Make it a choice ?
+        select PPC_SMP_MUXED_IPI
 
 endchoice
 
@@ -107,6 +108,10 @@ config POWER4
         depends on PPC64 && PPC_BOOK3S
         def_bool y
 
+config PPC_A2
+        bool
+        depends on PPC_BOOK3E_64
+
 config TUNE_CELL
         bool "Optimize for Cell Broadband Engine"
         depends on PPC64 && PPC_BOOK3S
@@ -125,6 +130,7 @@ config 8xx
 
 config E500
         select FSL_EMB_PERFMON
+        select PPC_FSL_BOOK3E
         bool
 
 config PPC_E500MC
@@ -166,9 +172,15 @@ config BOOKE
 
 config FSL_BOOKE
         bool
-        depends on E200 || E500
+        depends on (E200 || E500) && PPC32
         default y
 
+# this is for common code between PPC32 & PPC64 FSL BOOKE
+config PPC_FSL_BOOK3E
+        bool
+        select FSL_EMB_PERFMON
+        select PPC_SMP_MUXED_IPI
+        default y if FSL_BOOKE
 
 config PTE_64BIT
         bool
@@ -220,6 +232,24 @@ config VSX
 
           If in doubt, say Y here.
 
+config PPC_ICSWX
+        bool "Support for PowerPC icswx coprocessor instruction"
+        depends on POWER4
+        default n
+        ---help---
+
+          This option enables kernel support for the PowerPC Initiate
+          Coprocessor Store Word (icswx) coprocessor instruction on POWER7
+          or newer processors.
+
+          This option is only useful if you have a processor that supports
+          the icswx coprocessor instruction. It does not have any effect
+          on processors without the icswx coprocessor instruction.
+
+          This option slightly increases kernel memory usage.
+
+          If in doubt, say N here.
+
 config SPE
         bool "SPE Support"
         depends on E200 || (E500 && !PPC_E500MC)
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index fdb9f0b0d7a8..73e2116cfeed 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -22,3 +22,4 @@ obj-$(CONFIG_PPC_CELL)		+= cell/
 obj-$(CONFIG_PPC_PS3)           += ps3/
 obj-$(CONFIG_EMBEDDED6xx)       += embedded6xx/
 obj-$(CONFIG_AMIGAONE)          += amigaone/
+obj-$(CONFIG_PPC_WSP)           += wsp/
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 48cd7d2e1b75..67d5009b4e86 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -6,14 +6,17 @@ config PPC_CELL_COMMON
         bool
         select PPC_CELL
         select PPC_DCR_MMIO
-        select PPC_INDIRECT_IO
+        select PPC_INDIRECT_PIO
+        select PPC_INDIRECT_MMIO
         select PPC_NATIVE
         select PPC_RTAS
+        select IRQ_EDGE_EOI_HANDLER
 
 config PPC_CELL_NATIVE
         bool
         select PPC_CELL_COMMON
         select MPIC
+        select PPC_IO_WORKAROUNDS
         select IBM_NEW_EMAC_EMAC4
         select IBM_NEW_EMAC_RGMII
         select IBM_NEW_EMAC_ZMII #test only
diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index 83fafe922641..a4a89350bcfc 100644
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -1,7 +1,7 @@
 obj-$(CONFIG_PPC_CELL_COMMON)           += cbe_regs.o interrupt.o pervasive.o
 
 obj-$(CONFIG_PPC_CELL_NATIVE)           += iommu.o setup.o spider-pic.o \
-                                           pmu.o io-workarounds.o spider-pci.o
+                                           pmu.o spider-pci.o
 obj-$(CONFIG_CBE_RAS)                   += ras.o
 
 obj-$(CONFIG_CBE_THERM)                 += cbe_thermal.o
@@ -39,11 +39,10 @@ obj-y					+= celleb_setup.o \
                                            celleb_pci.o celleb_scc_epci.o \
                                            celleb_scc_pciex.o \
                                            celleb_scc_uhc.o \
-                                           io-workarounds.o spider-pci.o \
-                                           beat.o beat_htab.o beat_hvCall.o \
-                                           beat_interrupt.o beat_iommu.o
+                                           spider-pci.o beat.o beat_htab.o \
+                                           beat_hvCall.o beat_interrupt.o \
+                                           beat_iommu.o
 
-obj-$(CONFIG_SMP)                       += beat_smp.o
 obj-$(CONFIG_PPC_UDBG_BEAT)             += beat_udbg.o
 obj-$(CONFIG_SERIAL_TXX9)               += celleb_scc_sio.o
 obj-$(CONFIG_SPU_BASE)                  += beat_spu_priv1.o
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index 97085530aa63..ac06903e136a 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -93,7 +93,8 @@ static void msic_dcr_write(struct axon_msic *msic, unsigned int dcr_n, u32 val)
 
 static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct axon_msic *msic = get_irq_data(irq);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        struct axon_msic *msic = irq_get_handler_data(irq);
         u32 write_offset, msi;
         int idx;
         int retry = 0;
@@ -112,7 +113,7 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
                 pr_devel("axon_msi: woff %x roff %x msi %x\n",
                           write_offset, msic->read_offset, msi);
 
-                if (msi < NR_IRQS && irq_map[msi].host == msic->irq_host) {
+                if (msi < NR_IRQS && irq_get_chip_data(msi) == msic) {
                         generic_handle_irq(msi);
                         msic->fifo_virt[idx] = cpu_to_le32(0xffffffff);
                 } else {
@@ -145,7 +146,7 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
                 msic->read_offset &= MSIC_FIFO_SIZE_MASK;
         }
 
-        desc->chip->eoi(irq);
+        chip->irq_eoi(&desc->irq_data);
 }
 
 static struct axon_msic *find_msi_translator(struct pci_dev *dev)
@@ -286,7 +287,7 @@ static int axon_msi_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                 }
                 dev_dbg(&dev->dev, "axon_msi: allocated virq 0x%x\n", virq);
 
-                set_irq_msi(virq, entry);
+                irq_set_msi_desc(virq, entry);
                 msg.data = virq;
                 write_msi_msg(virq, &msg);
         }
@@ -304,22 +305,23 @@ static void axon_msi_teardown_msi_irqs(struct pci_dev *dev)
                 if (entry->irq == NO_IRQ)
                         continue;
 
-                set_irq_msi(entry->irq, NULL);
+                irq_set_msi_desc(entry->irq, NULL);
                 irq_dispose_mapping(entry->irq);
         }
 }
 
 static struct irq_chip msic_irq_chip = {
-        .mask           = mask_msi_irq,
-        .unmask         = unmask_msi_irq,
-        .shutdown       = unmask_msi_irq,
+        .irq_mask       = mask_msi_irq,
+        .irq_unmask     = unmask_msi_irq,
+        .irq_shutdown   = mask_msi_irq,
         .name           = "AXON-MSI",
 };
 
 static int msic_host_map(struct irq_host *h, unsigned int virq,
                          irq_hw_number_t hw)
 {
-        set_irq_chip_and_handler(virq, &msic_irq_chip, handle_simple_irq);
+        irq_set_chip_data(virq, h->host_data);
+        irq_set_chip_and_handler(virq, &msic_irq_chip, handle_simple_irq);
 
         return 0;
 }
@@ -328,7 +330,7 @@ static struct irq_host_ops msic_host_ops = {
         .map    = msic_host_map,
 };
 
-static int axon_msi_shutdown(struct platform_device *device)
+static void axon_msi_shutdown(struct platform_device *device)
 {
         struct axon_msic *msic = dev_get_drvdata(&device->dev);
         u32 tmp;
@@ -338,12 +340,9 @@ static int axon_msi_shutdown(struct platform_device *device)
         tmp  = dcr_read(msic->dcr_host, MSIC_CTRL_REG);
         tmp &= ~MSIC_CTRL_ENABLE & ~MSIC_CTRL_IRQ_ENABLE;
         msic_dcr_write(msic, MSIC_CTRL_REG, tmp);
-
-        return 0;
 }
 
-static int axon_msi_probe(struct platform_device *device,
-                          const struct of_device_id *device_id)
+static int axon_msi_probe(struct platform_device *device)
 {
         struct device_node *dn = device->dev.of_node;
         struct axon_msic *msic;
@@ -402,8 +401,8 @@ static int axon_msi_probe(struct platform_device *device,
 
         msic->irq_host->host_data = msic;
 
-        set_irq_data(virq, msic);
-        set_irq_chained_handler(virq, axon_msi_cascade);
+        irq_set_handler_data(virq, msic);
+        irq_set_chained_handler(virq, axon_msi_cascade);
         pr_devel("axon_msi: irq 0x%x setup for axon_msi\n", virq);
 
         /* Enable the MSIC hardware */
@@ -446,7 +445,7 @@ static const struct of_device_id axon_msi_device_id[] = {
         {}
 };
 
-static struct of_platform_driver axon_msi_driver = {
+static struct platform_driver axon_msi_driver = {
         .probe          = axon_msi_probe,
         .shutdown       = axon_msi_shutdown,
         .driver = {
@@ -458,7 +457,7 @@ static struct of_platform_driver axon_msi_driver = {
 
 static int __init axon_msi_init(void)
 {
-        return of_register_platform_driver(&axon_msi_driver);
+        return platform_driver_register(&axon_msi_driver);
 }
 subsys_initcall(axon_msi_init);
 
diff --git a/arch/powerpc/platforms/cell/beat_interrupt.c b/arch/powerpc/platforms/cell/beat_interrupt.c
index 682af97321a8..55015e1f6939 100644
--- a/arch/powerpc/platforms/cell/beat_interrupt.c
+++ b/arch/powerpc/platforms/cell/beat_interrupt.c
@@ -61,59 +61,59 @@ static inline void beatic_update_irq_mask(unsigned int irq_plug)
                 panic("Failed to set mask IRQ!");
 }
 
-static void beatic_mask_irq(unsigned int irq_plug)
+static void beatic_mask_irq(struct irq_data *d)
 {
         unsigned long flags;
 
         raw_spin_lock_irqsave(&beatic_irq_mask_lock, flags);
-        beatic_irq_mask_enable[irq_plug/64] &= ~(1UL << (63 - (irq_plug%64)));
-        beatic_update_irq_mask(irq_plug);
+        beatic_irq_mask_enable[d->irq/64] &= ~(1UL << (63 - (d->irq%64)));
+        beatic_update_irq_mask(d->irq);
         raw_spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
 }
 
-static void beatic_unmask_irq(unsigned int irq_plug)
+static void beatic_unmask_irq(struct irq_data *d)
 {
         unsigned long flags;
 
         raw_spin_lock_irqsave(&beatic_irq_mask_lock, flags);
-        beatic_irq_mask_enable[irq_plug/64] |= 1UL << (63 - (irq_plug%64));
-        beatic_update_irq_mask(irq_plug);
+        beatic_irq_mask_enable[d->irq/64] |= 1UL << (63 - (d->irq%64));
+        beatic_update_irq_mask(d->irq);
         raw_spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
 }
 
-static void beatic_ack_irq(unsigned int irq_plug)
+static void beatic_ack_irq(struct irq_data *d)
 {
         unsigned long flags;
 
         raw_spin_lock_irqsave(&beatic_irq_mask_lock, flags);
-        beatic_irq_mask_ack[irq_plug/64] &= ~(1UL << (63 - (irq_plug%64)));
-        beatic_update_irq_mask(irq_plug);
+        beatic_irq_mask_ack[d->irq/64] &= ~(1UL << (63 - (d->irq%64)));
+        beatic_update_irq_mask(d->irq);
         raw_spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
 }
 
-static void beatic_end_irq(unsigned int irq_plug)
+static void beatic_end_irq(struct irq_data *d)
 {
         s64 err;
         unsigned long flags;
 
-        err = beat_downcount_of_interrupt(irq_plug);
+        err = beat_downcount_of_interrupt(d->irq);
         if (err != 0) {
                 if ((err & 0xFFFFFFFF) != 0xFFFFFFF5) /* -11: wrong state */
                         panic("Failed to downcount IRQ! Error = %16llx", err);
 
-                printk(KERN_ERR "IRQ over-downcounted, plug %d\n", irq_plug);
+                printk(KERN_ERR "IRQ over-downcounted, plug %d\n", d->irq);
         }
         raw_spin_lock_irqsave(&beatic_irq_mask_lock, flags);
-        beatic_irq_mask_ack[irq_plug/64] |= 1UL << (63 - (irq_plug%64));
-        beatic_update_irq_mask(irq_plug);
+        beatic_irq_mask_ack[d->irq/64] |= 1UL << (63 - (d->irq%64));
+        beatic_update_irq_mask(d->irq);
         raw_spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
 }
 
 static struct irq_chip beatic_pic = {
         .name = "CELL-BEAT",
-        .unmask = beatic_unmask_irq,
-        .mask = beatic_mask_irq,
-        .eoi = beatic_end_irq,
+        .irq_unmask = beatic_unmask_irq,
+        .irq_mask = beatic_mask_irq,
+        .irq_eoi = beatic_end_irq,
 };
 
 /*
@@ -136,29 +136,18 @@ static void beatic_pic_host_unmap(struct irq_host *h, unsigned int virq)
 static int beatic_pic_host_map(struct irq_host *h, unsigned int virq,
                                irq_hw_number_t hw)
 {
-        struct irq_desc *desc = irq_to_desc(virq);
         int64_t err;
 
         err = beat_construct_and_connect_irq_plug(virq, hw);
         if (err < 0)
                 return -EIO;
 
-        desc->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, &beatic_pic, handle_fasteoi_irq);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &beatic_pic, handle_fasteoi_irq);
         return 0;
 }
 
 /*
- * Update binding hardware IRQ number (hw) and Virtuql
- * IRQ number (virq). This is called only once for a given mapping.
- */
-static void beatic_pic_host_remap(struct irq_host *h, unsigned int virq,
-                               irq_hw_number_t hw)
-{
-        beat_construct_and_connect_irq_plug(virq, hw);
-}
-
-/*
  * Translate device-tree interrupt spec to irq_hw_number_t style (ulong),
  * to pass away to irq_create_mapping().
  *
@@ -185,7 +174,6 @@ static int beatic_pic_host_match(struct irq_host *h, struct device_node *np)
 
 static struct irq_host_ops beatic_pic_host_ops = {
         .map = beatic_pic_host_map,
-        .remap = beatic_pic_host_remap,
         .unmap = beatic_pic_host_unmap,
         .xlate = beatic_pic_host_xlate,
         .match = beatic_pic_host_match,
@@ -232,7 +220,7 @@ unsigned int beatic_get_irq(void)
 
         ret = beatic_get_irq_plug();
         if (ret != NO_IRQ)
-                beatic_ack_irq(ret);
+                beatic_ack_irq(irq_get_irq_data(ret));
         return ret;
 }
 
@@ -258,22 +246,6 @@ void __init beatic_init_IRQ(void)
         irq_set_default_host(beatic_host);
 }
 
-#ifdef CONFIG_SMP
-
-/* Nullified to compile with SMP mode */
-void beatic_setup_cpu(int cpu)
-{
-}
-
-void beatic_cause_IPI(int cpu, int mesg)
-{
-}
-
-void beatic_request_IPIs(void)
-{
-}
-#endif /* CONFIG_SMP */
-
 void beatic_deinit_IRQ(void)
 {
         int     i;
diff --git a/arch/powerpc/platforms/cell/beat_interrupt.h b/arch/powerpc/platforms/cell/beat_interrupt.h
index b470fd0051f1..a7e52f91a078 100644
--- a/arch/powerpc/platforms/cell/beat_interrupt.h
+++ b/arch/powerpc/platforms/cell/beat_interrupt.h
@@ -24,9 +24,6 @@
 
 extern void beatic_init_IRQ(void);
 extern unsigned int beatic_get_irq(void);
-extern void beatic_cause_IPI(int cpu, int mesg);
-extern void beatic_request_IPIs(void);
-extern void beatic_setup_cpu(int);
 extern void beatic_deinit_IRQ(void);
 
 #endif
diff --git a/arch/powerpc/platforms/cell/beat_iommu.c b/arch/powerpc/platforms/cell/beat_iommu.c
index beec405eb6f8..3ce685568935 100644
--- a/arch/powerpc/platforms/cell/beat_iommu.c
+++ b/arch/powerpc/platforms/cell/beat_iommu.c
@@ -76,7 +76,7 @@ static void __init celleb_init_direct_mapping(void)
 
 static void celleb_dma_dev_setup(struct device *dev)
 {
-        dev->archdata.dma_ops = get_pci_dma_ops();
+        set_dma_ops(dev, &dma_direct_ops);
         set_dma_offset(dev, celleb_dma_direct_offset);
 }
 
@@ -106,7 +106,6 @@ static struct notifier_block celleb_of_bus_notifier = {
 static int __init celleb_init_iommu(void)
 {
         celleb_init_direct_mapping();
-        set_pci_dma_ops(&dma_direct_ops);
         ppc_md.pci_dma_dev_setup = celleb_pci_dma_dev_setup;
         bus_register_notifier(&platform_bus_type, &celleb_of_bus_notifier);
 
diff --git a/arch/powerpc/platforms/cell/beat_smp.c b/arch/powerpc/platforms/cell/beat_smp.c
deleted file mode 100644
index 26efc204c47f..000000000000
--- a/arch/powerpc/platforms/cell/beat_smp.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * SMP support for Celleb platform. (Incomplete)
- *
- * (C) Copyright 2006 TOSHIBA CORPORATION
- *
- * This code is based on arch/powerpc/platforms/cell/smp.c:
- * Dave Engebretsen, Peter Bergner, and
- * Mike Corrigan {engebret|bergner|mikec}@us.ibm.com
- * Plus various changes from other IBM teams...
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#undef DEBUG
-
-#include <linux/kernel.h>
-#include <linux/smp.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/threads.h>
-#include <linux/cpu.h>
-
-#include <asm/irq.h>
-#include <asm/smp.h>
-#include <asm/machdep.h>
-#include <asm/udbg.h>
-
-#include "beat_interrupt.h"
-
-#ifdef DEBUG
-#define DBG(fmt...) udbg_printf(fmt)
-#else
-#define DBG(fmt...)
-#endif
-
-/*
- * The primary thread of each non-boot processor is recorded here before
- * smp init.
- */
-/* static cpumask_t of_spin_map; */
-
-/**
- * smp_startup_cpu() - start the given cpu
- *
- * At boot time, there is nothing to do for primary threads which were
- * started from Open Firmware.  For anything else, call RTAS with the
- * appropriate start location.
- *
- * Returns:
- *      0       - failure
- *      1       - success
- */
-static inline int __devinit smp_startup_cpu(unsigned int lcpu)
-{
-        return 0;
-}
-
-static void smp_beatic_message_pass(int target, int msg)
-{
-        unsigned int i;
-
-        if (target < NR_CPUS) {
-                beatic_cause_IPI(target, msg);
-        } else {
-                for_each_online_cpu(i) {
-                        if (target == MSG_ALL_BUT_SELF
-                            && i == smp_processor_id())
-                                continue;
-                        beatic_cause_IPI(i, msg);
-                }
-        }
-}
-
-static int __init smp_beatic_probe(void)
-{
-        return cpus_weight(cpu_possible_map);
-}
-
-static void __devinit smp_beatic_setup_cpu(int cpu)
-{
-        beatic_setup_cpu(cpu);
-}
-
-static void __devinit smp_celleb_kick_cpu(int nr)
-{
-        BUG_ON(nr < 0 || nr >= NR_CPUS);
-
-        if (!smp_startup_cpu(nr))
-                return;
-}
-
-static int smp_celleb_cpu_bootable(unsigned int nr)
-{
-        return 1;
-}
-static struct smp_ops_t bpa_beatic_smp_ops = {
-        .message_pass   = smp_beatic_message_pass,
-        .probe          = smp_beatic_probe,
-        .kick_cpu       = smp_celleb_kick_cpu,
-        .setup_cpu      = smp_beatic_setup_cpu,
-        .cpu_bootable   = smp_celleb_cpu_bootable,
-};
-
-/* This is called very early */
-void __init smp_init_celleb(void)
-{
-        DBG(" -> smp_init_celleb()\n");
-
-        smp_ops = &bpa_beatic_smp_ops;
-
-        DBG(" <- smp_init_celleb()\n");
-}
diff --git a/arch/powerpc/platforms/cell/cbe_regs.c b/arch/powerpc/platforms/cell/cbe_regs.c
index dbc338f187a2..f3917e7a5b44 100644
--- a/arch/powerpc/platforms/cell/cbe_regs.c
+++ b/arch/powerpc/platforms/cell/cbe_regs.c
@@ -45,8 +45,8 @@ static struct cbe_thread_map
         unsigned int cbe_id;
 } cbe_thread_map[NR_CPUS];
 
-static cpumask_t cbe_local_mask[MAX_CBE] = { [0 ... MAX_CBE-1] = CPU_MASK_NONE };
-static cpumask_t cbe_first_online_cpu = CPU_MASK_NONE;
+static cpumask_t cbe_local_mask[MAX_CBE] = { [0 ... MAX_CBE-1] = {CPU_BITS_NONE} };
+static cpumask_t cbe_first_online_cpu = { CPU_BITS_NONE };
 
 static struct cbe_regs_map *cbe_find_map(struct device_node *np)
 {
@@ -159,7 +159,8 @@ EXPORT_SYMBOL_GPL(cbe_cpu_to_node);
 
 u32 cbe_node_to_cpu(int node)
 {
-        return find_first_bit( (unsigned long *) &cbe_local_mask[node], sizeof(cpumask_t));
+        return cpumask_first(&cbe_local_mask[node]);
+
 }
 EXPORT_SYMBOL_GPL(cbe_node_to_cpu);
 
@@ -268,9 +269,9 @@ void __init cbe_regs_init(void)
                                 thread->regs = map;
                                 thread->cbe_id = cbe_id;
                                 map->be_node = thread->be_node;
-                                cpu_set(i, cbe_local_mask[cbe_id]);
+                                cpumask_set_cpu(i, &cbe_local_mask[cbe_id]);
                                 if(thread->thread_id == 0)
-                                        cpu_set(i, cbe_first_online_cpu);
+                                        cpumask_set_cpu(i, &cbe_first_online_cpu);
                         }
                 }
 
diff --git a/arch/powerpc/platforms/cell/celleb_pci.c b/arch/powerpc/platforms/cell/celleb_pci.c
index 404d1fc04d59..5822141aa63f 100644
--- a/arch/powerpc/platforms/cell/celleb_pci.c
+++ b/arch/powerpc/platforms/cell/celleb_pci.c
@@ -41,7 +41,6 @@
 #include <asm/pci-bridge.h>
 #include <asm/ppc-pci.h>
 
-#include "io-workarounds.h"
 #include "celleb_pci.h"
 
 #define MAX_PCI_DEVICES    32
@@ -320,7 +319,7 @@ static int __init celleb_setup_fake_pci_device(struct device_node *node,
 
         size = 256;
         config = &private->fake_config[devno][fn];
-        *config = alloc_maybe_bootmem(size, GFP_KERNEL);
+        *config = zalloc_maybe_bootmem(size, GFP_KERNEL);
         if (*config == NULL) {
                 printk(KERN_ERR "PCI: "
                        "not enough memory for fake configuration space\n");
@@ -331,7 +330,7 @@ static int __init celleb_setup_fake_pci_device(struct device_node *node,
 
         size = sizeof(struct celleb_pci_resource);
         res = &private->res[devno][fn];
-        *res = alloc_maybe_bootmem(size, GFP_KERNEL);
+        *res = zalloc_maybe_bootmem(size, GFP_KERNEL);
         if (*res == NULL) {
                 printk(KERN_ERR
                        "PCI: not enough memory for resource data space\n");
@@ -432,7 +431,7 @@ static int __init phb_set_bus_ranges(struct device_node *dev,
 static void __init celleb_alloc_private_mem(struct pci_controller *hose)
 {
         hose->private_data =
-                alloc_maybe_bootmem(sizeof(struct celleb_pci_private),
+                zalloc_maybe_bootmem(sizeof(struct celleb_pci_private),
                         GFP_KERNEL);
 }
 
@@ -469,18 +468,6 @@ static struct of_device_id celleb_phb_match[] __initdata = {
         },
 };
 
-static int __init celleb_io_workaround_init(struct pci_controller *phb,
-                                            struct celleb_phb_spec *phb_spec)
-{
-        if (phb_spec->ops) {
-                iowa_register_bus(phb, phb_spec->ops, phb_spec->iowa_init,
-                                  phb_spec->iowa_data);
-                io_workaround_init();
-        }
-
-        return 0;
-}
-
 int __init celleb_setup_phb(struct pci_controller *phb)
 {
         struct device_node *dev = phb->dn;
@@ -500,7 +487,11 @@ int __init celleb_setup_phb(struct pci_controller *phb)
         if (rc)
                 return 1;
 
-        return celleb_io_workaround_init(phb, phb_spec);
+        if (phb_spec->ops)
+                iowa_register_bus(phb, phb_spec->ops,
+                                  phb_spec->iowa_init,
+                                  phb_spec->iowa_data);
+        return 0;
 }
 
 int celleb_pci_probe_mode(struct pci_bus *bus)
diff --git a/arch/powerpc/platforms/cell/celleb_pci.h b/arch/powerpc/platforms/cell/celleb_pci.h
index 4cba1523ec50..a801fcc5f389 100644
--- a/arch/powerpc/platforms/cell/celleb_pci.h
+++ b/arch/powerpc/platforms/cell/celleb_pci.h
@@ -26,8 +26,9 @@
 #include <asm/pci-bridge.h>
 #include <asm/prom.h>
 #include <asm/ppc-pci.h>
+#include <asm/io-workarounds.h>
 
-#include "io-workarounds.h"
+struct iowa_bus;
 
 struct celleb_phb_spec {
         int (*setup)(struct device_node *, struct pci_controller *);
diff --git a/arch/powerpc/platforms/cell/celleb_setup.c b/arch/powerpc/platforms/cell/celleb_setup.c
index e53845579770..d58d9bae4b9b 100644
--- a/arch/powerpc/platforms/cell/celleb_setup.c
+++ b/arch/powerpc/platforms/cell/celleb_setup.c
@@ -128,10 +128,6 @@ static void __init celleb_setup_arch_beat(void)
         spu_management_ops      = &spu_management_of_ops;
 #endif
 
-#ifdef CONFIG_SMP
-        smp_init_celleb();
-#endif
-
         celleb_setup_arch_common();
 }
 
diff --git a/arch/powerpc/platforms/cell/cpufreq_spudemand.c b/arch/powerpc/platforms/cell/cpufreq_spudemand.c
index 968c1c0b4d5b..d809836bcf5f 100644
--- a/arch/powerpc/platforms/cell/cpufreq_spudemand.c
+++ b/arch/powerpc/platforms/cell/cpufreq_spudemand.c
@@ -39,8 +39,6 @@ struct spu_gov_info_struct {
 };
 static DEFINE_PER_CPU(struct spu_gov_info_struct, spu_gov_info);
 
-static struct workqueue_struct *kspugov_wq;
-
 static int calc_freq(struct spu_gov_info_struct *info)
 {
         int cpu;
@@ -71,14 +69,14 @@ static void spu_gov_work(struct work_struct *work)
         __cpufreq_driver_target(info->policy, target_freq, CPUFREQ_RELATION_H);
 
         delay = usecs_to_jiffies(info->poll_int);
-        queue_delayed_work_on(info->policy->cpu, kspugov_wq, &info->work, delay);
+        schedule_delayed_work_on(info->policy->cpu, &info->work, delay);
 }
 
 static void spu_gov_init_work(struct spu_gov_info_struct *info)
 {
         int delay = usecs_to_jiffies(info->poll_int);
         INIT_DELAYED_WORK_DEFERRABLE(&info->work, spu_gov_work);
-        queue_delayed_work_on(info->policy->cpu, kspugov_wq, &info->work, delay);
+        schedule_delayed_work_on(info->policy->cpu, &info->work, delay);
 }
 
 static void spu_gov_cancel_work(struct spu_gov_info_struct *info)
@@ -152,27 +150,15 @@ static int __init spu_gov_init(void)
 {
         int ret;
 
-        kspugov_wq = create_workqueue("kspugov");
-        if (!kspugov_wq) {
-                printk(KERN_ERR "creation of kspugov failed\n");
-                ret = -EFAULT;
-                goto out;
-        }
-
         ret = cpufreq_register_governor(&spu_governor);
-        if (ret) {
+        if (ret)
                 printk(KERN_ERR "registration of governor failed\n");
-                destroy_workqueue(kspugov_wq);
-                goto out;
-        }
-out:
         return ret;
 }
 
 static void __exit spu_gov_exit(void)
 {
         cpufreq_unregister_governor(&spu_governor);
-        destroy_workqueue(kspugov_wq);
 }
 
 
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index 10eb1a443626..3e4eba603e6b 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -72,15 +72,15 @@ static irq_hw_number_t iic_pending_to_hwnum(struct cbe_iic_pending_bits bits)
                 return (node << IIC_IRQ_NODE_SHIFT) | (class << 4) | unit;
 }
 
-static void iic_mask(unsigned int irq)
+static void iic_mask(struct irq_data *d)
 {
 }
 
-static void iic_unmask(unsigned int irq)
+static void iic_unmask(struct irq_data *d)
 {
 }
 
-static void iic_eoi(unsigned int irq)
+static void iic_eoi(struct irq_data *d)
 {
         struct iic *iic = &__get_cpu_var(cpu_iic);
         out_be64(&iic->regs->prio, iic->eoi_stack[--iic->eoi_ptr]);
@@ -89,19 +89,21 @@ static void iic_eoi(unsigned int irq)
 
 static struct irq_chip iic_chip = {
         .name = "CELL-IIC",
-        .mask = iic_mask,
-        .unmask = iic_unmask,
-        .eoi = iic_eoi,
+        .irq_mask = iic_mask,
+        .irq_unmask = iic_unmask,
+        .irq_eoi = iic_eoi,
 };
 
 
-static void iic_ioexc_eoi(unsigned int irq)
+static void iic_ioexc_eoi(struct irq_data *d)
 {
 }
 
 static void iic_ioexc_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct cbe_iic_regs __iomem *node_iic = (void __iomem *)desc->handler_data;
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        struct cbe_iic_regs __iomem *node_iic =
+                (void __iomem *)irq_desc_get_handler_data(desc);
         unsigned int base = (irq & 0xffffff00) | IIC_IRQ_TYPE_IOEXC;
         unsigned long bits, ack;
         int cascade;
@@ -128,15 +130,15 @@ static void iic_ioexc_cascade(unsigned int irq, struct irq_desc *desc)
                 if (ack)
                         out_be64(&node_iic->iic_is, ack);
         }
-        desc->chip->eoi(irq);
+        chip->irq_eoi(&desc->irq_data);
 }
 
 
 static struct irq_chip iic_ioexc_chip = {
         .name = "CELL-IOEX",
-        .mask = iic_mask,
-        .unmask = iic_unmask,
-        .eoi = iic_ioexc_eoi,
+        .irq_mask = iic_mask,
+        .irq_unmask = iic_unmask,
+        .irq_eoi = iic_ioexc_eoi,
 };
 
 /* Get an IRQ number from the pending state register of the IIC */
@@ -174,14 +176,14 @@ EXPORT_SYMBOL_GPL(iic_get_target_id);
 #ifdef CONFIG_SMP
 
 /* Use the highest interrupt priorities for IPI */
-static inline int iic_ipi_to_irq(int ipi)
+static inline int iic_msg_to_irq(int msg)
 {
-        return IIC_IRQ_TYPE_IPI + 0xf - ipi;
+        return IIC_IRQ_TYPE_IPI + 0xf - msg;
 }
 
-void iic_cause_IPI(int cpu, int mesg)
+void iic_message_pass(int cpu, int msg)
 {
-        out_be64(&per_cpu(cpu_iic, cpu).regs->generate, (0xf - mesg) << 4);
+        out_be64(&per_cpu(cpu_iic, cpu).regs->generate, (0xf - msg) << 4);
 }
 
 struct irq_host *iic_get_irq_host(int node)
@@ -190,38 +192,31 @@ struct irq_host *iic_get_irq_host(int node)
 }
 EXPORT_SYMBOL_GPL(iic_get_irq_host);
 
-static irqreturn_t iic_ipi_action(int irq, void *dev_id)
-{
-        int ipi = (int)(long)dev_id;
-
-        smp_message_recv(ipi);
-
-        return IRQ_HANDLED;
-}
-static void iic_request_ipi(int ipi, const char *name)
+static void iic_request_ipi(int msg)
 {
         int virq;
 
-        virq = irq_create_mapping(iic_host, iic_ipi_to_irq(ipi));
+        virq = irq_create_mapping(iic_host, iic_msg_to_irq(msg));
         if (virq == NO_IRQ) {
                 printk(KERN_ERR
-                       "iic: failed to map IPI %s\n", name);
+                       "iic: failed to map IPI %s\n", smp_ipi_name[msg]);
                 return;
         }
-        if (request_irq(virq, iic_ipi_action, IRQF_DISABLED, name,
-                        (void *)(long)ipi))
-                printk(KERN_ERR
-                       "iic: failed to request IPI %s\n", name);
+
+        /*
+         * If smp_request_message_ipi encounters an error it will notify
+         * the error.  If a message is not needed it will return non-zero.
+         */
+        if (smp_request_message_ipi(virq, msg))
+                irq_dispose_mapping(virq);
 }
 
 void iic_request_IPIs(void)
 {
-        iic_request_ipi(PPC_MSG_CALL_FUNCTION, "IPI-call");
-        iic_request_ipi(PPC_MSG_RESCHEDULE, "IPI-resched");
-        iic_request_ipi(PPC_MSG_CALL_FUNC_SINGLE, "IPI-call-single");
-#ifdef CONFIG_DEBUGGER
-        iic_request_ipi(PPC_MSG_DEBUGGER_BREAK, "IPI-debug");
-#endif /* CONFIG_DEBUGGER */
+        iic_request_ipi(PPC_MSG_CALL_FUNCTION);
+        iic_request_ipi(PPC_MSG_RESCHEDULE);
+        iic_request_ipi(PPC_MSG_CALL_FUNC_SINGLE);
+        iic_request_ipi(PPC_MSG_DEBUGGER_BREAK);
 }
 
 #endif /* CONFIG_SMP */
@@ -233,65 +228,19 @@ static int iic_host_match(struct irq_host *h, struct device_node *node)
                                     "IBM,CBEA-Internal-Interrupt-Controller");
 }
 
-extern int noirqdebug;
-
-static void handle_iic_irq(unsigned int irq, struct irq_desc *desc)
-{
-        raw_spin_lock(&desc->lock);
-
-        desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
-
-        /*
-         * If we're currently running this IRQ, or its disabled,
-         * we shouldn't process the IRQ. Mark it pending, handle
-         * the necessary masking and go out
-         */
-        if (unlikely((desc->status & (IRQ_INPROGRESS | IRQ_DISABLED)) ||
-                    !desc->action)) {
-                desc->status |= IRQ_PENDING;
-                goto out_eoi;
-        }
-
-        kstat_incr_irqs_this_cpu(irq, desc);
-
-        /* Mark the IRQ currently in progress.*/
-        desc->status |= IRQ_INPROGRESS;
-
-        do {
-                struct irqaction *action = desc->action;
-                irqreturn_t action_ret;
-
-                if (unlikely(!action))
-                        goto out_eoi;
-
-                desc->status &= ~IRQ_PENDING;
-                raw_spin_unlock(&desc->lock);
-                action_ret = handle_IRQ_event(irq, action);
-                if (!noirqdebug)
-                        note_interrupt(irq, desc, action_ret);
-                raw_spin_lock(&desc->lock);
-
-        } while ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) == IRQ_PENDING);
-
-        desc->status &= ~IRQ_INPROGRESS;
-out_eoi:
-        desc->chip->eoi(irq);
-        raw_spin_unlock(&desc->lock);
-}
-
 static int iic_host_map(struct irq_host *h, unsigned int virq,
                         irq_hw_number_t hw)
 {
         switch (hw & IIC_IRQ_TYPE_MASK) {
         case IIC_IRQ_TYPE_IPI:
-                set_irq_chip_and_handler(virq, &iic_chip, handle_percpu_irq);
+                irq_set_chip_and_handler(virq, &iic_chip, handle_percpu_irq);
                 break;
         case IIC_IRQ_TYPE_IOEXC:
-                set_irq_chip_and_handler(virq, &iic_ioexc_chip,
-                                         handle_iic_irq);
+                irq_set_chip_and_handler(virq, &iic_ioexc_chip,
+                                         handle_edge_eoi_irq);
                 break;
         default:
-                set_irq_chip_and_handler(virq, &iic_chip, handle_iic_irq);
+                irq_set_chip_and_handler(virq, &iic_chip, handle_edge_eoi_irq);
         }
         return 0;
 }
@@ -408,8 +357,8 @@ static int __init setup_iic(void)
                  * irq_data is a generic pointer that gets passed back
                  * to us later, so the forced cast is fine.
                  */
-                set_irq_data(cascade, (void __force *)node_iic);
-                set_irq_chained_handler(cascade , iic_ioexc_cascade);
+                irq_set_handler_data(cascade, (void __force *)node_iic);
+                irq_set_chained_handler(cascade, iic_ioexc_cascade);
                 out_be64(&node_iic->iic_ir,
                          (1 << 12)              /* priority */ |
                          (node << 4)            /* dest node */ |
diff --git a/arch/powerpc/platforms/cell/interrupt.h b/arch/powerpc/platforms/cell/interrupt.h
index 942dc39d6045..4f60ae6ca358 100644
--- a/arch/powerpc/platforms/cell/interrupt.h
+++ b/arch/powerpc/platforms/cell/interrupt.h
@@ -75,7 +75,7 @@ enum {
 };
 
 extern void iic_init_IRQ(void);
-extern void iic_cause_IPI(int cpu, int mesg);
+extern void iic_message_pass(int cpu, int msg);
 extern void iic_request_IPIs(void);
 extern void iic_setup_cpu(void);
 
diff --git a/arch/powerpc/platforms/cell/io-workarounds.c b/arch/powerpc/platforms/cell/io-workarounds.c
deleted file mode 100644
index 5c1118e31940..000000000000
--- a/arch/powerpc/platforms/cell/io-workarounds.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Support PCI IO workaround
- *
- *  Copyright (C) 2006 Benjamin Herrenschmidt <benh@kernel.crashing.org>
- *                     IBM, Corp.
- *  (C) Copyright 2007-2008 TOSHIBA CORPORATION
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#undef DEBUG
-
-#include <linux/kernel.h>
-
-#include <asm/io.h>
-#include <asm/machdep.h>
-#include <asm/pgtable.h>
-#include <asm/ppc-pci.h>
-
-#include "io-workarounds.h"
-
-#define IOWA_MAX_BUS    8
-
-static struct iowa_bus iowa_busses[IOWA_MAX_BUS];
-static unsigned int iowa_bus_count;
-
-static struct iowa_bus *iowa_pci_find(unsigned long vaddr, unsigned long paddr)
-{
-        int i, j;
-        struct resource *res;
-        unsigned long vstart, vend;
-
-        for (i = 0; i < iowa_bus_count; i++) {
-                struct iowa_bus *bus = &iowa_busses[i];
-                struct pci_controller *phb = bus->phb;
-
-                if (vaddr) {
-                        vstart = (unsigned long)phb->io_base_virt;
-                        vend = vstart + phb->pci_io_size - 1;
-                        if ((vaddr >= vstart) && (vaddr <= vend))
-                                return bus;
-                }
-
-                if (paddr)
-                        for (j = 0; j < 3; j++) {
-                                res = &phb->mem_resources[j];
-                                if (paddr >= res->start && paddr <= res->end)
-                                        return bus;
-                        }
-        }
-
-        return NULL;
-}
-
-struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR addr)
-{
-        struct iowa_bus *bus;
-        int token;
-
-        token = PCI_GET_ADDR_TOKEN(addr);
-
-        if (token && token <= iowa_bus_count)
-                bus = &iowa_busses[token - 1];
-        else {
-                unsigned long vaddr, paddr;
-                pte_t *ptep;
-
-                vaddr = (unsigned long)PCI_FIX_ADDR(addr);
-                if (vaddr < PHB_IO_BASE || vaddr >= PHB_IO_END)
-                        return NULL;
-
-                ptep = find_linux_pte(init_mm.pgd, vaddr);
-                if (ptep == NULL)
-                        paddr = 0;
-                else
-                        paddr = pte_pfn(*ptep) << PAGE_SHIFT;
-                bus = iowa_pci_find(vaddr, paddr);
-
-                if (bus == NULL)
-                        return NULL;
-        }
-
-        return bus;
-}
-
-struct iowa_bus *iowa_pio_find_bus(unsigned long port)
-{
-        unsigned long vaddr = (unsigned long)pci_io_base + port;
-        return iowa_pci_find(vaddr, 0);
-}
-
-
-#define DEF_PCI_AC_RET(name, ret, at, al, space, aa)            \
-static ret iowa_##name at                                       \
-{                                                               \
-        struct iowa_bus *bus;                                   \
-        bus = iowa_##space##_find_bus(aa);                      \
-        if (bus && bus->ops && bus->ops->name)                  \
-                return bus->ops->name al;                       \
-        return __do_##name al;                                  \
-}
-
-#define DEF_PCI_AC_NORET(name, at, al, space, aa)               \
-static void iowa_##name at                                      \
-{                                                               \
-        struct iowa_bus *bus;                                   \
-        bus = iowa_##space##_find_bus(aa);                      \
-        if (bus && bus->ops && bus->ops->name) {                \
-                bus->ops->name al;                              \
-                return;                                         \
-        }                                                       \
-        __do_##name al;                                         \
-}
-
-#include <asm/io-defs.h>
-
-#undef DEF_PCI_AC_RET
-#undef DEF_PCI_AC_NORET
-
-static const struct ppc_pci_io __devinitconst iowa_pci_io = {
-
-#define DEF_PCI_AC_RET(name, ret, at, al, space, aa)    .name = iowa_##name,
-#define DEF_PCI_AC_NORET(name, at, al, space, aa)       .name = iowa_##name,
-
-#include <asm/io-defs.h>
-
-#undef DEF_PCI_AC_RET
-#undef DEF_PCI_AC_NORET
-
-};
-
-static void __iomem *iowa_ioremap(phys_addr_t addr, unsigned long size,
-                                  unsigned long flags, void *caller)
-{
-        struct iowa_bus *bus;
-        void __iomem *res = __ioremap_caller(addr, size, flags, caller);
-        int busno;
-
-        bus = iowa_pci_find(0, (unsigned long)addr);
-        if (bus != NULL) {
-                busno = bus - iowa_busses;
-                PCI_SET_ADDR_TOKEN(res, busno + 1);
-        }
-        return res;
-}
-
-/* Regist new bus to support workaround */
-void __devinit iowa_register_bus(struct pci_controller *phb,
-                        struct ppc_pci_io *ops,
-                        int (*initfunc)(struct iowa_bus *, void *), void *data)
-{
-        struct iowa_bus *bus;
-        struct device_node *np = phb->dn;
-
-        if (iowa_bus_count >= IOWA_MAX_BUS) {
-                pr_err("IOWA:Too many pci bridges, "
-                       "workarounds disabled for %s\n", np->full_name);
-                return;
-        }
-
-        bus = &iowa_busses[iowa_bus_count];
-        bus->phb = phb;
-        bus->ops = ops;
-
-        if (initfunc)
-                if ((*initfunc)(bus, data))
-                        return;
-
-        iowa_bus_count++;
-
-        pr_debug("IOWA:[%d]Add bus, %s.\n", iowa_bus_count-1, np->full_name);
-}
-
-/* enable IO workaround */
-void __devinit io_workaround_init(void)
-{
-        static int io_workaround_inited;
-
-        if (io_workaround_inited)
-                return;
-        ppc_pci_io = iowa_pci_io;
-        ppc_md.ioremap = iowa_ioremap;
-        io_workaround_inited = 1;
-}
diff --git a/arch/powerpc/platforms/cell/io-workarounds.h b/arch/powerpc/platforms/cell/io-workarounds.h
deleted file mode 100644
index 6efc7782ebf2..000000000000
--- a/arch/powerpc/platforms/cell/io-workarounds.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Support PCI IO workaround
- *
- * (C) Copyright 2007-2008 TOSHIBA CORPORATION
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef _IO_WORKAROUNDS_H
-#define _IO_WORKAROUNDS_H
-
-#include <linux/io.h>
-#include <asm/pci-bridge.h>
-
-/* Bus info */
-struct iowa_bus {
-        struct pci_controller *phb;
-        struct ppc_pci_io *ops;
-        void   *private;
-};
-
-void __devinit io_workaround_init(void);
-void __devinit iowa_register_bus(struct pci_controller *, struct ppc_pci_io *,
-                                 int (*)(struct iowa_bus *, void *), void *);
-struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR);
-struct iowa_bus *iowa_pio_find_bus(unsigned long);
-
-extern struct ppc_pci_io spiderpci_ops;
-extern int spiderpci_iowa_init(struct iowa_bus *, void *);
-
-#define SPIDER_PCI_REG_BASE             0xd000
-#define SPIDER_PCI_REG_SIZE             0x1000
-#define SPIDER_PCI_VCI_CNTL_STAT        0x0110
-#define SPIDER_PCI_DUMMY_READ           0x0810
-#define SPIDER_PCI_DUMMY_READ_BASE      0x0814
-
-#endif /* _IO_WORKAROUNDS_H */
diff --git a/arch/powerpc/platforms/cell/qpace_setup.c b/arch/powerpc/platforms/cell/qpace_setup.c
index 1b5749042756..51e290126bc1 100644
--- a/arch/powerpc/platforms/cell/qpace_setup.c
+++ b/arch/powerpc/platforms/cell/qpace_setup.c
@@ -42,7 +42,6 @@
 #include "interrupt.h"
 #include "pervasive.h"
 #include "ras.h"
-#include "io-workarounds.h"
 
 static void qpace_show_cpuinfo(struct seq_file *m)
 {
@@ -145,9 +144,4 @@ define_machine(qpace) {
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = qpace_progress,
         .init_IRQ               = iic_init_IRQ,
-#ifdef CONFIG_KEXEC
-        .machine_kexec          = default_machine_kexec,
-        .machine_kexec_prepare  = default_machine_kexec_prepare,
-        .machine_crash_shutdown = default_machine_crash_shutdown,
-#endif
 };
diff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c
index 1d3c4effea10..5ec1e47a0d77 100644
--- a/arch/powerpc/platforms/cell/ras.c
+++ b/arch/powerpc/platforms/cell/ras.c
@@ -173,8 +173,10 @@ static int __init cbe_ptcal_enable(void)
                 return -ENODEV;
 
         size = of_get_property(np, "ibm,cbe-ptcal-size", NULL);
-        if (!size)
+        if (!size) {
+                of_node_put(np);
                 return -ENODEV;
+        }
 
         pr_debug("%s: enabling PTCAL, size = 0x%x\n", __func__, *size);
         order = get_order(*size);
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index 691995761b3d..c73cf4c43fc2 100644
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -51,11 +51,11 @@
 #include <asm/udbg.h>
 #include <asm/mpic.h>
 #include <asm/cell-regs.h>
+#include <asm/io-workarounds.h>
 
 #include "interrupt.h"
 #include "pervasive.h"
 #include "ras.h"
-#include "io-workarounds.h"
 
 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)
@@ -136,8 +136,6 @@ static int __devinit cell_setup_phb(struct pci_controller *phb)
 
         iowa_register_bus(phb, &spiderpci_ops, &spiderpci_iowa_init,
                                   (void *)SPIDER_PCI_REG_BASE);
-        io_workaround_init();
-
         return 0;
 }
 
@@ -187,13 +185,15 @@ machine_subsys_initcall(cell, cell_publish_devices);
 
 static void cell_mpic_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct mpic *mpic = desc->handler_data;
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        struct mpic *mpic = irq_desc_get_handler_data(desc);
         unsigned int virq;
 
         virq = mpic_get_one_irq(mpic);
         if (virq != NO_IRQ)
                 generic_handle_irq(virq);
-        desc->chip->eoi(irq);
+
+        chip->irq_eoi(&desc->irq_data);
 }
 
 static void __init mpic_init_IRQ(void)
@@ -221,8 +221,8 @@ static void __init mpic_init_IRQ(void)
 
                 printk(KERN_INFO "%s : hooking up to IRQ %d\n",
                        dn->full_name, virq);
-                set_irq_data(virq, mpic);
-                set_irq_chained_handler(virq, cell_mpic_cascade);
+                irq_set_handler_data(virq, mpic);
+                irq_set_chained_handler(virq, cell_mpic_cascade);
         }
 }
 
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c
index f774530075b7..dbb641ea90dd 100644
--- a/arch/powerpc/platforms/cell/smp.c
+++ b/arch/powerpc/platforms/cell/smp.c
@@ -77,7 +77,7 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
         unsigned int pcpu;
         int start_cpu;
 
-        if (cpu_isset(lcpu, of_spin_map))
+        if (cpumask_test_cpu(lcpu, &of_spin_map))
                 /* Already started by OF and sitting in spin loop */
                 return 1;
 
@@ -103,27 +103,11 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
         return 1;
 }
 
-static void smp_iic_message_pass(int target, int msg)
-{
-        unsigned int i;
-
-        if (target < NR_CPUS) {
-                iic_cause_IPI(target, msg);
-        } else {
-                for_each_online_cpu(i) {
-                        if (target == MSG_ALL_BUT_SELF
-                            && i == smp_processor_id())
-                                continue;
-                        iic_cause_IPI(i, msg);
-                }
-        }
-}
-
 static int __init smp_iic_probe(void)
 {
         iic_request_IPIs();
 
-        return cpus_weight(cpu_possible_map);
+        return cpumask_weight(cpu_possible_mask);
 }
 
 static void __devinit smp_cell_setup_cpu(int cpu)
@@ -137,12 +121,12 @@ static void __devinit smp_cell_setup_cpu(int cpu)
         mtspr(SPRN_DABRX, DABRX_KERNEL | DABRX_USER);
 }
 
-static void __devinit smp_cell_kick_cpu(int nr)
+static int __devinit smp_cell_kick_cpu(int nr)
 {
         BUG_ON(nr < 0 || nr >= NR_CPUS);
 
         if (!smp_startup_cpu(nr))
-                return;
+                return -ENOENT;
 
         /*
          * The processor is currently spinning, waiting for the
@@ -150,6 +134,8 @@ static void __devinit smp_cell_kick_cpu(int nr)
          * the processor will continue on to secondary_start
          */
         paca[nr].cpu_start = 1;
+
+        return 0;
 }
 
 static int smp_cell_cpu_bootable(unsigned int nr)
@@ -166,7 +152,7 @@ static int smp_cell_cpu_bootable(unsigned int nr)
         return 1;
 }
 static struct smp_ops_t bpa_iic_smp_ops = {
-        .message_pass   = smp_iic_message_pass,
+        .message_pass   = iic_message_pass,
         .probe          = smp_iic_probe,
         .kick_cpu       = smp_cell_kick_cpu,
         .setup_cpu      = smp_cell_setup_cpu,
@@ -186,13 +172,12 @@ void __init smp_init_cell(void)
         if (cpu_has_feature(CPU_FTR_SMT)) {
                 for_each_present_cpu(i) {
                         if (cpu_thread_in_core(i) == 0)
-                                cpu_set(i, of_spin_map);
+                                cpumask_set_cpu(i, &of_spin_map);
                 }
-        } else {
-                of_spin_map = cpu_present_map;
-        }
+        } else
+                cpumask_copy(&of_spin_map, cpu_present_mask);
 
-        cpu_clear(boot_cpuid, of_spin_map);
+        cpumask_clear_cpu(boot_cpuid, &of_spin_map);
 
         /* Non-lpar has additional take/give timebase */
         if (rtas_token("freeze-time-base") != RTAS_UNKNOWN_SERVICE) {
diff --git a/arch/powerpc/platforms/cell/spider-pci.c b/arch/powerpc/platforms/cell/spider-pci.c
index ca7731c0b595..f1f7878893f3 100644
--- a/arch/powerpc/platforms/cell/spider-pci.c
+++ b/arch/powerpc/platforms/cell/spider-pci.c
@@ -27,8 +27,7 @@
 
 #include <asm/ppc-pci.h>
 #include <asm/pci-bridge.h>
-
-#include "io-workarounds.h"
+#include <asm/io-workarounds.h>
 
 #define SPIDER_PCI_DISABLE_PREFETCH
 
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
index 5876e888e412..442c28c00f88 100644
--- a/arch/powerpc/platforms/cell/spider-pic.c
+++ b/arch/powerpc/platforms/cell/spider-pic.c
@@ -68,9 +68,9 @@ struct spider_pic {
 };
 static struct spider_pic spider_pics[SPIDER_CHIP_COUNT];
 
-static struct spider_pic *spider_virq_to_pic(unsigned int virq)
+static struct spider_pic *spider_irq_data_to_pic(struct irq_data *d)
 {
-        return irq_map[virq].host->host_data;
+        return irq_data_get_irq_chip_data(d);
 }
 
 static void __iomem *spider_get_irq_config(struct spider_pic *pic,
@@ -79,30 +79,30 @@ static void __iomem *spider_get_irq_config(struct spider_pic *pic,
         return pic->regs + TIR_CFGA + 8 * src;
 }
 
-static void spider_unmask_irq(unsigned int virq)
+static void spider_unmask_irq(struct irq_data *d)
 {
-        struct spider_pic *pic = spider_virq_to_pic(virq);
-        void __iomem *cfg = spider_get_irq_config(pic, irq_map[virq].hwirq);
+        struct spider_pic *pic = spider_irq_data_to_pic(d);
+        void __iomem *cfg = spider_get_irq_config(pic, irqd_to_hwirq(d));
 
         out_be32(cfg, in_be32(cfg) | 0x30000000u);
 }
 
-static void spider_mask_irq(unsigned int virq)
+static void spider_mask_irq(struct irq_data *d)
 {
-        struct spider_pic *pic = spider_virq_to_pic(virq);
-        void __iomem *cfg = spider_get_irq_config(pic, irq_map[virq].hwirq);
+        struct spider_pic *pic = spider_irq_data_to_pic(d);
+        void __iomem *cfg = spider_get_irq_config(pic, irqd_to_hwirq(d));
 
         out_be32(cfg, in_be32(cfg) & ~0x30000000u);
 }
 
-static void spider_ack_irq(unsigned int virq)
+static void spider_ack_irq(struct irq_data *d)
 {
-        struct spider_pic *pic = spider_virq_to_pic(virq);
-        unsigned int src = irq_map[virq].hwirq;
+        struct spider_pic *pic = spider_irq_data_to_pic(d);
+        unsigned int src = irqd_to_hwirq(d);
 
         /* Reset edge detection logic if necessary
          */
-        if (irq_to_desc(virq)->status & IRQ_LEVEL)
+        if (irqd_is_level_type(d))
                 return;
 
         /* Only interrupts 47 to 50 can be set to edge */
@@ -113,13 +113,12 @@ static void spider_ack_irq(unsigned int virq)
         out_be32(pic->regs + TIR_EDC, 0x100 | (src & 0xf));
 }
 
-static int spider_set_irq_type(unsigned int virq, unsigned int type)
+static int spider_set_irq_type(struct irq_data *d, unsigned int type)
 {
         unsigned int sense = type & IRQ_TYPE_SENSE_MASK;
-        struct spider_pic *pic = spider_virq_to_pic(virq);
-        unsigned int hw = irq_map[virq].hwirq;
+        struct spider_pic *pic = spider_irq_data_to_pic(d);
+        unsigned int hw = irqd_to_hwirq(d);
         void __iomem *cfg = spider_get_irq_config(pic, hw);
-        struct irq_desc *desc = irq_to_desc(virq);
         u32 old_mask;
         u32 ic;
 
@@ -147,12 +146,6 @@ static int spider_set_irq_type(unsigned int virq, unsigned int type)
                 return -EINVAL;
         }
 
-        /* Update irq_desc */
-        desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
-        desc->status |= type & IRQ_TYPE_SENSE_MASK;
-        if (type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))
-                desc->status |= IRQ_LEVEL;
-
         /* Configure the source. One gross hack that was there before and
          * that I've kept around is the priority to the BE which I set to
          * be the same as the interrupt source number. I don't know wether
@@ -169,19 +162,20 @@ static int spider_set_irq_type(unsigned int virq, unsigned int type)
 
 static struct irq_chip spider_pic = {
         .name = "SPIDER",
-        .unmask = spider_unmask_irq,
-        .mask = spider_mask_irq,
-        .ack = spider_ack_irq,
-        .set_type = spider_set_irq_type,
+        .irq_unmask = spider_unmask_irq,
+        .irq_mask = spider_mask_irq,
+        .irq_ack = spider_ack_irq,
+        .irq_set_type = spider_set_irq_type,
 };
 
 static int spider_host_map(struct irq_host *h, unsigned int virq,
                         irq_hw_number_t hw)
 {
-        set_irq_chip_and_handler(virq, &spider_pic, handle_level_irq);
+        irq_set_chip_data(virq, h->host_data);
+        irq_set_chip_and_handler(virq, &spider_pic, handle_level_irq);
 
         /* Set default irq type */
-        set_irq_type(virq, IRQ_TYPE_NONE);
+        irq_set_irq_type(virq, IRQ_TYPE_NONE);
 
         return 0;
 }
@@ -207,7 +201,8 @@ static struct irq_host_ops spider_host_ops = {
 
 static void spider_irq_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct spider_pic *pic = desc->handler_data;
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        struct spider_pic *pic = irq_desc_get_handler_data(desc);
         unsigned int cs, virq;
 
         cs = in_be32(pic->regs + TIR_CS) >> 24;
@@ -215,9 +210,11 @@ static void spider_irq_cascade(unsigned int irq, struct irq_desc *desc)
                 virq = NO_IRQ;
         else
                 virq = irq_linear_revmap(pic->host, cs);
+
         if (virq != NO_IRQ)
                 generic_handle_irq(virq);
-        desc->chip->eoi(irq);
+
+        chip->irq_eoi(&desc->irq_data);
 }
 
 /* For hooking up the cascace we have a problem. Our device-tree is
@@ -258,8 +255,10 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic)
                 return NO_IRQ;
         imap += intsize + 1;
         tmp = of_get_property(iic, "#interrupt-cells", NULL);
-        if (tmp == NULL)
+        if (tmp == NULL) {
+                of_node_put(iic);
                 return NO_IRQ;
+        }
         intsize = *tmp;
         /* Assume unit is last entry of interrupt specifier */
         unit = imap[intsize - 1];
@@ -323,8 +322,8 @@ static void __init spider_init_one(struct device_node *of_node, int chip,
         virq = spider_find_cascade_and_node(pic);
         if (virq == NO_IRQ)
                 return;
-        set_irq_data(virq, pic);
-        set_irq_chained_handler(virq, spider_irq_cascade);
+        irq_set_handler_data(virq, pic);
+        irq_set_chained_handler(virq, spider_irq_cascade);
 
         printk(KERN_INFO "spider_pic: node %d, addr: 0x%lx %s\n",
                pic->node_id, addr, of_node->full_name);
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index 8547e86bfb42..3675da73623f 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -32,11 +32,13 @@
 #include <linux/io.h>
 #include <linux/mutex.h>
 #include <linux/linux_logo.h>
+#include <linux/syscore_ops.h>
 #include <asm/spu.h>
 #include <asm/spu_priv1.h>
 #include <asm/spu_csa.h>
 #include <asm/xmon.h>
 #include <asm/prom.h>
+#include <asm/kexec.h>
 
 const struct spu_management_ops *spu_management_ops;
 EXPORT_SYMBOL_GPL(spu_management_ops);
@@ -520,18 +522,8 @@ void spu_init_channels(struct spu *spu)
 }
 EXPORT_SYMBOL_GPL(spu_init_channels);
 
-static int spu_shutdown(struct sys_device *sysdev)
-{
-        struct spu *spu = container_of(sysdev, struct spu, sysdev);
-
-        spu_free_irqs(spu);
-        spu_destroy_spu(spu);
-        return 0;
-}
-
 static struct sysdev_class spu_sysdev_class = {
         .name = "spu",
-        .shutdown = spu_shutdown,
 };
 
 int spu_add_sysdev_attr(struct sysdev_attribute *attr)
@@ -727,6 +719,91 @@ static ssize_t spu_stat_show(struct sys_device *sysdev,
 
 static SYSDEV_ATTR(stat, 0644, spu_stat_show, NULL);
 
+#ifdef CONFIG_KEXEC
+
+struct crash_spu_info {
+        struct spu *spu;
+        u32 saved_spu_runcntl_RW;
+        u32 saved_spu_status_R;
+        u32 saved_spu_npc_RW;
+        u64 saved_mfc_sr1_RW;
+        u64 saved_mfc_dar;
+        u64 saved_mfc_dsisr;
+};
+
+#define CRASH_NUM_SPUS  16      /* Enough for current hardware */
+static struct crash_spu_info crash_spu_info[CRASH_NUM_SPUS];
+
+static void crash_kexec_stop_spus(void)
+{
+        struct spu *spu;
+        int i;
+        u64 tmp;
+
+        for (i = 0; i < CRASH_NUM_SPUS; i++) {
+                if (!crash_spu_info[i].spu)
+                        continue;
+
+                spu = crash_spu_info[i].spu;
+
+                crash_spu_info[i].saved_spu_runcntl_RW =
+                        in_be32(&spu->problem->spu_runcntl_RW);
+                crash_spu_info[i].saved_spu_status_R =
+                        in_be32(&spu->problem->spu_status_R);
+                crash_spu_info[i].saved_spu_npc_RW =
+                        in_be32(&spu->problem->spu_npc_RW);
+
+                crash_spu_info[i].saved_mfc_dar    = spu_mfc_dar_get(spu);
+                crash_spu_info[i].saved_mfc_dsisr  = spu_mfc_dsisr_get(spu);
+                tmp = spu_mfc_sr1_get(spu);
+                crash_spu_info[i].saved_mfc_sr1_RW = tmp;
+
+                tmp &= ~MFC_STATE1_MASTER_RUN_CONTROL_MASK;
+                spu_mfc_sr1_set(spu, tmp);
+
+                __delay(200);
+        }
+}
+
+static void crash_register_spus(struct list_head *list)
+{
+        struct spu *spu;
+        int ret;
+
+        list_for_each_entry(spu, list, full_list) {
+                if (WARN_ON(spu->number >= CRASH_NUM_SPUS))
+                        continue;
+
+                crash_spu_info[spu->number].spu = spu;
+        }
+
+        ret = crash_shutdown_register(&crash_kexec_stop_spus);
+        if (ret)
+                printk(KERN_ERR "Could not register SPU crash handler");
+}
+
+#else
+static inline void crash_register_spus(struct list_head *list)
+{
+}
+#endif
+
+static void spu_shutdown(void)
+{
+        struct spu *spu;
+
+        mutex_lock(&spu_full_list_mutex);
+        list_for_each_entry(spu, &spu_full_list, full_list) {
+                spu_free_irqs(spu);
+                spu_destroy_spu(spu);
+        }
+        mutex_unlock(&spu_full_list_mutex);
+}
+
+static struct syscore_ops spu_syscore_ops = {
+        .shutdown = spu_shutdown,
+};
+
 static int __init init_spu_base(void)
 {
         int i, ret = 0;
@@ -760,6 +837,7 @@ static int __init init_spu_base(void)
         crash_register_spus(&spu_full_list);
         mutex_unlock(&spu_full_list_mutex);
         spu_add_sysdev_attr(&attr_stat);
+        register_syscore_ops(&spu_syscore_ops);
 
         spu_init_affinity();
 
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 1a40da92154c..3c7c3f82d842 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -154,6 +154,7 @@ static const struct file_operations __fops = {				\
         .release = spufs_attr_release,                                  \
         .read    = spufs_attr_read,                                     \
         .write   = spufs_attr_write,                                    \
+        .llseek  = generic_file_llseek,                                 \
 };
 
 
@@ -218,24 +219,17 @@ spufs_mem_write(struct file *file, const char __user *buffer,
         loff_t pos = *ppos;
         int ret;
 
-        if (pos < 0)
-                return -EINVAL;
         if (pos > LS_SIZE)
                 return -EFBIG;
-        if (size > LS_SIZE - pos)
-                size = LS_SIZE - pos;
 
         ret = spu_acquire(ctx);
         if (ret)
                 return ret;
 
         local_store = ctx->ops->get_ls(ctx);
-        ret = copy_from_user(local_store + pos, buffer, size);
+        size = simple_write_to_buffer(local_store, LS_SIZE, ppos, buffer, size);
         spu_release(ctx);
 
-        if (ret)
-                return -EFAULT;
-        *ppos = pos + size;
         return size;
 }
 
@@ -521,6 +515,7 @@ static const struct file_operations spufs_cntl_fops = {
         .release = spufs_cntl_release,
         .read = simple_attr_read,
         .write = simple_attr_write,
+        .llseek = generic_file_llseek,
         .mmap = spufs_cntl_mmap,
 };
 
@@ -572,18 +567,15 @@ spufs_regs_write(struct file *file, const char __user *buffer,
         if (*pos >= sizeof(lscsa->gprs))
                 return -EFBIG;
 
-        size = min_t(ssize_t, sizeof(lscsa->gprs) - *pos, size);
-        *pos += size;
-
         ret = spu_acquire_saved(ctx);
         if (ret)
                 return ret;
 
-        ret = copy_from_user((char *)lscsa->gprs + *pos - size,
-                             buffer, size) ? -EFAULT : size;
+        size = simple_write_to_buffer(lscsa->gprs, sizeof(lscsa->gprs), pos,
+                                        buffer, size);
 
         spu_release_saved(ctx);
-        return ret;
+        return size;
 }
 
 static const struct file_operations spufs_regs_fops = {
@@ -628,18 +620,15 @@ spufs_fpcr_write(struct file *file, const char __user * buffer,
         if (*pos >= sizeof(lscsa->fpcr))
                 return -EFBIG;
 
-        size = min_t(ssize_t, sizeof(lscsa->fpcr) - *pos, size);
-
         ret = spu_acquire_saved(ctx);
         if (ret)
                 return ret;
 
-        *pos += size;
-        ret = copy_from_user((char *)&lscsa->fpcr + *pos - size,
-                             buffer, size) ? -EFAULT : size;
+        size = simple_write_to_buffer(&lscsa->fpcr, sizeof(lscsa->fpcr), pos,
+                                        buffer, size);
 
         spu_release_saved(ctx);
-        return ret;
+        return size;
 }
 
 static const struct file_operations spufs_fpcr_fops = {
@@ -714,6 +703,7 @@ static ssize_t spufs_mbox_read(struct file *file, char __user *buf,
 static const struct file_operations spufs_mbox_fops = {
         .open   = spufs_pipe_open,
         .read   = spufs_mbox_read,
+        .llseek = no_llseek,
 };
 
 static ssize_t spufs_mbox_stat_read(struct file *file, char __user *buf,
@@ -743,6 +733,7 @@ static ssize_t spufs_mbox_stat_read(struct file *file, char __user *buf,
 static const struct file_operations spufs_mbox_stat_fops = {
         .open   = spufs_pipe_open,
         .read   = spufs_mbox_stat_read,
+        .llseek = no_llseek,
 };
 
 /* low-level ibox access function */
@@ -863,6 +854,7 @@ static const struct file_operations spufs_ibox_fops = {
         .read   = spufs_ibox_read,
         .poll   = spufs_ibox_poll,
         .fasync = spufs_ibox_fasync,
+        .llseek = no_llseek,
 };
 
 static ssize_t spufs_ibox_stat_read(struct file *file, char __user *buf,
@@ -890,6 +882,7 @@ static ssize_t spufs_ibox_stat_read(struct file *file, char __user *buf,
 static const struct file_operations spufs_ibox_stat_fops = {
         .open   = spufs_pipe_open,
         .read   = spufs_ibox_stat_read,
+        .llseek = no_llseek,
 };
 
 /* low-level mailbox write */
@@ -1011,6 +1004,7 @@ static const struct file_operations spufs_wbox_fops = {
         .write  = spufs_wbox_write,
         .poll   = spufs_wbox_poll,
         .fasync = spufs_wbox_fasync,
+        .llseek = no_llseek,
 };
 
 static ssize_t spufs_wbox_stat_read(struct file *file, char __user *buf,
@@ -1038,6 +1032,7 @@ static ssize_t spufs_wbox_stat_read(struct file *file, char __user *buf,
 static const struct file_operations spufs_wbox_stat_fops = {
         .open   = spufs_pipe_open,
         .read   = spufs_wbox_stat_read,
+        .llseek = no_llseek,
 };
 
 static int spufs_signal1_open(struct inode *inode, struct file *file)
@@ -1166,6 +1161,7 @@ static const struct file_operations spufs_signal1_fops = {
         .read = spufs_signal1_read,
         .write = spufs_signal1_write,
         .mmap = spufs_signal1_mmap,
+        .llseek = no_llseek,
 };
 
 static const struct file_operations spufs_signal1_nosched_fops = {
@@ -1173,6 +1169,7 @@ static const struct file_operations spufs_signal1_nosched_fops = {
         .release = spufs_signal1_release,
         .write = spufs_signal1_write,
         .mmap = spufs_signal1_mmap,
+        .llseek = no_llseek,
 };
 
 static int spufs_signal2_open(struct inode *inode, struct file *file)
@@ -1305,6 +1302,7 @@ static const struct file_operations spufs_signal2_fops = {
         .read = spufs_signal2_read,
         .write = spufs_signal2_write,
         .mmap = spufs_signal2_mmap,
+        .llseek = no_llseek,
 };
 
 static const struct file_operations spufs_signal2_nosched_fops = {
@@ -1312,6 +1310,7 @@ static const struct file_operations spufs_signal2_nosched_fops = {
         .release = spufs_signal2_release,
         .write = spufs_signal2_write,
         .mmap = spufs_signal2_mmap,
+        .llseek = no_llseek,
 };
 
 /*
@@ -1451,6 +1450,7 @@ static const struct file_operations spufs_mss_fops = {
         .open    = spufs_mss_open,
         .release = spufs_mss_release,
         .mmap    = spufs_mss_mmap,
+        .llseek  = no_llseek,
 };
 
 static int
@@ -1508,6 +1508,7 @@ static const struct file_operations spufs_psmap_fops = {
         .open    = spufs_psmap_open,
         .release = spufs_psmap_release,
         .mmap    = spufs_psmap_mmap,
+        .llseek  = no_llseek,
 };
 
 
@@ -1871,6 +1872,7 @@ static const struct file_operations spufs_mfc_fops = {
         .fsync   = spufs_mfc_fsync,
         .fasync  = spufs_mfc_fasync,
         .mmap    = spufs_mfc_mmap,
+        .llseek  = no_llseek,
 };
 
 static int spufs_npc_set(void *data, u64 val)
@@ -2246,6 +2248,7 @@ static ssize_t spufs_dma_info_read(struct file *file, char __user *buf,
 static const struct file_operations spufs_dma_info_fops = {
         .open = spufs_info_open,
         .read = spufs_dma_info_read,
+        .llseek = no_llseek,
 };
 
 static ssize_t __spufs_proxydma_info_read(struct spu_context *ctx,
@@ -2299,6 +2302,7 @@ static ssize_t spufs_proxydma_info_read(struct file *file, char __user *buf,
 static const struct file_operations spufs_proxydma_info_fops = {
         .open = spufs_info_open,
         .read = spufs_proxydma_info_read,
+        .llseek = no_llseek,
 };
 
 static int spufs_show_tid(struct seq_file *s, void *private)
@@ -2585,6 +2589,7 @@ static const struct file_operations spufs_switch_log_fops = {
         .read           = spufs_switch_log_read,
         .poll           = spufs_switch_log_poll,
         .release        = spufs_switch_log_release,
+        .llseek         = no_llseek,
 };
 
 /**
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 5dec408d6703..856e9c398068 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -71,12 +71,18 @@ spufs_alloc_inode(struct super_block *sb)
         return &ei->vfs_inode;
 }
 
-static void
-spufs_destroy_inode(struct inode *inode)
+static void spufs_i_callback(struct rcu_head *head)
 {
+        struct inode *inode = container_of(head, struct inode, i_rcu);
+        INIT_LIST_HEAD(&inode->i_dentry);
         kmem_cache_free(spufs_inode_cache, SPUFS_I(inode));
 }
 
+static void spufs_destroy_inode(struct inode *inode)
+{
+        call_rcu(&inode->i_rcu, spufs_i_callback);
+}
+
 static void
 spufs_init_once(void *p)
 {
@@ -159,18 +165,18 @@ static void spufs_prune_dir(struct dentry *dir)
 
         mutex_lock(&dir->d_inode->i_mutex);
         list_for_each_entry_safe(dentry, tmp, &dir->d_subdirs, d_u.d_child) {
-                spin_lock(&dcache_lock);
                 spin_lock(&dentry->d_lock);
                 if (!(d_unhashed(dentry)) && dentry->d_inode) {
-                        dget_locked(dentry);
+                        dget_dlock(dentry);
                         __d_drop(dentry);
                         spin_unlock(&dentry->d_lock);
                         simple_unlink(dir->d_inode, dentry);
-                        spin_unlock(&dcache_lock);
+                        /* XXX: what was dcache_lock protecting here? Other
+                         * filesystems (IB, configfs) release dcache_lock
+                         * before unlink */
                         dput(dentry);
                 } else {
                         spin_unlock(&dentry->d_lock);
-                        spin_unlock(&dcache_lock);
                 }
         }
         shrink_dcache_parent(dir);
@@ -798,17 +804,17 @@ spufs_fill_super(struct super_block *sb, void *data, int silent)
         return spufs_create_root(sb, data);
 }
 
-static int
-spufs_get_sb(struct file_system_type *fstype, int flags,
-                const char *name, void *data, struct vfsmount *mnt)
+static struct dentry *
+spufs_mount(struct file_system_type *fstype, int flags,
+                const char *name, void *data)
 {
-        return get_sb_single(fstype, flags, data, spufs_fill_super, mnt);
+        return mount_single(fstype, flags, data, spufs_fill_super);
 }
 
 static struct file_system_type spufs_type = {
         .owner = THIS_MODULE,
         .name = "spufs",
-        .get_sb = spufs_get_sb,
+        .mount = spufs_mount,
         .kill_sb = kill_litter_super,
 };
 
diff --git a/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c b/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c
index a101abf17504..147069938cfe 100644
--- a/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c
+++ b/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c
@@ -36,10 +36,9 @@ static int spu_alloc_lscsa_std(struct spu_state *csa)
         struct spu_lscsa *lscsa;
         unsigned char *p;
 
-        lscsa = vmalloc(sizeof(struct spu_lscsa));
+        lscsa = vzalloc(sizeof(struct spu_lscsa));
         if (!lscsa)
                 return -ENOMEM;
-        memset(lscsa, 0, sizeof(struct spu_lscsa));
         csa->lscsa = lscsa;
 
         /* Set LS pages reserved to allow for user-space mapping. */
@@ -91,7 +90,7 @@ int spu_alloc_lscsa(struct spu_state *csa)
          */
         for (i = 0; i < SPU_LSCSA_NUM_BIG_PAGES; i++) {
                 /* XXX This is likely to fail, we should use a special pool
-                 *     similiar to what hugetlbfs does.
+                 *     similar to what hugetlbfs does.
                  */
                 csa->lscsa_pages[i] = alloc_pages(GFP_KERNEL,
                                                   SPU_64K_PAGE_ORDER);
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 0b0466284932..32cb4e66d2cd 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -141,7 +141,7 @@ void __spu_update_sched_info(struct spu_context *ctx)
          * runqueue. The context will be rescheduled on the proper node
          * if it is timesliced or preempted.
          */
-        ctx->cpus_allowed = current->cpus_allowed;
+        cpumask_copy(&ctx->cpus_allowed, tsk_cpus_allowed(current));
 
         /* Save the current cpu id for spu interrupt routing. */
         ctx->last_ran = raw_smp_processor_id();
@@ -846,7 +846,7 @@ static struct spu_context *grab_runnable_context(int prio, int node)
                 struct list_head *rq = &spu_prio->runq[best];
 
                 list_for_each_entry(ctx, rq, rq) {
-                        /* XXX(hch): check for affinity here aswell */
+                        /* XXX(hch): check for affinity here as well */
                         if (__node_allowed(ctx, node)) {
                                 __spu_del_from_rq(ctx);
                                 goto found;
diff --git a/arch/powerpc/platforms/cell/spufs/spu_restore.c b/arch/powerpc/platforms/cell/spufs/spu_restore.c
index 21a9c952d88b..72c905f1ee7a 100644
--- a/arch/powerpc/platforms/cell/spufs/spu_restore.c
+++ b/arch/powerpc/platforms/cell/spufs/spu_restore.c
@@ -284,7 +284,7 @@ static inline void restore_complete(void)
                 exit_instrs[3] = BR_INSTR;
                 break;
         default:
-                /* SPU_Status[R]=1. No additonal instructions. */
+                /* SPU_Status[R]=1. No additional instructions. */
                 break;
         }
         spu_sync();
diff --git a/arch/powerpc/platforms/cell/spufs/syscalls.c b/arch/powerpc/platforms/cell/spufs/syscalls.c
index 187a7d32f86a..a3d2ce54ea2e 100644
--- a/arch/powerpc/platforms/cell/spufs/syscalls.c
+++ b/arch/powerpc/platforms/cell/spufs/syscalls.c
@@ -70,7 +70,7 @@ static long do_spu_create(const char __user *pathname, unsigned int flags,
         if (!IS_ERR(tmp)) {
                 struct nameidata nd;
 
-                ret = path_lookup(tmp, LOOKUP_PARENT, &nd);
+                ret = kern_path_parent(tmp, &nd);
                 if (!ret) {
                         nd.flags |= LOOKUP_OPEN | LOOKUP_CREATE;
                         ret = spufs_create(&nd, flags, mode, neighbor);
diff --git a/arch/powerpc/platforms/chrp/nvram.c b/arch/powerpc/platforms/chrp/nvram.c
index ba3588f2d8e0..d3ceff04ffc7 100644
--- a/arch/powerpc/platforms/chrp/nvram.c
+++ b/arch/powerpc/platforms/chrp/nvram.c
@@ -74,8 +74,10 @@ void __init chrp_nvram_init(void)
                 return;
 
         nbytes_p = of_get_property(nvram, "#bytes", &proplen);
-        if (nbytes_p == NULL || proplen != sizeof(unsigned int))
+        if (nbytes_p == NULL || proplen != sizeof(unsigned int)) {
+                of_node_put(nvram);
                 return;
+        }
 
         nvram_size = *nbytes_p;
 
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 8553cc49e0d6..122786498419 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -365,10 +365,13 @@ void __init chrp_setup_arch(void)
 
 static void chrp_8259_cascade(unsigned int irq, struct irq_desc *desc)
 {
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         unsigned int cascade_irq = i8259_irq();
+
         if (cascade_irq != NO_IRQ)
                 generic_handle_irq(cascade_irq);
-        desc->chip->eoi(irq);
+
+        chip->irq_eoi(&desc->irq_data);
 }
 
 /*
@@ -514,7 +517,7 @@ static void __init chrp_find_8259(void)
                 if (cascade_irq == NO_IRQ)
                         printk(KERN_ERR "i8259: failed to map cascade irq\n");
                 else
-                        set_irq_chained_handler(cascade_irq,
+                        irq_set_chained_handler(cascade_irq,
                                                 chrp_8259_cascade);
         }
 }
diff --git a/arch/powerpc/platforms/chrp/smp.c b/arch/powerpc/platforms/chrp/smp.c
index 02cafecc90e3..a800122e4dda 100644
--- a/arch/powerpc/platforms/chrp/smp.c
+++ b/arch/powerpc/platforms/chrp/smp.c
@@ -30,10 +30,12 @@
 #include <asm/mpic.h>
 #include <asm/rtas.h>
 
-static void __devinit smp_chrp_kick_cpu(int nr)
+static int __devinit smp_chrp_kick_cpu(int nr)
 {
         *(unsigned long *)KERNELBASE = nr;
         asm volatile("dcbf 0,%0"::"r"(KERNELBASE):"memory");
+
+        return 0;
 }
 
 static void __devinit smp_chrp_setup_cpu(int cpu_nr)
diff --git a/arch/powerpc/platforms/chrp/time.c b/arch/powerpc/platforms/chrp/time.c
index 054dfe5b8e77..f803f4b8ab6f 100644
--- a/arch/powerpc/platforms/chrp/time.c
+++ b/arch/powerpc/platforms/chrp/time.c
@@ -29,6 +29,10 @@
 
 extern spinlock_t rtc_lock;
 
+#define NVRAM_AS0  0x74
+#define NVRAM_AS1  0x75
+#define NVRAM_DATA 0x77
+
 static int nvram_as1 = NVRAM_AS1;
 static int nvram_as0 = NVRAM_AS0;
 static int nvram_data = NVRAM_DATA;
diff --git a/arch/powerpc/platforms/embedded6xx/flipper-pic.c b/arch/powerpc/platforms/embedded6xx/flipper-pic.c
index c278bd3a8fec..f61a2dd96b99 100644
--- a/arch/powerpc/platforms/embedded6xx/flipper-pic.c
+++ b/arch/powerpc/platforms/embedded6xx/flipper-pic.c
@@ -46,10 +46,10 @@
  *
  */
 
-static void flipper_pic_mask_and_ack(unsigned int virq)
+static void flipper_pic_mask_and_ack(struct irq_data *d)
 {
-        int irq = virq_to_hw(virq);
-        void __iomem *io_base = get_irq_chip_data(virq);
+        int irq = irqd_to_hwirq(d);
+        void __iomem *io_base = irq_data_get_irq_chip_data(d);
         u32 mask = 1 << irq;
 
         clrbits32(io_base + FLIPPER_IMR, mask);
@@ -57,27 +57,27 @@ static void flipper_pic_mask_and_ack(unsigned int virq)
         out_be32(io_base + FLIPPER_ICR, mask);
 }
 
-static void flipper_pic_ack(unsigned int virq)
+static void flipper_pic_ack(struct irq_data *d)
 {
-        int irq = virq_to_hw(virq);
-        void __iomem *io_base = get_irq_chip_data(virq);
+        int irq = irqd_to_hwirq(d);
+        void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
         /* this is at least needed for RSW */
         out_be32(io_base + FLIPPER_ICR, 1 << irq);
 }
 
-static void flipper_pic_mask(unsigned int virq)
+static void flipper_pic_mask(struct irq_data *d)
 {
-        int irq = virq_to_hw(virq);
-        void __iomem *io_base = get_irq_chip_data(virq);
+        int irq = irqd_to_hwirq(d);
+        void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
         clrbits32(io_base + FLIPPER_IMR, 1 << irq);
 }
 
-static void flipper_pic_unmask(unsigned int virq)
+static void flipper_pic_unmask(struct irq_data *d)
 {
-        int irq = virq_to_hw(virq);
-        void __iomem *io_base = get_irq_chip_data(virq);
+        int irq = irqd_to_hwirq(d);
+        void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
         setbits32(io_base + FLIPPER_IMR, 1 << irq);
 }
@@ -85,10 +85,10 @@ static void flipper_pic_unmask(unsigned int virq)
 
 static struct irq_chip flipper_pic = {
         .name           = "flipper-pic",
-        .ack            = flipper_pic_ack,
-        .mask_ack       = flipper_pic_mask_and_ack,
-        .mask           = flipper_pic_mask,
-        .unmask         = flipper_pic_unmask,
+        .irq_ack        = flipper_pic_ack,
+        .irq_mask_ack   = flipper_pic_mask_and_ack,
+        .irq_mask       = flipper_pic_mask,
+        .irq_unmask     = flipper_pic_unmask,
 };
 
 /*
@@ -101,18 +101,12 @@ static struct irq_host *flipper_irq_host;
 static int flipper_pic_map(struct irq_host *h, unsigned int virq,
                            irq_hw_number_t hwirq)
 {
-        set_irq_chip_data(virq, h->host_data);
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, &flipper_pic, handle_level_irq);
+        irq_set_chip_data(virq, h->host_data);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &flipper_pic, handle_level_irq);
         return 0;
 }
 
-static void flipper_pic_unmap(struct irq_host *h, unsigned int irq)
-{
-        set_irq_chip_data(irq, NULL);
-        set_irq_chip(irq, NULL);
-}
-
 static int flipper_pic_match(struct irq_host *h, struct device_node *np)
 {
         return 1;
@@ -121,7 +115,6 @@ static int flipper_pic_match(struct irq_host *h, struct device_node *np)
 
 static struct irq_host_ops flipper_irq_host_ops = {
         .map = flipper_pic_map,
-        .unmap = flipper_pic_unmap,
         .match = flipper_pic_match,
 };
 
diff --git a/arch/powerpc/platforms/embedded6xx/gamecube.c b/arch/powerpc/platforms/embedded6xx/gamecube.c
index 1106fd99627f..a138e14bad2e 100644
--- a/arch/powerpc/platforms/embedded6xx/gamecube.c
+++ b/arch/powerpc/platforms/embedded6xx/gamecube.c
@@ -75,14 +75,6 @@ static void gamecube_shutdown(void)
         flipper_quiesce();
 }
 
-#ifdef CONFIG_KEXEC
-static int gamecube_kexec_prepare(struct kimage *image)
-{
-        return 0;
-}
-#endif /* CONFIG_KEXEC */
-
-
 define_machine(gamecube) {
         .name                   = "gamecube",
         .probe                  = gamecube_probe,
@@ -95,9 +87,6 @@ define_machine(gamecube) {
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = udbg_progress,
         .machine_shutdown       = gamecube_shutdown,
-#ifdef CONFIG_KEXEC
-        .machine_kexec_prepare  = gamecube_kexec_prepare,
-#endif
 };
 
 
diff --git a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
index a771f91e215b..e4919170c6bc 100644
--- a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
+++ b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
@@ -41,36 +41,36 @@
  *
  */
 
-static void hlwd_pic_mask_and_ack(unsigned int virq)
+static void hlwd_pic_mask_and_ack(struct irq_data *d)
 {
-        int irq = virq_to_hw(virq);
-        void __iomem *io_base = get_irq_chip_data(virq);
+        int irq = irqd_to_hwirq(d);
+        void __iomem *io_base = irq_data_get_irq_chip_data(d);
         u32 mask = 1 << irq;
 
         clrbits32(io_base + HW_BROADWAY_IMR, mask);
         out_be32(io_base + HW_BROADWAY_ICR, mask);
 }
 
-static void hlwd_pic_ack(unsigned int virq)
+static void hlwd_pic_ack(struct irq_data *d)
 {
-        int irq = virq_to_hw(virq);
-        void __iomem *io_base = get_irq_chip_data(virq);
+        int irq = irqd_to_hwirq(d);
+        void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
         out_be32(io_base + HW_BROADWAY_ICR, 1 << irq);
 }
 
-static void hlwd_pic_mask(unsigned int virq)
+static void hlwd_pic_mask(struct irq_data *d)
 {
-        int irq = virq_to_hw(virq);
-        void __iomem *io_base = get_irq_chip_data(virq);
+        int irq = irqd_to_hwirq(d);
+        void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
         clrbits32(io_base + HW_BROADWAY_IMR, 1 << irq);
 }
 
-static void hlwd_pic_unmask(unsigned int virq)
+static void hlwd_pic_unmask(struct irq_data *d)
 {
-        int irq = virq_to_hw(virq);
-        void __iomem *io_base = get_irq_chip_data(virq);
+        int irq = irqd_to_hwirq(d);
+        void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
         setbits32(io_base + HW_BROADWAY_IMR, 1 << irq);
 }
@@ -78,10 +78,10 @@ static void hlwd_pic_unmask(unsigned int virq)
 
 static struct irq_chip hlwd_pic = {
         .name           = "hlwd-pic",
-        .ack            = hlwd_pic_ack,
-        .mask_ack       = hlwd_pic_mask_and_ack,
-        .mask           = hlwd_pic_mask,
-        .unmask         = hlwd_pic_unmask,
+        .irq_ack        = hlwd_pic_ack,
+        .irq_mask_ack   = hlwd_pic_mask_and_ack,
+        .irq_mask       = hlwd_pic_mask,
+        .irq_unmask     = hlwd_pic_unmask,
 };
 
 /*
@@ -94,21 +94,14 @@ static struct irq_host *hlwd_irq_host;
 static int hlwd_pic_map(struct irq_host *h, unsigned int virq,
                            irq_hw_number_t hwirq)
 {
-        set_irq_chip_data(virq, h->host_data);
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, &hlwd_pic, handle_level_irq);
+        irq_set_chip_data(virq, h->host_data);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &hlwd_pic, handle_level_irq);
         return 0;
 }
 
-static void hlwd_pic_unmap(struct irq_host *h, unsigned int irq)
-{
-        set_irq_chip_data(irq, NULL);
-        set_irq_chip(irq, NULL);
-}
-
 static struct irq_host_ops hlwd_irq_host_ops = {
         .map = hlwd_pic_map,
-        .unmap = hlwd_pic_unmap,
 };
 
 static unsigned int __hlwd_pic_get_irq(struct irq_host *h)
@@ -129,11 +122,12 @@ static unsigned int __hlwd_pic_get_irq(struct irq_host *h)
 static void hlwd_pic_irq_cascade(unsigned int cascade_virq,
                                       struct irq_desc *desc)
 {
-        struct irq_host *irq_host = get_irq_data(cascade_virq);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        struct irq_host *irq_host = irq_get_handler_data(cascade_virq);
         unsigned int virq;
 
         raw_spin_lock(&desc->lock);
-        desc->chip->mask(cascade_virq); /* IRQ_LEVEL */
+        chip->irq_mask(&desc->irq_data); /* IRQ_LEVEL */
         raw_spin_unlock(&desc->lock);
 
         virq = __hlwd_pic_get_irq(irq_host);
@@ -143,9 +137,9 @@ static void hlwd_pic_irq_cascade(unsigned int cascade_virq,
                 pr_err("spurious interrupt!\n");
 
         raw_spin_lock(&desc->lock);
-        desc->chip->ack(cascade_virq); /* IRQ_LEVEL */
-        if (!(desc->status & IRQ_DISABLED) && desc->chip->unmask)
-                desc->chip->unmask(cascade_virq);
+        chip->irq_ack(&desc->irq_data); /* IRQ_LEVEL */
+        if (!irqd_irq_disabled(&desc->irq_data) && chip->irq_unmask)
+                chip->irq_unmask(&desc->irq_data);
         raw_spin_unlock(&desc->lock);
 }
 
@@ -217,8 +211,8 @@ void hlwd_pic_probe(void)
                         host = hlwd_pic_init(np);
                         BUG_ON(!host);
                         cascade_virq = irq_of_parse_and_map(np, 0);
-                        set_irq_data(cascade_virq, host);
-                        set_irq_chained_handler(cascade_virq,
+                        irq_set_handler_data(cascade_virq, host);
+                        irq_set_chained_handler(cascade_virq,
                                                 hlwd_pic_irq_cascade);
                         hlwd_irq_host = host;
                         break;
diff --git a/arch/powerpc/platforms/embedded6xx/holly.c b/arch/powerpc/platforms/embedded6xx/holly.c
index b21fde589ca7..487bda0d18d8 100644
--- a/arch/powerpc/platforms/embedded6xx/holly.c
+++ b/arch/powerpc/platforms/embedded6xx/holly.c
@@ -198,8 +198,8 @@ static void __init holly_init_IRQ(void)
         cascade_pci_irq = irq_of_parse_and_map(tsi_pci, 0);
         pr_debug("%s: tsi108 cascade_pci_irq = 0x%x\n", __func__, (u32) cascade_pci_irq);
         tsi108_pci_int_init(cascade_node);
-        set_irq_data(cascade_pci_irq, mpic);
-        set_irq_chained_handler(cascade_pci_irq, tsi108_irq_cascade);
+        irq_set_handler_data(cascade_pci_irq, mpic);
+        irq_set_chained_handler(cascade_pci_irq, tsi108_irq_cascade);
 #endif
         /* Configure MPIC outputs to CPU0 */
         tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
index 7a2ba39d7811..1cb907c94359 100644
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -153,8 +153,8 @@ static void __init mpc7448_hpc2_init_IRQ(void)
         DBG("%s: tsi108 cascade_pci_irq = 0x%x\n", __func__,
             (u32) cascade_pci_irq);
         tsi108_pci_int_init(cascade_node);
-        set_irq_data(cascade_pci_irq, mpic);
-        set_irq_chained_handler(cascade_pci_irq, tsi108_irq_cascade);
+        irq_set_handler_data(cascade_pci_irq, mpic);
+        irq_set_chained_handler(cascade_pci_irq, tsi108_irq_cascade);
 #endif
         /* Configure MPIC outputs to CPU0 */
         tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);
diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c
index 5cdcc7c8d973..1b5dc1a2e145 100644
--- a/arch/powerpc/platforms/embedded6xx/wii.c
+++ b/arch/powerpc/platforms/embedded6xx/wii.c
@@ -18,7 +18,6 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/seq_file.h>
-#include <linux/kexec.h>
 #include <linux/of_platform.h>
 #include <linux/memblock.h>
 #include <mm/mmu_decl.h>
@@ -65,7 +64,7 @@ static int __init page_aligned(unsigned long x)
 
 void __init wii_memory_fixups(void)
 {
-        struct memblock_property *p = memblock.memory.region;
+        struct memblock_region *p = memblock.memory.regions;
 
         /*
          * This is part of a workaround to allow the use of two
@@ -226,13 +225,6 @@ static void wii_shutdown(void)
         flipper_quiesce();
 }
 
-#ifdef CONFIG_KEXEC
-static int wii_machine_kexec_prepare(struct kimage *image)
-{
-        return 0;
-}
-#endif /* CONFIG_KEXEC */
-
 define_machine(wii) {
         .name                   = "wii",
         .probe                  = wii_probe,
@@ -246,9 +238,6 @@ define_machine(wii) {
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = udbg_progress,
         .machine_shutdown       = wii_shutdown,
-#ifdef CONFIG_KEXEC
-        .machine_kexec_prepare  = wii_machine_kexec_prepare,
-#endif
 };
 
 static struct of_device_id wii_of_bus[] = {
diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig
index 47a20cfb4486..b57cda3a0817 100644
--- a/arch/powerpc/platforms/iseries/Kconfig
+++ b/arch/powerpc/platforms/iseries/Kconfig
@@ -1,8 +1,10 @@
 config PPC_ISERIES
         bool "IBM Legacy iSeries"
         depends on PPC64 && PPC_BOOK3S
-        select PPC_INDIRECT_IO
-        select PPC_PCI_CHOICE if EMBEDDED
+        select PPC_SMP_MUXED_IPI
+        select PPC_INDIRECT_PIO
+        select PPC_INDIRECT_MMIO
+        select PPC_PCI_CHOICE if EXPERT
 
 menu "iSeries device drivers"
         depends on PPC_ISERIES
diff --git a/arch/powerpc/platforms/iseries/Makefile b/arch/powerpc/platforms/iseries/Makefile
index ce014928d460..a7602b11ed9d 100644
--- a/arch/powerpc/platforms/iseries/Makefile
+++ b/arch/powerpc/platforms/iseries/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS    += -mno-minimal-toc
+ccflags-y       := -mno-minimal-toc
 
 obj-y += exception.o
 obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o dt.o mf.o lpevents.o \
diff --git a/arch/powerpc/platforms/iseries/dt.c b/arch/powerpc/platforms/iseries/dt.c
index 7f45a51fe793..f0491cc28900 100644
--- a/arch/powerpc/platforms/iseries/dt.c
+++ b/arch/powerpc/platforms/iseries/dt.c
@@ -242,7 +242,7 @@ static void __init dt_cpus(struct iseries_flat_dt *dt)
         pft_size[0] = 0; /* NUMA CEC cookie, 0 for non NUMA  */
         pft_size[1] = __ilog2(HvCallHpt_getHptPages() * HW_PAGE_SIZE);
 
-        for (i = 0; i < NR_CPUS; i++) {
+        for (i = 0; i < NR_LPPACAS; i++) {
                 if (lppaca[i].dyn_proc_status >= 2)
                         continue;
 
diff --git a/arch/powerpc/platforms/iseries/exception.S b/arch/powerpc/platforms/iseries/exception.S
index 32a56c6dfa72..29c02f36b32f 100644
--- a/arch/powerpc/platforms/iseries/exception.S
+++ b/arch/powerpc/platforms/iseries/exception.S
@@ -31,6 +31,7 @@
 #include <asm/thread_info.h>
 #include <asm/ptrace.h>
 #include <asm/cputable.h>
+#include <asm/mmu.h>
 
 #include "exception.h"
 
@@ -60,29 +61,31 @@ system_reset_iSeries:
 /* Spin on __secondary_hold_spinloop until it is updated by the boot cpu. */
 /* In the UP case we'll yield() later, and we will not access the paca anyway */
 #ifdef CONFIG_SMP
-1:
+iSeries_secondary_wait_paca:
         HMT_LOW
         LOAD_REG_ADDR(r23, __secondary_hold_spinloop)
         ld      r23,0(r23)
-        sync
-        LOAD_REG_ADDR(r3,current_set)
-        sldi    r28,r24,3               /* get current_set[cpu#] */
-        ldx     r3,r3,r28
-        addi    r1,r3,THREAD_SIZE
-        subi    r1,r1,STACK_FRAME_OVERHEAD
 
-        cmpwi   0,r23,0                 /* Keep poking the Hypervisor until */
-        bne     2f                      /* we're released */
-        /* Let the Hypervisor know we are alive */
+        cmpdi   0,r23,0
+        bne     2f                      /* go on when the master is ready */
+
+        /* Keep poking the Hypervisor until we're released */
         /* 8002 is a call to HvCallCfg::getLps, a harmless Hypervisor function */
         lis     r3,0x8002
         rldicr  r3,r3,32,15             /* r0 = (r3 << 32) & 0xffff000000000000 */
         li      r0,-1                   /* r0=-1 indicates a Hypervisor call */
         sc                              /* Invoke the hypervisor via a system call */
-        b       1b
-#endif
+        b       iSeries_secondary_wait_paca
 
 2:
+        HMT_MEDIUM
+        sync
+
+        LOAD_REG_ADDR(r3, nr_cpu_ids)   /* get number of pacas allocated */
+        lwz     r3,0(r3)                /* nr_cpus= or NR_CPUS can limit */
+        cmpld   0,r24,r3                /* is our cpu number allocated? */
+        bge     iSeries_secondary_yield /* no, yield forever */
+
         /* Load our paca now that it's been allocated */
         LOAD_REG_ADDR(r13, paca)
         ld      r13,0(r13)
@@ -93,10 +96,24 @@ system_reset_iSeries:
         ori     r23,r23,MSR_RI
         mtmsrd  r23                     /* RI on */
 
-        HMT_LOW
-#ifdef CONFIG_SMP
+iSeries_secondary_smp_loop:
         lbz     r23,PACAPROCSTART(r13)  /* Test if this processor
                                          * should start */
+        cmpwi   0,r23,0
+        bne     3f                      /* go on when we are told */
+
+        HMT_LOW
+        /* Let the Hypervisor know we are alive */
+        /* 8002 is a call to HvCallCfg::getLps, a harmless Hypervisor function */
+        lis     r3,0x8002
+        rldicr  r3,r3,32,15             /* r0 = (r3 << 32) & 0xffff000000000000 */
+        li      r0,-1                   /* r0=-1 indicates a Hypervisor call */
+        sc                              /* Invoke the hypervisor via a system call */
+        mfspr   r13,SPRN_SPRG_PACA      /* Put r13 back ???? */
+        b       iSeries_secondary_smp_loop /* wait for signal to start */
+
+3:
+        HMT_MEDIUM
         sync
         LOAD_REG_ADDR(r3,current_set)
         sldi    r28,r24,3               /* get current_set[cpu#] */
@@ -104,27 +121,22 @@ system_reset_iSeries:
         addi    r1,r3,THREAD_SIZE
         subi    r1,r1,STACK_FRAME_OVERHEAD
 
-        cmpwi   0,r23,0
-        beq     iSeries_secondary_smp_loop      /* Loop until told to go */
         b       __secondary_start               /* Loop until told to go */
-iSeries_secondary_smp_loop:
-        /* Let the Hypervisor know we are alive */
-        /* 8002 is a call to HvCallCfg::getLps, a harmless Hypervisor function */
-        lis     r3,0x8002
-        rldicr  r3,r3,32,15             /* r0 = (r3 << 32) & 0xffff000000000000 */
-#else /* CONFIG_SMP */
+#endif /* CONFIG_SMP */
+
+iSeries_secondary_yield:
         /* Yield the processor.  This is required for non-SMP kernels
                 which are running on multi-threaded machines. */
+        HMT_LOW
         lis     r3,0x8000
         rldicr  r3,r3,32,15             /* r3 = (r3 << 32) & 0xffff000000000000 */
         addi    r3,r3,18                /* r3 = 0x8000000000000012 which is "yield" */
         li      r4,0                    /* "yield timed" */
         li      r5,-1                   /* "yield forever" */
-#endif /* CONFIG_SMP */
         li      r0,-1                   /* r0=-1 indicates a Hypervisor call */
         sc                              /* Invoke the hypervisor via a system call */
         mfspr   r13,SPRN_SPRG_PACA      /* Put r13 back ???? */
-        b       2b                      /* If SMP not configured, secondaries
+        b       iSeries_secondary_yield /* If SMP not configured, secondaries
                                          * loop forever */
 
 /***  ISeries-LPAR interrupt handlers ***/
@@ -157,7 +169,7 @@ BEGIN_FTR_SECTION
 FTR_SECTION_ELSE
         EXCEPTION_PROLOG_1(PACA_EXGEN)
         EXCEPTION_PROLOG_ISERIES_1
-ALT_FTR_SECTION_END_IFCLR(CPU_FTR_SLB)
+ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_SLB)
         b       data_access_common
 
 .do_stab_bolted_iSeries:
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
index ba446bf355a9..b2103453eb01 100644
--- a/arch/powerpc/platforms/iseries/irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -42,7 +42,6 @@
 #include "irq.h"
 #include "pci.h"
 #include "call_pci.h"
-#include "smp.h"
 
 #ifdef CONFIG_PCI
 
@@ -167,11 +166,11 @@ static void pci_event_handler(struct HvLpEvent *event)
  * This will be called by device drivers (via enable_IRQ)
  * to enable INTA in the bridge interrupt status register.
  */
-static void iseries_enable_IRQ(unsigned int irq)
+static void iseries_enable_IRQ(struct irq_data *d)
 {
         u32 bus, dev_id, function, mask;
         const u32 sub_bus = 0;
-        unsigned int rirq = (unsigned int)irq_map[irq].hwirq;
+        unsigned int rirq = (unsigned int)irqd_to_hwirq(d);
 
         /* The IRQ has already been locked by the caller */
         bus = REAL_IRQ_TO_BUS(rirq);
@@ -184,23 +183,23 @@ static void iseries_enable_IRQ(unsigned int irq)
 }
 
 /* This is called by iseries_activate_IRQs */
-static unsigned int iseries_startup_IRQ(unsigned int irq)
+static unsigned int iseries_startup_IRQ(struct irq_data *d)
 {
         u32 bus, dev_id, function, mask;
         const u32 sub_bus = 0;
-        unsigned int rirq = (unsigned int)irq_map[irq].hwirq;
+        unsigned int rirq = (unsigned int)irqd_to_hwirq(d);
 
         bus = REAL_IRQ_TO_BUS(rirq);
         function = REAL_IRQ_TO_FUNC(rirq);
         dev_id = (REAL_IRQ_TO_IDSEL(rirq) << 4) + function;
 
         /* Link the IRQ number to the bridge */
-        HvCallXm_connectBusUnit(bus, sub_bus, dev_id, irq);
+        HvCallXm_connectBusUnit(bus, sub_bus, dev_id, d->irq);
 
         /* Unmask bridge interrupts in the FISR */
         mask = 0x01010000 << function;
         HvCallPci_unmaskFisr(bus, sub_bus, dev_id, mask);
-        iseries_enable_IRQ(irq);
+        iseries_enable_IRQ(d);
         return 0;
 }
 
@@ -215,21 +214,26 @@ void __init iSeries_activate_IRQs()
 
         for_each_irq (irq) {
                 struct irq_desc *desc = irq_to_desc(irq);
+                struct irq_chip *chip;
 
-                if (desc && desc->chip && desc->chip->startup) {
+                if (!desc)
+                        continue;
+
+                chip = irq_desc_get_chip(desc);
+                if (chip && chip->irq_startup) {
                         raw_spin_lock_irqsave(&desc->lock, flags);
-                        desc->chip->startup(irq);
+                        chip->irq_startup(&desc->irq_data);
                         raw_spin_unlock_irqrestore(&desc->lock, flags);
                 }
         }
 }
 
 /*  this is not called anywhere currently */
-static void iseries_shutdown_IRQ(unsigned int irq)
+static void iseries_shutdown_IRQ(struct irq_data *d)
 {
         u32 bus, dev_id, function, mask;
         const u32 sub_bus = 0;
-        unsigned int rirq = (unsigned int)irq_map[irq].hwirq;
+        unsigned int rirq = (unsigned int)irqd_to_hwirq(d);
 
         /* irq should be locked by the caller */
         bus = REAL_IRQ_TO_BUS(rirq);
@@ -248,11 +252,11 @@ static void iseries_shutdown_IRQ(unsigned int irq)
  * This will be called by device drivers (via disable_IRQ)
  * to disable INTA in the bridge interrupt status register.
  */
-static void iseries_disable_IRQ(unsigned int irq)
+static void iseries_disable_IRQ(struct irq_data *d)
 {
         u32 bus, dev_id, function, mask;
         const u32 sub_bus = 0;
-        unsigned int rirq = (unsigned int)irq_map[irq].hwirq;
+        unsigned int rirq = (unsigned int)irqd_to_hwirq(d);
 
         /* The IRQ has already been locked by the caller */
         bus = REAL_IRQ_TO_BUS(rirq);
@@ -264,9 +268,9 @@ static void iseries_disable_IRQ(unsigned int irq)
         HvCallPci_maskInterrupts(bus, sub_bus, dev_id, mask);
 }
 
-static void iseries_end_IRQ(unsigned int irq)
+static void iseries_end_IRQ(struct irq_data *d)
 {
-        unsigned int rirq = (unsigned int)irq_map[irq].hwirq;
+        unsigned int rirq = (unsigned int)irqd_to_hwirq(d);
 
         HvCallPci_eoi(REAL_IRQ_TO_BUS(rirq), REAL_IRQ_TO_SUBBUS(rirq),
                 (REAL_IRQ_TO_IDSEL(rirq) << 4) + REAL_IRQ_TO_FUNC(rirq));
@@ -274,11 +278,11 @@ static void iseries_end_IRQ(unsigned int irq)
 
 static struct irq_chip iseries_pic = {
         .name           = "iSeries",
-        .startup        = iseries_startup_IRQ,
-        .shutdown       = iseries_shutdown_IRQ,
-        .unmask         = iseries_enable_IRQ,
-        .mask           = iseries_disable_IRQ,
-        .eoi            = iseries_end_IRQ
+        .irq_startup    = iseries_startup_IRQ,
+        .irq_shutdown   = iseries_shutdown_IRQ,
+        .irq_unmask     = iseries_enable_IRQ,
+        .irq_mask       = iseries_disable_IRQ,
+        .irq_eoi        = iseries_end_IRQ
 };
 
 /*
@@ -311,7 +315,7 @@ unsigned int iSeries_get_irq(void)
 #ifdef CONFIG_SMP
         if (get_lppaca()->int_dword.fields.ipi_cnt) {
                 get_lppaca()->int_dword.fields.ipi_cnt = 0;
-                iSeries_smp_message_recv();
+                smp_ipi_demux();
         }
 #endif /* CONFIG_SMP */
         if (hvlpevent_is_pending())
@@ -341,7 +345,7 @@ unsigned int iSeries_get_irq(void)
 static int iseries_irq_host_map(struct irq_host *h, unsigned int virq,
                                 irq_hw_number_t hw)
 {
-        set_irq_chip_and_handler(virq, &iseries_pic, handle_fasteoi_irq);
+        irq_set_chip_and_handler(virq, &iseries_pic, handle_fasteoi_irq);
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index 33e5fc7334fc..62dabe3c2bfa 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -51,7 +51,7 @@
 static int mf_initialized;
 
 /*
- * This is the structure layout for the Machine Facilites LPAR event
+ * This is the structure layout for the Machine Facilities LPAR event
  * flows.
  */
 struct vsp_cmd_data {
@@ -1045,71 +1045,9 @@ static const struct file_operations mf_side_proc_fops = {
         .write          = mf_side_proc_write,
 };
 
-#if 0
-static void mf_getSrcHistory(char *buffer, int size)
-{
-        struct IplTypeReturnStuff return_stuff;
-        struct pending_event *ev = new_pending_event();
-        int rc = 0;
-        char *pages[4];
-
-        pages[0] = kmalloc(4096, GFP_ATOMIC);
-        pages[1] = kmalloc(4096, GFP_ATOMIC);
-        pages[2] = kmalloc(4096, GFP_ATOMIC);
-        pages[3] = kmalloc(4096, GFP_ATOMIC);
-        if ((ev == NULL) || (pages[0] == NULL) || (pages[1] == NULL)
-                         || (pages[2] == NULL) || (pages[3] == NULL))
-                return -ENOMEM;
-
-        return_stuff.xType = 0;
-        return_stuff.xRc = 0;
-        return_stuff.xDone = 0;
-        ev->event.hp_lp_event.xSubtype = 6;
-        ev->event.hp_lp_event.x.xSubtypeData =
-                subtype_data('M', 'F', 'V', 'I');
-        ev->event.data.vsp_cmd.xEvent = &return_stuff;
-        ev->event.data.vsp_cmd.cmd = 4;
-        ev->event.data.vsp_cmd.lp_index = HvLpConfig_getLpIndex();
-        ev->event.data.vsp_cmd.result_code = 0xFF;
-        ev->event.data.vsp_cmd.reserved = 0;
-        ev->event.data.vsp_cmd.sub_data.page[0] = iseries_hv_addr(pages[0]);
-        ev->event.data.vsp_cmd.sub_data.page[1] = iseries_hv_addr(pages[1]);
-        ev->event.data.vsp_cmd.sub_data.page[2] = iseries_hv_addr(pages[2]);
-        ev->event.data.vsp_cmd.sub_data.page[3] = iseries_hv_addr(pages[3]);
-        mb();
-        if (signal_event(ev) != 0)
-                return;
-
-        while (return_stuff.xDone != 1)
-                udelay(10);
-        if (return_stuff.xRc == 0)
-                memcpy(buffer, pages[0], size);
-        kfree(pages[0]);
-        kfree(pages[1]);
-        kfree(pages[2]);
-        kfree(pages[3]);
-}
-#endif
-
 static int mf_src_proc_show(struct seq_file *m, void *v)
 {
-#if 0
-        int len;
-
-        mf_getSrcHistory(page, count);
-        len = count;
-        len -= off;
-        if (len < count) {
-                *eof = 1;
-                if (len <= 0)
-                        return 0;
-        } else
-                len = count;
-        *start = page + off;
-        return len;
-#else
         return 0;
-#endif
 }
 
 static int mf_src_proc_open(struct inode *inode, struct file *file)
@@ -1249,6 +1187,7 @@ out:
 
 static const struct file_operations proc_vmlinux_operations = {
         .write          = proc_mf_change_vmlinux,
+        .llseek         = default_llseek,
 };
 
 static int __init mf_proc_init(void)
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index b0863410517f..c25a0815c26b 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -249,7 +249,7 @@ static unsigned long iSeries_process_mainstore_vpd(struct MemoryBlock *mb_array,
         unsigned long i;
         unsigned long mem_blocks = 0;
 
-        if (cpu_has_feature(CPU_FTR_SLB))
+        if (mmu_has_feature(MMU_FTR_SLB))
                 mem_blocks = iSeries_process_Regatta_mainstore_vpd(mb_array,
                                 max_entries);
         else
@@ -634,7 +634,7 @@ static int __init iseries_probe(void)
 
         hpte_init_iSeries();
         /* iSeries does not support 16M pages */
-        cur_cpu_spec->cpu_features &= ~CPU_FTR_16M_PAGE;
+        cur_cpu_spec->mmu_features &= ~MMU_FTR_16M_PAGE;
 
         return 1;
 }
@@ -680,10 +680,16 @@ void * __init iSeries_early_setup(void)
          * on but calling this function multiple times is fine.
          */
         identify_cpu(0, mfspr(SPRN_PVR));
+        initialise_paca(&boot_paca, 0);
 
         powerpc_firmware_features |= FW_FEATURE_ISERIES;
         powerpc_firmware_features |= FW_FEATURE_LPAR;
 
+#ifdef CONFIG_SMP
+        /* On iSeries we know we can never have more than 64 cpus */
+        nr_cpu_ids = max(nr_cpu_ids, 64);
+#endif
+
         iSeries_fixup_klimit();
 
         /*
diff --git a/arch/powerpc/platforms/iseries/smp.c b/arch/powerpc/platforms/iseries/smp.c
index 6590850045af..e3265adde5d3 100644
--- a/arch/powerpc/platforms/iseries/smp.c
+++ b/arch/powerpc/platforms/iseries/smp.c
@@ -42,57 +42,23 @@
 #include <asm/cputable.h>
 #include <asm/system.h>
 
-#include "smp.h"
-
-static unsigned long iSeries_smp_message[NR_CPUS];
-
-void iSeries_smp_message_recv(void)
-{
-        int cpu = smp_processor_id();
-        int msg;
-
-        if (num_online_cpus() < 2)
-                return;
-
-        for (msg = 0; msg < 4; msg++)
-                if (test_and_clear_bit(msg, &iSeries_smp_message[cpu]))
-                        smp_message_recv(msg);
-}
-
-static inline void smp_iSeries_do_message(int cpu, int msg)
+static void smp_iSeries_cause_ipi(int cpu, unsigned long data)
 {
-        set_bit(msg, &iSeries_smp_message[cpu]);
         HvCall_sendIPI(&(paca[cpu]));
 }
 
-static void smp_iSeries_message_pass(int target, int msg)
-{
-        int i;
-
-        if (target < NR_CPUS)
-                smp_iSeries_do_message(target, msg);
-        else {
-                for_each_online_cpu(i) {
-                        if ((target == MSG_ALL_BUT_SELF) &&
-                                        (i == smp_processor_id()))
-                                continue;
-                        smp_iSeries_do_message(i, msg);
-                }
-        }
-}
-
 static int smp_iSeries_probe(void)
 {
         return cpumask_weight(cpu_possible_mask);
 }
 
-static void smp_iSeries_kick_cpu(int nr)
+static int smp_iSeries_kick_cpu(int nr)
 {
         BUG_ON((nr < 0) || (nr >= NR_CPUS));
 
         /* Verify that our partition has a processor nr */
-        if (lppaca[nr].dyn_proc_status >= 2)
-                return;
+        if (lppaca_of(nr).dyn_proc_status >= 2)
+                return -ENOENT;
 
         /* The processor is currently spinning, waiting
          * for the cpu_start field to become non-zero
@@ -100,6 +66,8 @@ static void smp_iSeries_kick_cpu(int nr)
          * continue on to secondary_start in iSeries_head.S
          */
         paca[nr].cpu_start = 1;
+
+        return 0;
 }
 
 static void __devinit smp_iSeries_setup_cpu(int nr)
@@ -107,7 +75,8 @@ static void __devinit smp_iSeries_setup_cpu(int nr)
 }
 
 static struct smp_ops_t iSeries_smp_ops = {
-        .message_pass = smp_iSeries_message_pass,
+        .message_pass = smp_muxed_ipi_message_pass,
+        .cause_ipi    = smp_iSeries_cause_ipi,
         .probe        = smp_iSeries_probe,
         .kick_cpu     = smp_iSeries_kick_cpu,
         .setup_cpu    = smp_iSeries_setup_cpu,
diff --git a/arch/powerpc/platforms/iseries/smp.h b/arch/powerpc/platforms/iseries/smp.h
deleted file mode 100644
index d501f7de01e7..000000000000
--- a/arch/powerpc/platforms/iseries/smp.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _PLATFORMS_ISERIES_SMP_H
-#define _PLATFORMS_ISERIES_SMP_H
-
-extern void iSeries_smp_message_recv(void);
-
-#endif  /* _PLATFORMS_ISERIES_SMP_H */
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index b5f05d943a90..2376069cdc14 100644
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -396,7 +396,7 @@ static void vio_handleEvent(struct HvLpEvent *event)
                         viopathStatus[remoteLp].mTargetInst)) {
                         printk(VIOPATH_KERN_WARN
                                "message from invalid partition. "
-                               "int msg rcvd, source inst (%d) doesnt match (%d)\n",
+                               "int msg rcvd, source inst (%d) doesn't match (%d)\n",
                                viopathStatus[remoteLp].mTargetInst,
                                event->xSourceInstanceId);
                         return;
@@ -407,7 +407,7 @@ static void vio_handleEvent(struct HvLpEvent *event)
                         viopathStatus[remoteLp].mSourceInst)) {
                         printk(VIOPATH_KERN_WARN
                                "message from invalid partition. "
-                               "int msg rcvd, target inst (%d) doesnt match (%d)\n",
+                               "int msg rcvd, target inst (%d) doesn't match (%d)\n",
                                viopathStatus[remoteLp].mSourceInst,
                                event->xTargetInstanceId);
                         return;
@@ -418,7 +418,7 @@ static void vio_handleEvent(struct HvLpEvent *event)
                     viopathStatus[remoteLp].mSourceInst) {
                         printk(VIOPATH_KERN_WARN
                                "message from invalid partition. "
-                               "ack msg rcvd, source inst (%d) doesnt match (%d)\n",
+                               "ack msg rcvd, source inst (%d) doesn't match (%d)\n",
                                viopathStatus[remoteLp].mSourceInst,
                                event->xSourceInstanceId);
                         return;
@@ -428,7 +428,7 @@ static void vio_handleEvent(struct HvLpEvent *event)
                     viopathStatus[remoteLp].mTargetInst) {
                         printk(VIOPATH_KERN_WARN
                                "message from invalid partition. "
-                               "viopath: ack msg rcvd, target inst (%d) doesnt match (%d)\n",
+                               "viopath: ack msg rcvd, target inst (%d) doesn't match (%d)\n",
                                viopathStatus[remoteLp].mTargetInst,
                                event->xTargetInstanceId);
                         return;
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index 04296ffff8bf..dd2e48b28508 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -498,7 +498,7 @@ void __devinit maple_pci_irq_fixup(struct pci_dev *dev)
                 printk(KERN_DEBUG "Fixup U4 PCIe IRQ\n");
                 dev->irq = irq_create_mapping(NULL, 1);
                 if (dev->irq != NO_IRQ)
-                        set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);
+                        irq_set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);
         }
 
         /* Hide AMD8111 IDE interrupt when in legacy mode so
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index 3fff8d979b41..fe34c3d9bb74 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -358,6 +358,7 @@ static int __init maple_cpc925_edac_setup(void)
         model = (const unsigned char *)of_get_property(np, "model", NULL);
         if (!model) {
                 printk(KERN_ERR "%s: Unabel to get model info\n", __func__);
+                of_node_put(np);
                 return -ENODEV;
         }
 
diff --git a/arch/powerpc/platforms/pasemi/dma_lib.c b/arch/powerpc/platforms/pasemi/dma_lib.c
index 09695ae50f91..321a9b3a2d00 100644
--- a/arch/powerpc/platforms/pasemi/dma_lib.c
+++ b/arch/powerpc/platforms/pasemi/dma_lib.c
@@ -379,9 +379,9 @@ void pasemi_dma_free_buf(struct pasemi_dmachan *chan, int size,
 }
 EXPORT_SYMBOL(pasemi_dma_free_buf);
 
-/* pasemi_dma_alloc_flag - Allocate a flag (event) for channel syncronization
+/* pasemi_dma_alloc_flag - Allocate a flag (event) for channel synchronization
  *
- * Allocates a flag for use with channel syncronization (event descriptors).
+ * Allocates a flag for use with channel synchronization (event descriptors).
  * Returns allocated flag (0-63), < 0 on error.
  */
 int pasemi_dma_alloc_flag(void)
diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c
index a5d907b5a4c2..9886296e08da 100644
--- a/arch/powerpc/platforms/pasemi/gpio_mdio.c
+++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c
@@ -216,8 +216,7 @@ static int gpio_mdio_reset(struct mii_bus *bus)
 }
 
 
-static int __devinit gpio_mdio_probe(struct platform_device *ofdev,
-                                     const struct of_device_id *match)
+static int __devinit gpio_mdio_probe(struct platform_device *ofdev)
 {
         struct device *dev = &ofdev->dev;
         struct device_node *np = ofdev->dev.of_node;
@@ -299,7 +298,7 @@ static struct of_device_id gpio_mdio_match[] =
 };
 MODULE_DEVICE_TABLE(of, gpio_mdio_match);
 
-static struct of_platform_driver gpio_mdio_driver =
+static struct platform_driver gpio_mdio_driver =
 {
         .probe          = gpio_mdio_probe,
         .remove         = gpio_mdio_remove,
@@ -326,13 +325,13 @@ int gpio_mdio_init(void)
         if (!gpio_regs)
                 return -ENODEV;
 
-        return of_register_platform_driver(&gpio_mdio_driver);
+        return platform_driver_register(&gpio_mdio_driver);
 }
 module_init(gpio_mdio_init);
 
 void gpio_mdio_exit(void)
 {
-        of_unregister_platform_driver(&gpio_mdio_driver);
+        platform_driver_unregister(&gpio_mdio_driver);
         if (gpio_regs)
                 iounmap(gpio_regs);
 }
diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c
index 1f9fb2c57761..14943ef01918 100644
--- a/arch/powerpc/platforms/pasemi/iommu.c
+++ b/arch/powerpc/platforms/pasemi/iommu.c
@@ -156,20 +156,12 @@ static void iommu_table_iobmap_setup(void)
 
 static void pci_dma_bus_setup_pasemi(struct pci_bus *bus)
 {
-        struct device_node *dn;
-
         pr_debug("pci_dma_bus_setup, bus %p, bus->self %p\n", bus, bus->self);
 
         if (!iommu_table_iobmap_inited) {
                 iommu_table_iobmap_inited = 1;
                 iommu_table_iobmap_setup();
         }
-
-        dn = pci_bus_to_OF_node(bus);
-
-        if (dn)
-                PCI_DN(dn)->iommu_table = &iommu_table_iobmap;
-
 }
 
 
@@ -192,9 +184,6 @@ static void pci_dma_dev_setup_pasemi(struct pci_dev *dev)
         set_iommu_table_base(&dev->dev, &iommu_table_iobmap);
 }
 
-static void pci_dma_bus_setup_null(struct pci_bus *b) { }
-static void pci_dma_dev_setup_null(struct pci_dev *d) { }
-
 int __init iob_init(struct device_node *dn)
 {
         unsigned long tmp;
@@ -251,14 +240,8 @@ void __init iommu_init_early_pasemi(void)
         iommu_off = of_chosen &&
                         of_get_property(of_chosen, "linux,iommu-off", NULL);
 #endif
-        if (iommu_off) {
-                /* Direct I/O, IOMMU off */
-                ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_null;
-                ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_null;
-                set_pci_dma_ops(&dma_direct_ops);
-
+        if (iommu_off)
                 return;
-        }
 
         iob_init(NULL);
 
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c
index f372ec1691a3..7c858e6f843c 100644
--- a/arch/powerpc/platforms/pasemi/setup.c
+++ b/arch/powerpc/platforms/pasemi/setup.c
@@ -239,8 +239,8 @@ static __init void pas_init_IRQ(void)
         if (nmiprop) {
                 nmi_virq = irq_create_mapping(NULL, *nmiprop);
                 mpic_irq_set_priority(nmi_virq, 15);
-                set_irq_type(nmi_virq, IRQ_TYPE_EDGE_RISING);
-                mpic_unmask_irq(nmi_virq);
+                irq_set_irq_type(nmi_virq, IRQ_TYPE_EDGE_RISING);
+                mpic_unmask_irq(irq_get_irq_data(nmi_virq));
         }
 
         of_node_put(mpic_node);
@@ -266,7 +266,7 @@ static int pas_machine_check_handler(struct pt_regs *regs)
         if (nmi_virq != NO_IRQ && mpic_get_mcirq() == nmi_virq) {
                 printk(KERN_ERR "NMI delivered\n");
                 debugger(regs);
-                mpic_end_irq(nmi_virq);
+                mpic_end_irq(irq_get_irq_data(nmi_virq));
                 goto out;
         }
 
diff --git a/arch/powerpc/platforms/powermac/Kconfig b/arch/powerpc/platforms/powermac/Kconfig
index 1e1a0873e1dd..1afd10f67858 100644
--- a/arch/powerpc/platforms/powermac/Kconfig
+++ b/arch/powerpc/platforms/powermac/Kconfig
@@ -18,4 +18,13 @@ config PPC_PMAC64
         select PPC_970_NAP
         default y
 
-
+config PPC_PMAC32_PSURGE
+        bool "Support for powersurge upgrade cards" if EXPERT
+        depends on SMP && PPC32 && PPC_PMAC
+        select PPC_SMP_MUXED_IPI
+        default y
+        help
+          The powersurge cpu boards can be used in the generation
+          of powermacs that have a socket for an upgradeable cpu card,
+          including the 7500, 8500, 9500, 9600.  Support exists for
+          both dual and quad socket upgrade cards.
diff --git a/arch/powerpc/platforms/powermac/Makefile b/arch/powerpc/platforms/powermac/Makefile
index 50f169392551..ea47df66fee5 100644
--- a/arch/powerpc/platforms/powermac/Makefile
+++ b/arch/powerpc/platforms/powermac/Makefile
@@ -11,7 +11,7 @@ obj-y				+= pic.o setup.o time.o feature.o pci.o \
 obj-$(CONFIG_PMAC_BACKLIGHT)    += backlight.o
 obj-$(CONFIG_CPU_FREQ_PMAC)     += cpufreq_32.o
 obj-$(CONFIG_CPU_FREQ_PMAC64)   += cpufreq_64.o
-# CONFIG_NVRAM is an arch. independant tristate symbol, for pmac32 we really
+# CONFIG_NVRAM is an arch. independent tristate symbol, for pmac32 we really
 # need this to be a bool.  Cheat here and pretend CONFIG_NVRAM=m is really
 # CONFIG_NVRAM=y
 obj-$(CONFIG_NVRAM:m=y)         += nvram.o
diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c
index 415ca6d6b273..04af5f48b4eb 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_32.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_32.c
@@ -429,7 +429,7 @@ static u32 read_gpio(struct device_node *np)
         return offset;
 }
 
-static int pmac_cpufreq_suspend(struct cpufreq_policy *policy, pm_message_t pmsg)
+static int pmac_cpufreq_suspend(struct cpufreq_policy *policy)
 {
         /* Ok, this could be made a bit smarter, but let's be robust for now. We
          * always force a speed change to high speed before sleep, to make sure
diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c
index 480567e5fa9a..e9c8a607268e 100644
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
@@ -904,7 +904,7 @@ static void __init smu_i2c_probe(void)
         printk(KERN_INFO "SMU i2c %s\n", controller->full_name);
 
         /* Look for childs, note that they might not be of the right
-         * type as older device trees mix i2c busses and other thigns
+         * type as older device trees mix i2c busses and other things
          * at the same level
          */
         for (busnode = NULL;
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 3bc075c788ef..f33e08d573ce 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -299,7 +299,7 @@ static void __init setup_chaos(struct pci_controller *hose,
  * This function deals with some "special cases" devices.
  *
  *  0 -> No special case
- *  1 -> Skip the device but act as if the access was successfull
+ *  1 -> Skip the device but act as if the access was successful
  *       (return 0xff's on reads, eventually, cache config space
  *       accesses in a later version)
  * -1 -> Hide the device (unsuccessful access)
@@ -988,7 +988,7 @@ void __devinit pmac_pci_irq_fixup(struct pci_dev *dev)
             dev->vendor == PCI_VENDOR_ID_DEC &&
             dev->device == PCI_DEVICE_ID_DEC_TULIP_PLUS) {
                 dev->irq = irq_create_mapping(NULL, 60);
-                set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);
+                irq_set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);
         }
 #endif /* CONFIG_PPC32 */
 }
diff --git a/arch/powerpc/platforms/powermac/pfunc_core.c b/arch/powerpc/platforms/powermac/pfunc_core.c
index cec635942657..b0c3777528a1 100644
--- a/arch/powerpc/platforms/powermac/pfunc_core.c
+++ b/arch/powerpc/platforms/powermac/pfunc_core.c
@@ -837,8 +837,10 @@ struct pmf_function *__pmf_find_function(struct device_node *target,
                 return NULL;
  find_it:
         dev = pmf_find_device(actor);
-        if (dev == NULL)
-                return NULL;
+        if (dev == NULL) {
+                result = NULL;
+                goto out;
+        }
 
         list_for_each_entry(func, &dev->functions, link) {
                 if (name && strcmp(name, func->name))
@@ -850,8 +852,9 @@ struct pmf_function *__pmf_find_function(struct device_node *target,
                 result = func;
                 break;
         }
-        of_node_put(actor);
         pmf_put_device(dev);
+out:
+        of_node_put(actor);
         return result;
 }
 
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 890d5f72b198..7667db448aa7 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -21,7 +21,7 @@
 #include <linux/signal.h>
 #include <linux/pci.h>
 #include <linux/interrupt.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/adb.h>
 #include <linux/pmu.h>
 #include <linux/module.h>
@@ -82,9 +82,9 @@ static void __pmac_retrigger(unsigned int irq_nr)
         }
 }
 
-static void pmac_mask_and_ack_irq(unsigned int virq)
+static void pmac_mask_and_ack_irq(struct irq_data *d)
 {
-        unsigned int src = irq_map[virq].hwirq;
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long bit = 1UL << (src & 0x1f);
         int i = src >> 5;
         unsigned long flags;
@@ -104,9 +104,9 @@ static void pmac_mask_and_ack_irq(unsigned int virq)
         raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
 }
 
-static void pmac_ack_irq(unsigned int virq)
+static void pmac_ack_irq(struct irq_data *d)
 {
-        unsigned int src = irq_map[virq].hwirq;
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long bit = 1UL << (src & 0x1f);
         int i = src >> 5;
         unsigned long flags;
@@ -149,15 +149,15 @@ static void __pmac_set_irq_mask(unsigned int irq_nr, int nokicklost)
 /* When an irq gets requested for the first client, if it's an
  * edge interrupt, we clear any previous one on the controller
  */
-static unsigned int pmac_startup_irq(unsigned int virq)
+static unsigned int pmac_startup_irq(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int src = irq_map[virq].hwirq;
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long bit = 1UL << (src & 0x1f);
         int i = src >> 5;
 
         raw_spin_lock_irqsave(&pmac_pic_lock, flags);
-        if ((irq_to_desc(virq)->status & IRQ_LEVEL) == 0)
+        if (!irqd_is_level_type(d))
                 out_le32(&pmac_irq_hw[i]->ack, bit);
         __set_bit(src, ppc_cached_irq_mask);
         __pmac_set_irq_mask(src, 0);
@@ -166,10 +166,10 @@ static unsigned int pmac_startup_irq(unsigned int virq)
         return 0;
 }
 
-static void pmac_mask_irq(unsigned int virq)
+static void pmac_mask_irq(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int src = irq_map[virq].hwirq;
+        unsigned int src = irqd_to_hwirq(d);
 
         raw_spin_lock_irqsave(&pmac_pic_lock, flags);
         __clear_bit(src, ppc_cached_irq_mask);
@@ -177,10 +177,10 @@ static void pmac_mask_irq(unsigned int virq)
         raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
 }
 
-static void pmac_unmask_irq(unsigned int virq)
+static void pmac_unmask_irq(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int src = irq_map[virq].hwirq;
+        unsigned int src = irqd_to_hwirq(d);
 
         raw_spin_lock_irqsave(&pmac_pic_lock, flags);
         __set_bit(src, ppc_cached_irq_mask);
@@ -188,24 +188,24 @@ static void pmac_unmask_irq(unsigned int virq)
         raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
 }
 
-static int pmac_retrigger(unsigned int virq)
+static int pmac_retrigger(struct irq_data *d)
 {
         unsigned long flags;
 
         raw_spin_lock_irqsave(&pmac_pic_lock, flags);
-        __pmac_retrigger(irq_map[virq].hwirq);
+        __pmac_retrigger(irqd_to_hwirq(d));
         raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
         return 1;
 }
 
 static struct irq_chip pmac_pic = {
         .name           = "PMAC-PIC",
-        .startup        = pmac_startup_irq,
-        .mask           = pmac_mask_irq,
-        .ack            = pmac_ack_irq,
-        .mask_ack       = pmac_mask_and_ack_irq,
-        .unmask         = pmac_unmask_irq,
-        .retrigger      = pmac_retrigger,
+        .irq_startup    = pmac_startup_irq,
+        .irq_mask       = pmac_mask_irq,
+        .irq_ack        = pmac_ack_irq,
+        .irq_mask_ack   = pmac_mask_and_ack_irq,
+        .irq_unmask     = pmac_unmask_irq,
+        .irq_retrigger  = pmac_retrigger,
 };
 
 static irqreturn_t gatwick_action(int cpl, void *dev_id)
@@ -239,15 +239,12 @@ static unsigned int pmac_pic_get_irq(void)
         unsigned long bits = 0;
         unsigned long flags;
 
-#ifdef CONFIG_SMP
-        void psurge_smp_message_recv(void);
-
-        /* IPI's are a hack on the powersurge -- Cort */
-        if ( smp_processor_id() != 0 ) {
-                psurge_smp_message_recv();
-                return NO_IRQ_IGNORE;   /* ignore, already handled */
+#ifdef CONFIG_PPC_PMAC32_PSURGE
+        /* IPI's are a hack on the powersurge -- Cort */
+        if (smp_processor_id() != 0) {
+                return  psurge_secondary_virq;
         }
-#endif /* CONFIG_SMP */
+#endif /* CONFIG_PPC_PMAC32_PSURGE */
         raw_spin_lock_irqsave(&pmac_pic_lock, flags);
         for (irq = max_real_irqs; (irq -= 32) >= 0; ) {
                 int i = irq >> 5;
@@ -289,7 +286,6 @@ static int pmac_pic_host_match(struct irq_host *h, struct device_node *node)
 static int pmac_pic_host_map(struct irq_host *h, unsigned int virq,
                              irq_hw_number_t hw)
 {
-        struct irq_desc *desc = irq_to_desc(virq);
         int level;
 
         if (hw >= max_irqs)
@@ -300,9 +296,9 @@ static int pmac_pic_host_map(struct irq_host *h, unsigned int virq,
          */
         level = !!(level_mask[hw >> 5] & (1UL << (hw & 0x1f)));
         if (level)
-                desc->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, &pmac_pic, level ?
-                                 handle_level_irq : handle_edge_irq);
+                irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &pmac_pic,
+                                 level ? handle_level_irq : handle_edge_irq);
         return 0;
 }
 
@@ -472,12 +468,14 @@ int of_irq_map_oldworld(struct device_node *device, int index,
 
 static void pmac_u3_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct mpic *mpic = desc->handler_data;
-
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        struct mpic *mpic = irq_desc_get_handler_data(desc);
         unsigned int cascade_irq = mpic_get_one_irq(mpic);
+
         if (cascade_irq != NO_IRQ)
                 generic_handle_irq(cascade_irq);
-        desc->chip->eoi(irq);
+
+        chip->irq_eoi(&desc->irq_data);
 }
 
 static void __init pmac_pic_setup_mpic_nmi(struct mpic *mpic)
@@ -589,8 +587,8 @@ static int __init pmac_pic_probe_mpic(void)
                 of_node_put(slave);
                 return 0;
         }
-        set_irq_data(cascade, mpic2);
-        set_irq_chained_handler(cascade, pmac_u3_cascade);
+        irq_set_handler_data(cascade, mpic2);
+        irq_set_chained_handler(cascade, pmac_u3_cascade);
 
         of_node_put(slave);
         return 0;
@@ -676,7 +674,7 @@ not_found:
         return viaint;
 }
 
-static int pmacpic_suspend(struct sys_device *sysdev, pm_message_t state)
+static int pmacpic_suspend(void)
 {
         int viaint = pmacpic_find_viaint();
 
@@ -697,7 +695,7 @@ static int pmacpic_suspend(struct sys_device *sysdev, pm_message_t state)
         return 0;
 }
 
-static int pmacpic_resume(struct sys_device *sysdev)
+static void pmacpic_resume(void)
 {
         int i;
 
@@ -707,40 +705,21 @@ static int pmacpic_resume(struct sys_device *sysdev)
         mb();
         for (i = 0; i < max_real_irqs; ++i)
                 if (test_bit(i, sleep_save_mask))
-                        pmac_unmask_irq(i);
-
-        return 0;
+                        pmac_unmask_irq(irq_get_irq_data(i));
 }
 
-#endif /* CONFIG_PM && CONFIG_PPC32 */
-
-static struct sysdev_class pmacpic_sysclass = {
-        .name = "pmac_pic",
-};
-
-static struct sys_device device_pmacpic = {
-        .id             = 0,
-        .cls            = &pmacpic_sysclass,
+static struct syscore_ops pmacpic_syscore_ops = {
+        .suspend        = pmacpic_suspend,
+        .resume         = pmacpic_resume,
 };
 
-static struct sysdev_driver driver_pmacpic = {
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
-        .suspend        = &pmacpic_suspend,
-        .resume         = &pmacpic_resume,
-#endif /* CONFIG_PM && CONFIG_PPC32 */
-};
-
-static int __init init_pmacpic_sysfs(void)
+static int __init init_pmacpic_syscore(void)
 {
-#ifdef CONFIG_PPC32
-        if (max_irqs == 0)
-                return -ENODEV;
-#endif
-        printk(KERN_DEBUG "Registering pmac pic with sysfs...\n");
-        sysdev_class_register(&pmacpic_sysclass);
-        sysdev_register(&device_pmacpic);
-        sysdev_driver_register(&pmacpic_sysclass, &driver_pmacpic);
+        if (pmac_irq_hw[0])
+                register_syscore_ops(&pmacpic_syscore_ops);
         return 0;
 }
-machine_subsys_initcall(powermac, init_pmacpic_sysfs);
 
+machine_subsys_initcall(powermac, init_pmacpic_syscore);
+
+#endif /* CONFIG_PM && CONFIG_PPC32 */
diff --git a/arch/powerpc/platforms/powermac/pic.h b/arch/powerpc/platforms/powermac/pic.h
deleted file mode 100644
index d622a8345aaa..000000000000
--- a/arch/powerpc/platforms/powermac/pic.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __PPC_PLATFORMS_PMAC_PIC_H
-#define __PPC_PLATFORMS_PMAC_PIC_H
-
-#include <linux/irq.h>
-
-extern struct irq_chip pmac_pic;
-
-extern void pmac_pic_init(void);
-extern int pmac_get_irq(void);
-
-#endif /* __PPC_PLATFORMS_PMAC_PIC_H */
diff --git a/arch/powerpc/platforms/powermac/pmac.h b/arch/powerpc/platforms/powermac/pmac.h
index f0bc08f6c1f0..8327cce2bdb0 100644
--- a/arch/powerpc/platforms/powermac/pmac.h
+++ b/arch/powerpc/platforms/powermac/pmac.h
@@ -33,7 +33,7 @@ extern void pmac_setup_pci_dma(void);
 extern void pmac_check_ht_link(void);
 
 extern void pmac_setup_smp(void);
-extern void pmac32_cpu_die(void);
+extern int psurge_secondary_virq;
 extern void low_cpu_die(void) __attribute__((noreturn));
 
 extern int pmac_nvram_init(void);
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 9deb274841f1..aa45281bd296 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -506,6 +506,15 @@ static int __init pmac_declare_of_platform_devices(void)
                 of_platform_device_create(np, "smu", NULL);
                 of_node_put(np);
         }
+        np = of_find_node_by_type(NULL, "fcu");
+        if (np == NULL) {
+                /* Some machines have strangely broken device-tree */
+                np = of_find_node_by_path("/u3@0,f8000000/i2c@f8001000/fan@15e");
+        }
+        if (np) {
+                of_platform_device_create(np, "temperature", NULL);
+                of_node_put(np);
+        }
 
         return 0;
 }
@@ -641,51 +650,6 @@ static int pmac_pci_probe_mode(struct pci_bus *bus)
                 return PCI_PROBE_NORMAL;
         return PCI_PROBE_DEVTREE;
 }
-
-#ifdef CONFIG_HOTPLUG_CPU
-/* access per cpu vars from generic smp.c */
-DECLARE_PER_CPU(int, cpu_state);
-
-static void pmac64_cpu_die(void)
-{
-        /*
-         * turn off as much as possible, we'll be
-         * kicked out as this will only be invoked
-         * on core99 platforms for now ...
-         */
-
-        printk(KERN_INFO "CPU#%d offline\n", smp_processor_id());
-        __get_cpu_var(cpu_state) = CPU_DEAD;
-        smp_wmb();
-
-        /*
-         * during the path that leads here preemption is disabled,
-         * reenable it now so that when coming up preempt count is
-         * zero correctly
-         */
-        preempt_enable();
-
-        /*
-         * hard-disable interrupts for the non-NAP case, the NAP code
-         * needs to re-enable interrupts (but soft-disables them)
-         */
-        hard_irq_disable();
-
-        while (1) {
-                /* let's not take timer interrupts too often ... */
-                set_dec(0x7fffffff);
-
-                /* should always be true at this point */
-                if (cpu_has_feature(CPU_FTR_CAN_NAP))
-                        power4_cpu_offline_powersave();
-                else {
-                        HMT_low();
-                        HMT_very_low();
-                }
-        }
-}
-#endif /* CONFIG_HOTPLUG_CPU */
-
 #endif /* CONFIG_PPC64 */
 
 define_machine(powermac) {
@@ -717,15 +681,4 @@ define_machine(powermac) {
         .pcibios_after_init     = pmac_pcibios_after_init,
         .phys_mem_access_prot   = pci_phys_mem_access_prot,
 #endif
-#ifdef CONFIG_HOTPLUG_CPU
-#ifdef CONFIG_PPC64
-        .cpu_die                = pmac64_cpu_die,
-#endif
-#ifdef CONFIG_PPC32
-        .cpu_die                = pmac32_cpu_die,
-#endif
-#endif
-#if defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_PPC32)
-        .cpu_die                = generic_mach_cpu_die,
-#endif
 };
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index c95215f4f8b6..db092d7c4c5b 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -70,7 +70,7 @@ static void (*pmac_tb_freeze)(int freeze);
 static u64 timebase;
 static int tb_req;
 
-#ifdef CONFIG_PPC32
+#ifdef CONFIG_PPC_PMAC32_PSURGE
 
 /*
  * Powersurge (old powermac SMP) support.
@@ -124,6 +124,10 @@ static volatile u32 __iomem *psurge_start;
 /* what sort of powersurge board we have */
 static int psurge_type = PSURGE_NONE;
 
+/* irq for secondary cpus to report */
+static struct irq_host *psurge_host;
+int psurge_secondary_virq;
+
 /*
  * Set and clear IPIs for powersurge.
  */
@@ -156,51 +160,52 @@ static inline void psurge_clr_ipi(int cpu)
 /*
  * On powersurge (old SMP powermac architecture) we don't have
  * separate IPIs for separate messages like openpic does.  Instead
- * we have a bitmap for each processor, where a 1 bit means that
- * the corresponding message is pending for that processor.
- * Ideally each cpu's entry would be in a different cache line.
+ * use the generic demux helpers
  *  -- paulus.
  */
-static unsigned long psurge_smp_message[NR_CPUS];
-
-void psurge_smp_message_recv(void)
+static irqreturn_t psurge_ipi_intr(int irq, void *d)
 {
-        int cpu = smp_processor_id();
-        int msg;
-
-        /* clear interrupt */
-        psurge_clr_ipi(cpu);
+        psurge_clr_ipi(smp_processor_id());
+        smp_ipi_demux();
 
-        if (num_online_cpus() < 2)
-                return;
+        return IRQ_HANDLED;
+}
 
-        /* make sure there is a message there */
-        for (msg = 0; msg < 4; msg++)
-                if (test_and_clear_bit(msg, &psurge_smp_message[cpu]))
-                        smp_message_recv(msg);
+static void smp_psurge_cause_ipi(int cpu, unsigned long data)
+{
+        psurge_set_ipi(cpu);
 }
 
-irqreturn_t psurge_primary_intr(int irq, void *d)
+static int psurge_host_map(struct irq_host *h, unsigned int virq,
+                         irq_hw_number_t hw)
 {
-        psurge_smp_message_recv();
-        return IRQ_HANDLED;
+        irq_set_chip_and_handler(virq, &dummy_irq_chip, handle_percpu_irq);
+
+        return 0;
 }
 
-static void smp_psurge_message_pass(int target, int msg)
+struct irq_host_ops psurge_host_ops = {
+        .map    = psurge_host_map,
+};
+
+static int psurge_secondary_ipi_init(void)
 {
-        int i;
+        int rc = -ENOMEM;
 
-        if (num_online_cpus() < 2)
-                return;
+        psurge_host = irq_alloc_host(NULL, IRQ_HOST_MAP_NOMAP, 0,
+                &psurge_host_ops, 0);
 
-        for_each_online_cpu(i) {
-                if (target == MSG_ALL
-                    || (target == MSG_ALL_BUT_SELF && i != smp_processor_id())
-                    || target == i) {
-                        set_bit(msg, &psurge_smp_message[i]);
-                        psurge_set_ipi(i);
-                }
-        }
+        if (psurge_host)
+                psurge_secondary_virq = irq_create_direct_mapping(psurge_host);
+
+        if (psurge_secondary_virq)
+                rc = request_irq(psurge_secondary_virq, psurge_ipi_intr,
+                        IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL);
+
+        if (rc)
+                pr_err("Failed to setup secondary cpu IPI\n");
+
+        return rc;
 }
 
 /*
@@ -311,6 +316,9 @@ static int __init smp_psurge_probe(void)
                 ncpus = 2;
         }
 
+        if (psurge_secondary_ipi_init())
+                return 1;
+
         psurge_start = ioremap(PSURGE_START, 4);
         psurge_pri_intr = ioremap(PSURGE_PRI_INTR, 4);
 
@@ -329,7 +337,7 @@ static int __init smp_psurge_probe(void)
         return ncpus;
 }
 
-static void __init smp_psurge_kick_cpu(int nr)
+static int __init smp_psurge_kick_cpu(int nr)
 {
         unsigned long start = __pa(__secondary_start_pmac_0) + nr * 8;
         unsigned long a, flags;
@@ -394,11 +402,13 @@ static void __init smp_psurge_kick_cpu(int nr)
                 psurge_set_ipi(1);
 
         if (ppc_md.progress) ppc_md.progress("smp_psurge_kick_cpu - done", 0x354);
+
+        return 0;
 }
 
 static struct irqaction psurge_irqaction = {
-        .handler = psurge_primary_intr,
-        .flags = IRQF_DISABLED,
+        .handler = psurge_ipi_intr,
+        .flags = IRQF_DISABLED|IRQF_PERCPU,
         .name = "primary IPI",
 };
 
@@ -437,14 +447,15 @@ void __init smp_psurge_give_timebase(void)
 
 /* PowerSurge-style Macs */
 struct smp_ops_t psurge_smp_ops = {
-        .message_pass   = smp_psurge_message_pass,
+        .message_pass   = smp_muxed_ipi_message_pass,
+        .cause_ipi      = smp_psurge_cause_ipi,
         .probe          = smp_psurge_probe,
         .kick_cpu       = smp_psurge_kick_cpu,
         .setup_cpu      = smp_psurge_setup_cpu,
         .give_timebase  = smp_psurge_give_timebase,
         .take_timebase  = smp_psurge_take_timebase,
 };
-#endif /* CONFIG_PPC32 - actually powersurge support */
+#endif /* CONFIG_PPC_PMAC32_PSURGE */
 
 /*
  * Core 99 and later support
@@ -791,14 +802,14 @@ static int __init smp_core99_probe(void)
         return ncpus;
 }
 
-static void __devinit smp_core99_kick_cpu(int nr)
+static int __devinit smp_core99_kick_cpu(int nr)
 {
         unsigned int save_vector;
         unsigned long target, flags;
         unsigned int *vector = (unsigned int *)(PAGE_OFFSET+0x100);
 
         if (nr < 0 || nr > 3)
-                return;
+                return -ENOENT;
 
         if (ppc_md.progress)
                 ppc_md.progress("smp_core99_kick_cpu", 0x346);
@@ -830,6 +841,8 @@ static void __devinit smp_core99_kick_cpu(int nr)
 
         local_irq_restore(flags);
         if (ppc_md.progress) ppc_md.progress("smp_core99_kick_cpu done", 0x347);
+
+        return 0;
 }
 
 static void __devinit smp_core99_setup_cpu(int cpu_nr)
@@ -840,92 +853,151 @@ static void __devinit smp_core99_setup_cpu(int cpu_nr)
 
         /* Setup openpic */
         mpic_setup_this_cpu();
+}
 
-        if (cpu_nr == 0) {
 #ifdef CONFIG_PPC64
-                extern void g5_phy_disable_cpu1(void);
+#ifdef CONFIG_HOTPLUG_CPU
+static int smp_core99_cpu_notify(struct notifier_block *self,
+                                 unsigned long action, void *hcpu)
+{
+        int rc;
 
-                /* Close i2c bus if it was used for tb sync */
+        switch(action) {
+        case CPU_UP_PREPARE:
+        case CPU_UP_PREPARE_FROZEN:
+                /* Open i2c bus if it was used for tb sync */
                 if (pmac_tb_clock_chip_host) {
-                        pmac_i2c_close(pmac_tb_clock_chip_host);
-                        pmac_tb_clock_chip_host = NULL;
+                        rc = pmac_i2c_open(pmac_tb_clock_chip_host, 1);
+                        if (rc) {
+                                pr_err("Failed to open i2c bus for time sync\n");
+                                return notifier_from_errno(rc);
+                        }
                 }
+                break;
+        case CPU_ONLINE:
+        case CPU_UP_CANCELED:
+                /* Close i2c bus if it was used for tb sync */
+                if (pmac_tb_clock_chip_host)
+                        pmac_i2c_close(pmac_tb_clock_chip_host);
+                break;
+        default:
+                break;
+        }
+        return NOTIFY_OK;
+}
 
-                /* If we didn't start the second CPU, we must take
-                 * it off the bus
-                 */
-                if (of_machine_is_compatible("MacRISC4") &&
-                    num_online_cpus() < 2)              
-                        g5_phy_disable_cpu1();
-#endif /* CONFIG_PPC64 */
+static struct notifier_block __cpuinitdata smp_core99_cpu_nb = {
+        .notifier_call  = smp_core99_cpu_notify,
+};
+#endif /* CONFIG_HOTPLUG_CPU */
+
+static void __init smp_core99_bringup_done(void)
+{
+        extern void g5_phy_disable_cpu1(void);
 
-                if (ppc_md.progress)
-                        ppc_md.progress("core99_setup_cpu 0 done", 0x349);
+        /* Close i2c bus if it was used for tb sync */
+        if (pmac_tb_clock_chip_host)
+                pmac_i2c_close(pmac_tb_clock_chip_host);
+
+        /* If we didn't start the second CPU, we must take
+         * it off the bus.
+         */
+        if (of_machine_is_compatible("MacRISC4") &&
+            num_online_cpus() < 2) {
+                set_cpu_present(1, false);
+                g5_phy_disable_cpu1();
         }
-}
+#ifdef CONFIG_HOTPLUG_CPU
+        register_cpu_notifier(&smp_core99_cpu_nb);
+#endif
 
+        if (ppc_md.progress)
+                ppc_md.progress("smp_core99_bringup_done", 0x349);
+}
+#endif /* CONFIG_PPC64 */
 
-#if defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_PPC32)
+#ifdef CONFIG_HOTPLUG_CPU
 
-int smp_core99_cpu_disable(void)
+static int smp_core99_cpu_disable(void)
 {
-        set_cpu_online(smp_processor_id(), false);
+        int rc = generic_cpu_disable();
+        if (rc)
+                return rc;
 
-        /* XXX reset cpu affinity here */
         mpic_cpu_set_priority(0xf);
-        asm volatile("mtdec %0" : : "r" (0x7fffffff));
-        mb();
-        udelay(20);
-        asm volatile("mtdec %0" : : "r" (0x7fffffff));
+
         return 0;
 }
 
-static int cpu_dead[NR_CPUS];
+#ifdef CONFIG_PPC32
 
-void pmac32_cpu_die(void)
+static void pmac_cpu_die(void)
 {
+        int cpu = smp_processor_id();
+
         local_irq_disable();
-        cpu_dead[smp_processor_id()] = 1;
+        idle_task_exit();
+        pr_debug("CPU%d offline\n", cpu);
+        generic_set_cpu_dead(cpu);
+        smp_wmb();
         mb();
         low_cpu_die();
 }
 
-void smp_core99_cpu_die(unsigned int cpu)
+#else /* CONFIG_PPC32 */
+
+static void pmac_cpu_die(void)
 {
-        int timeout;
+        int cpu = smp_processor_id();
 
-        timeout = 1000;
-        while (!cpu_dead[cpu]) {
-                if (--timeout == 0) {
-                        printk("CPU %u refused to die!\n", cpu);
-                        break;
-                }
-                msleep(1);
+        local_irq_disable();
+        idle_task_exit();
+
+        /*
+         * turn off as much as possible, we'll be
+         * kicked out as this will only be invoked
+         * on core99 platforms for now ...
+         */
+
+        printk(KERN_INFO "CPU#%d offline\n", cpu);
+        generic_set_cpu_dead(cpu);
+        smp_wmb();
+
+        /*
+         * Re-enable interrupts. The NAP code needs to enable them
+         * anyways, do it now so we deal with the case where one already
+         * happened while soft-disabled.
+         * We shouldn't get any external interrupts, only decrementer, and the
+         * decrementer handler is safe for use on offline CPUs
+         */
+        local_irq_enable();
+
+        while (1) {
+                /* let's not take timer interrupts too often ... */
+                set_dec(0x7fffffff);
+
+                /* Enter NAP mode */
+                power4_idle();
         }
-        cpu_dead[cpu] = 0;
 }
 
-#endif /* CONFIG_HOTPLUG_CPU && CONFIG_PP32 */
+#endif /* else CONFIG_PPC32 */
+#endif /* CONFIG_HOTPLUG_CPU */
 
 /* Core99 Macs (dual G4s and G5s) */
 struct smp_ops_t core99_smp_ops = {
         .message_pass   = smp_mpic_message_pass,
         .probe          = smp_core99_probe,
+#ifdef CONFIG_PPC64
+        .bringup_done   = smp_core99_bringup_done,
+#endif
         .kick_cpu       = smp_core99_kick_cpu,
         .setup_cpu      = smp_core99_setup_cpu,
         .give_timebase  = smp_core99_give_timebase,
         .take_timebase  = smp_core99_take_timebase,
 #if defined(CONFIG_HOTPLUG_CPU)
-# if defined(CONFIG_PPC32)
         .cpu_disable    = smp_core99_cpu_disable,
-        .cpu_die        = smp_core99_cpu_die,
-# endif
-# if defined(CONFIG_PPC64)
-        .cpu_disable    = generic_cpu_disable,
         .cpu_die        = generic_cpu_die,
-        /* intentionally do *NOT* assign cpu_enable,
-         * the generic code will use kick_cpu then! */
-# endif
 #endif
 };
 
@@ -943,7 +1015,7 @@ void __init pmac_setup_smp(void)
                 of_node_put(np);
                 smp_ops = &core99_smp_ops;
         }
-#ifdef CONFIG_PPC32
+#ifdef CONFIG_PPC_PMAC32_PSURGE
         else {
                 /* We have to set bits in cpu_possible_mask here since the
                  * secondary CPU(s) aren't in the device tree. Various
@@ -956,6 +1028,11 @@ void __init pmac_setup_smp(void)
                         set_cpu_possible(cpu, true);
                 smp_ops = &psurge_smp_ops;
         }
-#endif /* CONFIG_PPC32 */
+#endif /* CONFIG_PPC_PMAC32_PSURGE */
+
+#ifdef CONFIG_HOTPLUG_CPU
+        ppc_md.cpu_die = pmac_cpu_die;
+#endif
 }
 
+
diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
index b341018326df..6c4b5837fc8a 100644
--- a/arch/powerpc/platforms/ps3/device-init.c
+++ b/arch/powerpc/platforms/ps3/device-init.c
@@ -566,10 +566,10 @@ static int ps3_setup_dynamic_device(const struct ps3_repository_device *repo)
         case PS3_DEV_TYPE_STOR_DISK:
                 result = ps3_setup_storage_dev(repo, PS3_MATCH_ID_STOR_DISK);
 
-                /* Some devices are not accessable from the Other OS lpar. */
+                /* Some devices are not accessible from the Other OS lpar. */
                 if (result == -ENODEV) {
                         result = 0;
-                        pr_debug("%s:%u: not accessable\n", __func__,
+                        pr_debug("%s:%u: not accessible\n", __func__,
                                  __LINE__);
                 }
 
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c
index 59d9712d7364..600ed2c0ed59 100644
--- a/arch/powerpc/platforms/ps3/interrupt.c
+++ b/arch/powerpc/platforms/ps3/interrupt.c
@@ -44,7 +44,7 @@
  * @lock:
  * @ipi_debug_brk_mask:
  *
- * The HV mantains per SMT thread mappings of HV outlet to HV plug on
+ * The HV maintains per SMT thread mappings of HV outlet to HV plug on
  * behalf of the guest.  These mappings are implemented as 256 bit guest
  * supplied bitmaps indexed by plug number.  The addresses of the bitmaps
  * are registered with the HV through lv1_configure_irq_state_bitmap().
@@ -99,16 +99,16 @@ static DEFINE_PER_CPU(struct ps3_private, ps3_private);
  * Sets ps3_bmp.mask and calls lv1_did_update_interrupt_mask().
  */
 
-static void ps3_chip_mask(unsigned int virq)
+static void ps3_chip_mask(struct irq_data *d)
 {
-        struct ps3_private *pd = get_irq_chip_data(virq);
+        struct ps3_private *pd = irq_data_get_irq_chip_data(d);
         unsigned long flags;
 
         pr_debug("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__,
-                pd->thread_id, virq);
+                pd->thread_id, d->irq);
 
         local_irq_save(flags);
-        clear_bit(63 - virq, &pd->bmp.mask);
+        clear_bit(63 - d->irq, &pd->bmp.mask);
         lv1_did_update_interrupt_mask(pd->ppe_id, pd->thread_id);
         local_irq_restore(flags);
 }
@@ -120,16 +120,16 @@ static void ps3_chip_mask(unsigned int virq)
  * Clears ps3_bmp.mask and calls lv1_did_update_interrupt_mask().
  */
 
-static void ps3_chip_unmask(unsigned int virq)
+static void ps3_chip_unmask(struct irq_data *d)
 {
-        struct ps3_private *pd = get_irq_chip_data(virq);
+        struct ps3_private *pd = irq_data_get_irq_chip_data(d);
         unsigned long flags;
 
         pr_debug("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__,
-                pd->thread_id, virq);
+                pd->thread_id, d->irq);
 
         local_irq_save(flags);
-        set_bit(63 - virq, &pd->bmp.mask);
+        set_bit(63 - d->irq, &pd->bmp.mask);
         lv1_did_update_interrupt_mask(pd->ppe_id, pd->thread_id);
         local_irq_restore(flags);
 }
@@ -141,10 +141,10 @@ static void ps3_chip_unmask(unsigned int virq)
  * Calls lv1_end_of_interrupt_ext().
  */
 
-static void ps3_chip_eoi(unsigned int virq)
+static void ps3_chip_eoi(struct irq_data *d)
 {
-        const struct ps3_private *pd = get_irq_chip_data(virq);
-        lv1_end_of_interrupt_ext(pd->ppe_id, pd->thread_id, virq);
+        const struct ps3_private *pd = irq_data_get_irq_chip_data(d);
+        lv1_end_of_interrupt_ext(pd->ppe_id, pd->thread_id, d->irq);
 }
 
 /**
@@ -153,9 +153,9 @@ static void ps3_chip_eoi(unsigned int virq)
 
 static struct irq_chip ps3_irq_chip = {
         .name = "ps3",
-        .mask = ps3_chip_mask,
-        .unmask = ps3_chip_unmask,
-        .eoi = ps3_chip_eoi,
+        .irq_mask = ps3_chip_mask,
+        .irq_unmask = ps3_chip_unmask,
+        .irq_eoi = ps3_chip_eoi,
 };
 
 /**
@@ -194,15 +194,15 @@ static int ps3_virq_setup(enum ps3_cpu_binding cpu, unsigned long outlet,
         pr_debug("%s:%d: outlet %lu => cpu %u, virq %u\n", __func__, __LINE__,
                 outlet, cpu, *virq);
 
-        result = set_irq_chip_data(*virq, pd);
+        result = irq_set_chip_data(*virq, pd);
 
         if (result) {
-                pr_debug("%s:%d: set_irq_chip_data failed\n",
+                pr_debug("%s:%d: irq_set_chip_data failed\n",
                         __func__, __LINE__);
                 goto fail_set;
         }
 
-        ps3_chip_mask(*virq);
+        ps3_chip_mask(irq_get_irq_data(*virq));
 
         return result;
 
@@ -221,12 +221,12 @@ fail_create:
 
 static int ps3_virq_destroy(unsigned int virq)
 {
-        const struct ps3_private *pd = get_irq_chip_data(virq);
+        const struct ps3_private *pd = irq_get_chip_data(virq);
 
         pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,
                 __LINE__, pd->ppe_id, pd->thread_id, virq);
 
-        set_irq_chip_data(virq, NULL);
+        irq_set_chip_data(virq, NULL);
         irq_dispose_mapping(virq);
 
         pr_debug("%s:%d <-\n", __func__, __LINE__);
@@ -256,7 +256,7 @@ int ps3_irq_plug_setup(enum ps3_cpu_binding cpu, unsigned long outlet,
                 goto fail_setup;
         }
 
-        pd = get_irq_chip_data(*virq);
+        pd = irq_get_chip_data(*virq);
 
         /* Binds outlet to cpu + virq. */
 
@@ -291,12 +291,12 @@ EXPORT_SYMBOL_GPL(ps3_irq_plug_setup);
 int ps3_irq_plug_destroy(unsigned int virq)
 {
         int result;
-        const struct ps3_private *pd = get_irq_chip_data(virq);
+        const struct ps3_private *pd = irq_get_chip_data(virq);
 
         pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,
                 __LINE__, pd->ppe_id, pd->thread_id, virq);
 
-        ps3_chip_mask(virq);
+        ps3_chip_mask(irq_get_irq_data(virq));
 
         result = lv1_disconnect_irq_plug_ext(pd->ppe_id, pd->thread_id, virq);
 
@@ -357,7 +357,7 @@ int ps3_event_receive_port_destroy(unsigned int virq)
 
         pr_debug(" -> %s:%d virq %u\n", __func__, __LINE__, virq);
 
-        ps3_chip_mask(virq);
+        ps3_chip_mask(irq_get_irq_data(virq));
 
         result = lv1_destruct_event_receive_port(virq_to_hw(virq));
 
@@ -492,7 +492,7 @@ int ps3_io_irq_destroy(unsigned int virq)
         int result;
         unsigned long outlet = virq_to_hw(virq);
 
-        ps3_chip_mask(virq);
+        ps3_chip_mask(irq_get_irq_data(virq));
 
         /*
          * lv1_destruct_io_irq_outlet() will destroy the IRQ plug,
@@ -553,7 +553,7 @@ int ps3_vuart_irq_destroy(unsigned int virq)
 {
         int result;
 
-        ps3_chip_mask(virq);
+        ps3_chip_mask(irq_get_irq_data(virq));
         result = lv1_deconfigure_virtual_uart_irq();
 
         if (result) {
@@ -605,7 +605,7 @@ int ps3_spe_irq_destroy(unsigned int virq)
 {
         int result;
 
-        ps3_chip_mask(virq);
+        ps3_chip_mask(irq_get_irq_data(virq));
 
         result = ps3_irq_plug_destroy(virq);
         BUG_ON(result);
@@ -659,18 +659,13 @@ static void __maybe_unused _dump_mask(struct ps3_private *pd,
 static void dump_bmp(struct ps3_private* pd) {};
 #endif /* defined(DEBUG) */
 
-static void ps3_host_unmap(struct irq_host *h, unsigned int virq)
-{
-        set_irq_chip_data(virq, NULL);
-}
-
 static int ps3_host_map(struct irq_host *h, unsigned int virq,
         irq_hw_number_t hwirq)
 {
         pr_debug("%s:%d: hwirq %lu, virq %u\n", __func__, __LINE__, hwirq,
                 virq);
 
-        set_irq_chip_and_handler(virq, &ps3_irq_chip, handle_fasteoi_irq);
+        irq_set_chip_and_handler(virq, &ps3_irq_chip, handle_fasteoi_irq);
 
         return 0;
 }
@@ -683,7 +678,6 @@ static int ps3_host_match(struct irq_host *h, struct device_node *np)
 
 static struct irq_host_ops ps3_host_ops = {
         .map = ps3_host_map,
-        .unmap = ps3_host_unmap,
         .match = ps3_host_match,
 };
 
diff --git a/arch/powerpc/platforms/ps3/smp.c b/arch/powerpc/platforms/ps3/smp.c
index 51ffde40af2b..4c44794faac0 100644
--- a/arch/powerpc/platforms/ps3/smp.c
+++ b/arch/powerpc/platforms/ps3/smp.c
@@ -39,7 +39,7 @@
 #define MSG_COUNT 4
 static DEFINE_PER_CPU(unsigned int [MSG_COUNT], ps3_ipi_virqs);
 
-static void do_message_pass(int target, int msg)
+static void ps3_smp_message_pass(int cpu, int msg)
 {
         int result;
         unsigned int virq;
@@ -49,28 +49,12 @@ static void do_message_pass(int target, int msg)
                 return;
         }
 
-        virq = per_cpu(ps3_ipi_virqs, target)[msg];
+        virq = per_cpu(ps3_ipi_virqs, cpu)[msg];
         result = ps3_send_event_locally(virq);
 
         if (result)
                 DBG("%s:%d: ps3_send_event_locally(%d, %d) failed"
-                        " (%d)\n", __func__, __LINE__, target, msg, result);
-}
-
-static void ps3_smp_message_pass(int target, int msg)
-{
-        int cpu;
-
-        if (target < NR_CPUS)
-                do_message_pass(target, msg);
-        else if (target == MSG_ALL_BUT_SELF) {
-                for_each_online_cpu(cpu)
-                        if (cpu != smp_processor_id())
-                                do_message_pass(cpu, msg);
-        } else {
-                for_each_online_cpu(cpu)
-                        do_message_pass(cpu, msg);
-        }
+                        " (%d)\n", __func__, __LINE__, cpu, msg, result);
 }
 
 static int ps3_smp_probe(void)
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
index 39a472e9e80f..375a9f92158d 100644
--- a/arch/powerpc/platforms/ps3/spu.c
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -197,7 +197,7 @@ static void spu_unmap(struct spu *spu)
  * The current HV requires the spu shadow regs to be mapped with the
  * PTE page protection bits set as read-only (PP=3).  This implementation
  * uses the low level __ioremap() to bypass the page protection settings
- * inforced by ioremap_flags() to get the needed PTE bits set for the
+ * inforced by ioremap_prot() to get the needed PTE bits set for the
  * shadow regs.
  */
 
@@ -214,7 +214,7 @@ static int __init setup_areas(struct spu *spu)
                 goto fail_ioremap;
         }
 
-        spu->local_store = (__force void *)ioremap_flags(spu->local_store_phys,
+        spu->local_store = (__force void *)ioremap_prot(spu->local_store_phys,
                 LS_SIZE, _PAGE_NO_CACHE);
 
         if (!spu->local_store) {
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index c667f0f02c34..71af4c5d6c05 100644
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -3,14 +3,17 @@ config PPC_PSERIES
         bool "IBM pSeries & new (POWER5-based) iSeries"
         select MPIC
         select PCI_MSI
-        select XICS
+        select PPC_XICS
+        select PPC_ICP_NATIVE
+        select PPC_ICP_HV
+        select PPC_ICS_RTAS
         select PPC_I8259
         select PPC_RTAS
         select PPC_RTAS_DAEMON
         select RTAS_ERROR_LOGGING
         select PPC_UDBG_16550
         select PPC_NATIVE
-        select PPC_PCI_CHOICE if EMBEDDED
+        select PPC_PCI_CHOICE if EXPERT
         default y
 
 config PPC_SPLPAR
@@ -24,19 +27,47 @@ config PPC_SPLPAR
           two or more partitions.
 
 config EEH
-        bool "PCI Extended Error Handling (EEH)" if EMBEDDED
+        bool "PCI Extended Error Handling (EEH)" if EXPERT
         depends on PPC_PSERIES && PCI
-        default y if !EMBEDDED
+        default y if !EXPERT
 
 config PSERIES_MSI
        bool
        depends on PCI_MSI && EEH
        default y
 
+config PSERIES_ENERGY
+        tristate "pSeries energy management capabilities driver"
+        depends on PPC_PSERIES
+        default y
+        help
+          Provides interface to platform energy management capabilities
+          on supported PSERIES platforms.
+          Provides: /sys/devices/system/cpu/pseries_(de)activation_hint_list
+          and /sys/devices/system/cpu/cpuN/pseries_(de)activation_hint
+
 config SCANLOG
         tristate "Scanlog dump interface"
         depends on RTAS_PROC && PPC_PSERIES
 
+config IO_EVENT_IRQ
+        bool "IO Event Interrupt support"
+        depends on PPC_PSERIES
+        default y
+        help
+          Select this option, if you want to enable support for IO Event
+          interrupts. IO event interrupt is a mechanism provided by RTAS
+          to return information about hardware error and non-error events
+          which may need OS attention. RTAS returns events for multiple
+          event types and scopes. Device drivers can register their handlers
+          to receive events.
+
+          This option will only enable the IO event platform code. You
+          will still need to enable or compile the actual drivers
+          that use this infrastruture to handle IO event interrupts.
+
+          Say Y if you are unsure.
+
 config LPARCFG
         bool "LPAR Configuration Data"
         depends on PPC_PSERIES || PPC_ISERIES
@@ -47,6 +78,12 @@ config LPARCFG
 config PPC_PSERIES_DEBUG
         depends on PPC_PSERIES && PPC_EARLY_DEBUG
         bool "Enable extra debug logging in platforms/pseries"
+        help
+          Say Y here if you want the pseries core to produce a bunch of
+          debug messages to the system log. Select this if you are having a
+          problem with the pseries core and want to see more of what is
+          going on. This does not enable debugging in lpar.c, which must
+          be manually done due to its verbosity.
         default y
 
 config PPC_SMLPAR
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index 046ace9c4381..3556e402cbf5 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -1,21 +1,16 @@
-ifeq ($(CONFIG_PPC64),y)
-EXTRA_CFLAGS            += -mno-minimal-toc
-endif
-
-ifeq ($(CONFIG_PPC_PSERIES_DEBUG),y)
-EXTRA_CFLAGS            += -DDEBUG
-endif
+ccflags-$(CONFIG_PPC64)                 := -mno-minimal-toc
+ccflags-$(CONFIG_PPC_PSERIES_DEBUG)     += -DDEBUG
 
 obj-y                   := lpar.o hvCall.o nvram.o reconfig.o \
                            setup.o iommu.o event_sources.o ras.o \
-                           firmware.o power.o dlpar.o
+                           firmware.o power.o dlpar.o mobility.o
 obj-$(CONFIG_SMP)       += smp.o
-obj-$(CONFIG_XICS)      += xics.o
 obj-$(CONFIG_SCANLOG)   += scanlog.o
 obj-$(CONFIG_EEH)       += eeh.o eeh_cache.o eeh_driver.o eeh_event.o eeh_sysfs.o
 obj-$(CONFIG_KEXEC)     += kexec.o
 obj-$(CONFIG_PCI)       += pci.o pci_dlpar.o
 obj-$(CONFIG_PSERIES_MSI)       += msi.o
+obj-$(CONFIG_PSERIES_ENERGY)    += pseries_energy.o
 
 obj-$(CONFIG_HOTPLUG_CPU)       += hotplug-cpu.o
 obj-$(CONFIG_MEMORY_HOTPLUG)    += hotplug-memory.o
@@ -23,9 +18,10 @@ obj-$(CONFIG_MEMORY_HOTPLUG)	+= hotplug-memory.o
 obj-$(CONFIG_HVC_CONSOLE)       += hvconsole.o
 obj-$(CONFIG_HVCS)              += hvcserver.o
 obj-$(CONFIG_HCALL_STATS)       += hvCall_inst.o
-obj-$(CONFIG_PHYP_DUMP) += phyp_dump.o
+obj-$(CONFIG_PHYP_DUMP)         += phyp_dump.o
 obj-$(CONFIG_CMM)               += cmm.o
 obj-$(CONFIG_DTL)               += dtl.o
+obj-$(CONFIG_IO_EVENT_IRQ)      += io_event_irq.o
 
 ifeq ($(CONFIG_PPC_PSERIES),y)
 obj-$(CONFIG_SUSPEND)           += suspend.o
diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c
index f4803868642c..3cafc306b971 100644
--- a/arch/powerpc/platforms/pseries/cmm.c
+++ b/arch/powerpc/platforms/pseries/cmm.c
@@ -508,12 +508,7 @@ static int cmm_memory_isolate_cb(struct notifier_block *self,
         if (action == MEM_ISOLATE_COUNT)
                 ret = cmm_count_pages(arg);
 
-        if (ret)
-                ret = notifier_from_errno(ret);
-        else
-                ret = NOTIFY_OK;
-
-        return ret;
+        return notifier_from_errno(ret);
 }
 
 static struct notifier_block cmm_mem_isolate_nb = {
@@ -635,12 +630,7 @@ static int cmm_memory_cb(struct notifier_block *self,
                 break;
         }
 
-        if (ret)
-                ret = notifier_from_errno(ret);
-        else
-                ret = NOTIFY_OK;
-
-        return ret;
+        return notifier_from_errno(ret);
 }
 
 static struct notifier_block cmm_mem_nb = {
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index 72d8054fa739..57ceb92b2288 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -33,7 +33,7 @@ struct cc_workarea {
         u32     prop_offset;
 };
 
-static void dlpar_free_cc_property(struct property *prop)
+void dlpar_free_cc_property(struct property *prop)
 {
         kfree(prop->name);
         kfree(prop->value);
@@ -55,13 +55,12 @@ static struct property *dlpar_parse_cc_property(struct cc_workarea *ccwa)
 
         prop->length = ccwa->prop_length;
         value = (char *)ccwa + ccwa->prop_offset;
-        prop->value = kzalloc(prop->length, GFP_KERNEL);
+        prop->value = kmemdup(value, prop->length, GFP_KERNEL);
         if (!prop->value) {
                 dlpar_free_cc_property(prop);
                 return NULL;
         }
 
-        memcpy(prop->value, value, prop->length);
         return prop;
 }
 
@@ -75,7 +74,7 @@ static struct device_node *dlpar_parse_cc_node(struct cc_workarea *ccwa)
                 return NULL;
 
         /* The configure connector reported name does not contain a
-         * preceeding '/', so we allocate a buffer large enough to
+         * preceding '/', so we allocate a buffer large enough to
          * prepend this to the full_name.
          */
         name = (char *)ccwa + ccwa->name_offset;
@@ -102,7 +101,7 @@ static void dlpar_free_one_cc_node(struct device_node *dn)
         kfree(dn);
 }
 
-static void dlpar_free_cc_nodes(struct device_node *dn)
+void dlpar_free_cc_nodes(struct device_node *dn)
 {
         if (dn->child)
                 dlpar_free_cc_nodes(dn->child);
diff --git a/arch/powerpc/platforms/pseries/dtl.c b/arch/powerpc/platforms/pseries/dtl.c
index a00addb55945..e9190073bb97 100644
--- a/arch/powerpc/platforms/pseries/dtl.c
+++ b/arch/powerpc/platforms/pseries/dtl.c
@@ -23,37 +23,22 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/debugfs.h>
+#include <linux/spinlock.h>
 #include <asm/smp.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/firmware.h>
+#include <asm/lppaca.h>
 
 #include "plpar_wrappers.h"
 
-/*
- * Layout of entries in the hypervisor's DTL buffer. Although we don't
- * actually access the internals of an entry (we only need to know the size),
- * we might as well define it here for reference.
- */
-struct dtl_entry {
-        u8      dispatch_reason;
-        u8      preempt_reason;
-        u16     processor_id;
-        u32     enqueue_to_dispatch_time;
-        u32     ready_to_enqueue_time;
-        u32     waiting_to_ready_time;
-        u64     timebase;
-        u64     fault_addr;
-        u64     srr0;
-        u64     srr1;
-};
-
 struct dtl {
         struct dtl_entry        *buf;
         struct dentry           *file;
         int                     cpu;
         int                     buf_entries;
         u64                     last_idx;
+        spinlock_t              lock;
 };
 static DEFINE_PER_CPU(struct dtl, cpu_dtl);
 
@@ -67,34 +52,106 @@ static u8 dtl_event_mask = 0x7;
 
 
 /*
- * Size of per-cpu log buffers. Default is just under 16 pages worth.
+ * Size of per-cpu log buffers. Firmware requires that the buffer does
+ * not cross a 4k boundary.
  */
-static int dtl_buf_entries = (16 * 85);
+static int dtl_buf_entries = N_DISPATCH_LOG;
+
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
+struct dtl_ring {
+        u64     write_index;
+        struct dtl_entry *write_ptr;
+        struct dtl_entry *buf;
+        struct dtl_entry *buf_end;
+        u8      saved_dtl_mask;
+};
 
+static DEFINE_PER_CPU(struct dtl_ring, dtl_rings);
 
-static int dtl_enable(struct dtl *dtl)
+static atomic_t dtl_count;
+
+/*
+ * The cpu accounting code controls the DTL ring buffer, and we get
+ * given entries as they are processed.
+ */
+static void consume_dtle(struct dtl_entry *dtle, u64 index)
 {
-        unsigned long addr;
-        int ret, hwcpu;
+        struct dtl_ring *dtlr = &__get_cpu_var(dtl_rings);
+        struct dtl_entry *wp = dtlr->write_ptr;
+        struct lppaca *vpa = local_paca->lppaca_ptr;
 
-        /* only allow one reader */
-        if (dtl->buf)
-                return -EBUSY;
+        if (!wp)
+                return;
 
-        /* we need to store the original allocation size for use during read */
-        dtl->buf_entries = dtl_buf_entries;
+        *wp = *dtle;
+        barrier();
 
-        dtl->buf = kmalloc_node(dtl->buf_entries * sizeof(struct dtl_entry),
-                        GFP_KERNEL, cpu_to_node(dtl->cpu));
-        if (!dtl->buf) {
-                printk(KERN_WARNING "%s: buffer alloc failed for cpu %d\n",
-                                __func__, dtl->cpu);
-                return -ENOMEM;
-        }
+        /* check for hypervisor ring buffer overflow, ignore this entry if so */
+        if (index + N_DISPATCH_LOG < vpa->dtl_idx)
+                return;
+
+        ++wp;
+        if (wp == dtlr->buf_end)
+                wp = dtlr->buf;
+        dtlr->write_ptr = wp;
+
+        /* incrementing write_index makes the new entry visible */
+        smp_wmb();
+        ++dtlr->write_index;
+}
+
+static int dtl_start(struct dtl *dtl)
+{
+        struct dtl_ring *dtlr = &per_cpu(dtl_rings, dtl->cpu);
+
+        dtlr->buf = dtl->buf;
+        dtlr->buf_end = dtl->buf + dtl->buf_entries;
+        dtlr->write_index = 0;
+
+        /* setting write_ptr enables logging into our buffer */
+        smp_wmb();
+        dtlr->write_ptr = dtl->buf;
+
+        /* enable event logging */
+        dtlr->saved_dtl_mask = lppaca_of(dtl->cpu).dtl_enable_mask;
+        lppaca_of(dtl->cpu).dtl_enable_mask |= dtl_event_mask;
+
+        dtl_consumer = consume_dtle;
+        atomic_inc(&dtl_count);
+        return 0;
+}
+
+static void dtl_stop(struct dtl *dtl)
+{
+        struct dtl_ring *dtlr = &per_cpu(dtl_rings, dtl->cpu);
+
+        dtlr->write_ptr = NULL;
+        smp_wmb();
+
+        dtlr->buf = NULL;
+
+        /* restore dtl_enable_mask */
+        lppaca_of(dtl->cpu).dtl_enable_mask = dtlr->saved_dtl_mask;
+
+        if (atomic_dec_and_test(&dtl_count))
+                dtl_consumer = NULL;
+}
+
+static u64 dtl_current_index(struct dtl *dtl)
+{
+        return per_cpu(dtl_rings, dtl->cpu).write_index;
+}
+
+#else /* CONFIG_VIRT_CPU_ACCOUNTING */
+
+static int dtl_start(struct dtl *dtl)
+{
+        unsigned long addr;
+        int ret, hwcpu;
 
         /* Register our dtl buffer with the hypervisor. The HV expects the
          * buffer size to be passed in the second word of the buffer */
-        ((u32 *)dtl->buf)[1] = dtl->buf_entries * sizeof(struct dtl_entry);
+        ((u32 *)dtl->buf)[1] = DISPATCH_LOG_BYTES;
 
         hwcpu = get_hard_smp_processor_id(dtl->cpu);
         addr = __pa(dtl->buf);
@@ -102,34 +159,84 @@ static int dtl_enable(struct dtl *dtl)
         if (ret) {
                 printk(KERN_WARNING "%s: DTL registration for cpu %d (hw %d) "
                        "failed with %d\n", __func__, dtl->cpu, hwcpu, ret);
-                kfree(dtl->buf);
                 return -EIO;
         }
 
         /* set our initial buffer indices */
-        dtl->last_idx = lppaca[dtl->cpu].dtl_idx = 0;
+        lppaca_of(dtl->cpu).dtl_idx = 0;
 
         /* ensure that our updates to the lppaca fields have occurred before
          * we actually enable the logging */
         smp_wmb();
 
         /* enable event logging */
-        lppaca[dtl->cpu].dtl_enable_mask = dtl_event_mask;
+        lppaca_of(dtl->cpu).dtl_enable_mask = dtl_event_mask;
 
         return 0;
 }
 
-static void dtl_disable(struct dtl *dtl)
+static void dtl_stop(struct dtl *dtl)
 {
         int hwcpu = get_hard_smp_processor_id(dtl->cpu);
 
-        lppaca[dtl->cpu].dtl_enable_mask = 0x0;
+        lppaca_of(dtl->cpu).dtl_enable_mask = 0x0;
 
         unregister_dtl(hwcpu, __pa(dtl->buf));
+}
+
+static u64 dtl_current_index(struct dtl *dtl)
+{
+        return lppaca_of(dtl->cpu).dtl_idx;
+}
+#endif /* CONFIG_VIRT_CPU_ACCOUNTING */
+
+static int dtl_enable(struct dtl *dtl)
+{
+        long int n_entries;
+        long int rc;
+        struct dtl_entry *buf = NULL;
+
+        if (!dtl_cache)
+                return -ENOMEM;
+
+        /* only allow one reader */
+        if (dtl->buf)
+                return -EBUSY;
+
+        n_entries = dtl_buf_entries;
+        buf = kmem_cache_alloc_node(dtl_cache, GFP_KERNEL, cpu_to_node(dtl->cpu));
+        if (!buf) {
+                printk(KERN_WARNING "%s: buffer alloc failed for cpu %d\n",
+                                __func__, dtl->cpu);
+                return -ENOMEM;
+        }
 
-        kfree(dtl->buf);
+        spin_lock(&dtl->lock);
+        rc = -EBUSY;
+        if (!dtl->buf) {
+                /* store the original allocation size for use during read */
+                dtl->buf_entries = n_entries;
+                dtl->buf = buf;
+                dtl->last_idx = 0;
+                rc = dtl_start(dtl);
+                if (rc)
+                        dtl->buf = NULL;
+        }
+        spin_unlock(&dtl->lock);
+
+        if (rc)
+                kmem_cache_free(dtl_cache, buf);
+        return rc;
+}
+
+static void dtl_disable(struct dtl *dtl)
+{
+        spin_lock(&dtl->lock);
+        dtl_stop(dtl);
+        kmem_cache_free(dtl_cache, dtl->buf);
         dtl->buf = NULL;
         dtl->buf_entries = 0;
+        spin_unlock(&dtl->lock);
 }
 
 /* file interface */
@@ -157,8 +264,9 @@ static int dtl_file_release(struct inode *inode, struct file *filp)
 static ssize_t dtl_file_read(struct file *filp, char __user *buf, size_t len,
                 loff_t *pos)
 {
-        int rc, cur_idx, last_idx, n_read, n_req, read_size;
+        long int rc, n_read, n_req, read_size;
         struct dtl *dtl;
+        u64 cur_idx, last_idx, i;
 
         if ((len % sizeof(struct dtl_entry)) != 0)
                 return -EINVAL;
@@ -171,41 +279,48 @@ static ssize_t dtl_file_read(struct file *filp, char __user *buf, size_t len,
         /* actual number of entries read */
         n_read = 0;
 
-        cur_idx = lppaca[dtl->cpu].dtl_idx;
+        spin_lock(&dtl->lock);
+
+        cur_idx = dtl_current_index(dtl);
         last_idx = dtl->last_idx;
 
-        if (cur_idx - last_idx > dtl->buf_entries) {
-                pr_debug("%s: hv buffer overflow for cpu %d, samples lost\n",
-                                __func__, dtl->cpu);
-        }
+        if (last_idx + dtl->buf_entries <= cur_idx)
+                last_idx = cur_idx - dtl->buf_entries + 1;
+
+        if (last_idx + n_req > cur_idx)
+                n_req = cur_idx - last_idx;
+
+        if (n_req > 0)
+                dtl->last_idx = last_idx + n_req;
+
+        spin_unlock(&dtl->lock);
+
+        if (n_req <= 0)
+                return 0;
 
-        cur_idx  %= dtl->buf_entries;
-        last_idx %= dtl->buf_entries;
+        i = last_idx % dtl->buf_entries;
 
         /* read the tail of the buffer if we've wrapped */
-        if (last_idx > cur_idx) {
-                read_size = min(n_req, dtl->buf_entries - last_idx);
+        if (i + n_req > dtl->buf_entries) {
+                read_size = dtl->buf_entries - i;
 
-                rc = copy_to_user(buf, &dtl->buf[last_idx],
+                rc = copy_to_user(buf, &dtl->buf[i],
                                 read_size * sizeof(struct dtl_entry));
                 if (rc)
                         return -EFAULT;
 
-                last_idx = 0;
+                i = 0;
                 n_req -= read_size;
                 n_read += read_size;
                 buf += read_size * sizeof(struct dtl_entry);
         }
 
         /* .. and now the head */
-        read_size = min(n_req, cur_idx - last_idx);
-        rc = copy_to_user(buf, &dtl->buf[last_idx],
-                        read_size * sizeof(struct dtl_entry));
+        rc = copy_to_user(buf, &dtl->buf[i], n_req * sizeof(struct dtl_entry));
         if (rc)
                 return -EFAULT;
 
-        n_read += read_size;
-        dtl->last_idx += n_read;
+        n_read += n_req;
 
         return n_read * sizeof(struct dtl_entry);
 }
@@ -252,7 +367,7 @@ static int dtl_init(void)
 
         event_mask_file = debugfs_create_x8("dtl_event_mask", 0600,
                                 dtl_dir, &dtl_event_mask);
-        buf_entries_file = debugfs_create_u32("dtl_buf_entries", 0600,
+        buf_entries_file = debugfs_create_u32("dtl_buf_entries", 0400,
                                 dtl_dir, &dtl_buf_entries);
 
         if (!event_mask_file || !buf_entries_file) {
@@ -263,6 +378,7 @@ static int dtl_init(void)
         /* set up the per-cpu log structures */
         for_each_possible_cpu(i) {
                 struct dtl *dtl = &per_cpu(cpu_dtl, i);
+                spin_lock_init(&dtl->lock);
                 dtl->cpu = i;
 
                 rc = dtl_setup_file(dtl);
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 34b7dc12e731..46b55cf563e3 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -21,8 +21,6 @@
  * Please address comments and feedback to Linas Vepstas <linas@austin.ibm.com>
  */
 
-#undef DEBUG
-
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/list.h>
@@ -67,7 +65,7 @@
  *  with EEH.
  *
  *  Ideally, a PCI device driver, when suspecting that an isolation
- *  event has occured (e.g. by reading 0xff's), will then ask EEH
+ *  event has occurred (e.g. by reading 0xff's), will then ask EEH
  *  whether this is the case, and then take appropriate steps to
  *  reset the PCI slot, the PCI device, and then resume operations.
  *  However, until that day,  the checking is done here, with the
@@ -95,6 +93,7 @@ static int ibm_slot_error_detail;
 static int ibm_get_config_addr_info;
 static int ibm_get_config_addr_info2;
 static int ibm_configure_bridge;
+static int ibm_configure_pe;
 
 int eeh_subsystem_enabled;
 EXPORT_SYMBOL(eeh_subsystem_enabled);
@@ -263,6 +262,8 @@ void eeh_slot_error_detail(struct pci_dn *pdn, int severity)
         pci_regs_buf[0] = 0;
 
         rtas_pci_enable(pdn, EEH_THAW_MMIO);
+        rtas_configure_bridge(pdn);
+        eeh_restore_bars(pdn);
         loglen = gather_pci_data(pdn, pci_regs_buf, EEH_PCI_REGS_LOG_LEN);
 
         rtas_slot_error_detail(pdn, severity, pci_regs_buf, loglen);
@@ -450,6 +451,39 @@ void eeh_clear_slot (struct device_node *dn, int mode_flag)
         raw_spin_unlock_irqrestore(&confirm_error_lock, flags);
 }
 
+void __eeh_set_pe_freset(struct device_node *parent, unsigned int *freset)
+{
+        struct device_node *dn;
+
+        for_each_child_of_node(parent, dn) {
+                if (PCI_DN(dn)) {
+
+                        struct pci_dev *dev = PCI_DN(dn)->pcidev;
+
+                        if (dev && dev->driver)
+                                *freset |= dev->needs_freset;
+
+                        __eeh_set_pe_freset(dn, freset);
+                }
+        }
+}
+
+void eeh_set_pe_freset(struct device_node *dn, unsigned int *freset)
+{
+        struct pci_dev *dev;
+        dn = find_device_pe(dn);
+
+        /* Back up one, since config addrs might be shared */
+        if (!pcibios_find_pci_bus(dn) && PCI_DN(dn->parent))
+                dn = dn->parent;
+
+        dev = PCI_DN(dn)->pcidev;
+        if (dev)
+                *freset |= dev->needs_freset;
+
+        __eeh_set_pe_freset(dn, freset);
+}
+
 /**
  * eeh_dn_check_failure - check if all 1's data is due to EEH slot freeze
  * @dn device node
@@ -694,15 +728,24 @@ rtas_pci_slot_reset(struct pci_dn *pdn, int state)
         if (pdn->eeh_pe_config_addr)
                 config_addr = pdn->eeh_pe_config_addr;
 
-        rc = rtas_call(ibm_set_slot_reset,4,1, NULL,
+        rc = rtas_call(ibm_set_slot_reset, 4, 1, NULL,
                        config_addr,
                        BUID_HI(pdn->phb->buid),
                        BUID_LO(pdn->phb->buid),
                        state);
-        if (rc)
-                printk (KERN_WARNING "EEH: Unable to reset the failed slot,"
-                        " (%d) #RST=%d dn=%s\n",
-                        rc, state, pdn->node->full_name);
+
+        /* Fundamental-reset not supported on this PE, try hot-reset */
+        if (rc == -8 && state == 3) {
+                rc = rtas_call(ibm_set_slot_reset, 4, 1, NULL,
+                               config_addr,
+                               BUID_HI(pdn->phb->buid),
+                               BUID_LO(pdn->phb->buid), 1);
+                if (rc)
+                        printk(KERN_WARNING
+                                "EEH: Unable to reset the failed slot,"
+                                " #RST=%d dn=%s\n",
+                                rc, pdn->node->full_name);
+        }
 }
 
 /**
@@ -738,18 +781,21 @@ int pcibios_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state stat
 /**
  * rtas_set_slot_reset -- assert the pci #RST line for 1/4 second
  * @pdn: pci device node to be reset.
- *
- *  Return 0 if success, else a non-zero value.
  */
 
 static void __rtas_set_slot_reset(struct pci_dn *pdn)
 {
-        struct pci_dev *dev = pdn->pcidev;
+        unsigned int freset = 0;
 
-        /* Determine type of EEH reset required by device,
-         * default hot reset or fundamental reset
-         */
-        if (dev && dev->needs_freset)
+        /* Determine type of EEH reset required for
+         * Partitionable Endpoint, a hot-reset (1)
+         * or a fundamental reset (3).
+         * A fundamental reset required by any device under
+         * Partitionable Endpoint trumps hot-reset.
+         */
+        eeh_set_pe_freset(pdn->node, &freset);
+
+        if (freset)
                 rtas_pci_slot_reset(pdn, 3);
         else
                 rtas_pci_slot_reset(pdn, 1);
@@ -878,7 +924,7 @@ void eeh_restore_bars(struct pci_dn *pdn)
  *
  * Save the values of the device bars. Unlike the restore
  * routine, this routine is *not* recursive. This is because
- * PCI devices are added individuallly; but, for the restore,
+ * PCI devices are added individually; but, for the restore,
  * an entire slot is reset at a time.
  */
 static void eeh_save_bars(struct pci_dn *pdn)
@@ -897,13 +943,20 @@ rtas_configure_bridge(struct pci_dn *pdn)
 {
         int config_addr;
         int rc;
+        int token;
 
         /* Use PE configuration address, if present */
         config_addr = pdn->eeh_config_addr;
         if (pdn->eeh_pe_config_addr)
                 config_addr = pdn->eeh_pe_config_addr;
 
-        rc = rtas_call(ibm_configure_bridge,3,1, NULL,
+        /* Use new configure-pe function, if supported */
+        if (ibm_configure_pe != RTAS_UNKNOWN_SERVICE)
+                token = ibm_configure_pe;
+        else
+                token = ibm_configure_bridge;
+
+        rc = rtas_call(token, 3, 1, NULL,
                        config_addr,
                        BUID_HI(pdn->phb->buid),
                        BUID_LO(pdn->phb->buid));
@@ -1079,6 +1132,7 @@ void __init eeh_init(void)
         ibm_get_config_addr_info = rtas_token("ibm,get-config-addr-info");
         ibm_get_config_addr_info2 = rtas_token("ibm,get-config-addr-info2");
         ibm_configure_bridge = rtas_token ("ibm,configure-bridge");
+        ibm_configure_pe = rtas_token("ibm,configure-pe");
 
         if (ibm_set_eeh_option == RTAS_UNKNOWN_SERVICE)
                 return;
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index b8d70f5d9aa9..1b6cb10589e0 100644
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -328,7 +328,7 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event)
         struct pci_bus *frozen_bus;
         int rc = 0;
         enum pci_ers_result result = PCI_ERS_RESULT_NONE;
-        const char *location, *pci_str, *drv_str;
+        const char *location, *pci_str, *drv_str, *bus_pci_str, *bus_drv_str;
 
         frozen_dn = find_device_pe(event->dn);
         if (!frozen_dn) {
@@ -364,13 +364,8 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event)
         frozen_pdn = PCI_DN(frozen_dn);
         frozen_pdn->eeh_freeze_count++;
 
-        if (frozen_pdn->pcidev) {
-                pci_str = pci_name (frozen_pdn->pcidev);
-                drv_str = pcid_name (frozen_pdn->pcidev);
-        } else {
-                pci_str = eeh_pci_name(event->dev);
-                drv_str = pcid_name (event->dev);
-        }
+        pci_str = eeh_pci_name(event->dev);
+        drv_str = pcid_name(event->dev);
         
         if (frozen_pdn->eeh_freeze_count > EEH_MAX_ALLOWED_FREEZES)
                 goto excess_failures;
@@ -378,8 +373,17 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event)
         printk(KERN_WARNING
            "EEH: This PCI device has failed %d times in the last hour:\n",
                 frozen_pdn->eeh_freeze_count);
+
+        if (frozen_pdn->pcidev) {
+                bus_pci_str = pci_name(frozen_pdn->pcidev);
+                bus_drv_str = pcid_name(frozen_pdn->pcidev);
+                printk(KERN_WARNING
+                        "EEH: Bus location=%s driver=%s pci addr=%s\n",
+                        location, bus_drv_str, bus_pci_str);
+        }
+
         printk(KERN_WARNING
-                "EEH: location=%s driver=%s pci addr=%s\n",
+                "EEH: Device location=%s driver=%s pci addr=%s\n",
                 location, drv_str, pci_str);
 
         /* Walk the various device drivers attached to this slot through
diff --git a/arch/powerpc/platforms/pseries/eeh_sysfs.c b/arch/powerpc/platforms/pseries/eeh_sysfs.c
index 15e13b568904..23982c7892d2 100644
--- a/arch/powerpc/platforms/pseries/eeh_sysfs.c
+++ b/arch/powerpc/platforms/pseries/eeh_sysfs.c
@@ -25,7 +25,6 @@
 #include <linux/pci.h>
 #include <asm/ppc-pci.h>
 #include <asm/pci-bridge.h>
-#include <linux/kobject.h>
 
 /**
  * EEH_SHOW_ATTR -- create sysfs entry for eeh statistic
diff --git a/arch/powerpc/platforms/pseries/firmware.c b/arch/powerpc/platforms/pseries/firmware.c
index 0a14d8cd314f..0b0eff0cce35 100644
--- a/arch/powerpc/platforms/pseries/firmware.c
+++ b/arch/powerpc/platforms/pseries/firmware.c
@@ -55,6 +55,7 @@ firmware_features_table[FIRMWARE_MAX_FEATURES] = {
         {FW_FEATURE_XDABR,              "hcall-xdabr"},
         {FW_FEATURE_MULTITCE,           "hcall-multi-tce"},
         {FW_FEATURE_SPLPAR,             "hcall-splpar"},
+        {FW_FEATURE_VPHN,               "hcall-vphn"},
 };
 
 /* Build up the firmware features bitmask using the contents of
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index fd50ccd4bac1..46f13a3c5d09 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -19,6 +19,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/cpu.h>
 #include <asm/system.h>
@@ -28,7 +29,7 @@
 #include <asm/machdep.h>
 #include <asm/vdso_datapage.h>
 #include <asm/pSeries_reconfig.h>
-#include "xics.h"
+#include <asm/xics.h>
 #include "plpar_wrappers.h"
 #include "offline_states.h"
 
@@ -216,7 +217,7 @@ static void pseries_cpu_die(unsigned int cpu)
                        cpu, pcpu, cpu_status);
         }
 
-        /* Isolation and deallocation are definatly done by
+        /* Isolation and deallocation are definitely done by
          * drslot_chrp_cpu.  If they were not they would be
          * done here.  Change isolate state to Isolate and
          * change allocation-state to Unusable.
@@ -280,7 +281,7 @@ static int pseries_add_processor(struct device_node *np)
         }
 
         for_each_cpu(cpu, tmp) {
-                BUG_ON(cpumask_test_cpu(cpu, cpu_present_mask));
+                BUG_ON(cpu_present(cpu));
                 set_cpu_present(cpu, true);
                 set_hard_smp_processor_id(cpu, *intserv++);
         }
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index bc8803664140..9d6a8effeda2 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -12,11 +12,67 @@
 #include <linux/of.h>
 #include <linux/memblock.h>
 #include <linux/vmalloc.h>
+#include <linux/memory.h>
+
 #include <asm/firmware.h>
 #include <asm/machdep.h>
 #include <asm/pSeries_reconfig.h>
 #include <asm/sparsemem.h>
 
+static unsigned long get_memblock_size(void)
+{
+        struct device_node *np;
+        unsigned int memblock_size = MIN_MEMORY_BLOCK_SIZE;
+        struct resource r;
+
+        np = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
+        if (np) {
+                const __be64 *size;
+
+                size = of_get_property(np, "ibm,lmb-size", NULL);
+                if (size)
+                        memblock_size = be64_to_cpup(size);
+                of_node_put(np);
+        } else  if (machine_is(pseries)) {
+                /* This fallback really only applies to pseries */
+                unsigned int memzero_size = 0;
+
+                np = of_find_node_by_path("/memory@0");
+                if (np) {
+                        if (!of_address_to_resource(np, 0, &r))
+                                memzero_size = resource_size(&r);
+                        of_node_put(np);
+                }
+
+                if (memzero_size) {
+                        /* We now know the size of memory@0, use this to find
+                         * the first memoryblock and get its size.
+                         */
+                        char buf[64];
+
+                        sprintf(buf, "/memory@%x", memzero_size);
+                        np = of_find_node_by_path(buf);
+                        if (np) {
+                                if (!of_address_to_resource(np, 0, &r))
+                                        memblock_size = resource_size(&r);
+                                of_node_put(np);
+                        }
+                }
+        }
+        return memblock_size;
+}
+
+/* WARNING: This is going to override the generic definition whenever
+ * pseries is built-in regardless of what platform is active at boot
+ * time. This is fine for now as this is the only "option" and it
+ * should work everywhere. If not, we'll have to turn this into a
+ * ppc_md. callback
+ */
+unsigned long memory_block_size_bytes(void)
+{
+        return get_memblock_size();
+}
+
 static int pseries_remove_memblock(unsigned long base, unsigned int memblock_size)
 {
         unsigned long start, start_pfn;
@@ -127,30 +183,22 @@ static int pseries_add_memory(struct device_node *np)
 
 static int pseries_drconf_memory(unsigned long *base, unsigned int action)
 {
-        struct device_node *np;
-        const unsigned long *lmb_size;
+        unsigned long memblock_size;
         int rc;
 
-        np = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
-        if (!np)
+        memblock_size = get_memblock_size();
+        if (!memblock_size)
                 return -EINVAL;
 
-        lmb_size = of_get_property(np, "ibm,lmb-size", NULL);
-        if (!lmb_size) {
-                of_node_put(np);
-                return -EINVAL;
-        }
-
         if (action == PSERIES_DRCONF_MEM_ADD) {
-                rc = memblock_add(*base, *lmb_size);
+                rc = memblock_add(*base, memblock_size);
                 rc = (rc < 0) ? -EINVAL : 0;
         } else if (action == PSERIES_DRCONF_MEM_REMOVE) {
-                rc = pseries_remove_memblock(*base, *lmb_size);
+                rc = pseries_remove_memblock(*base, memblock_size);
         } else {
                 rc = -EINVAL;
         }
 
-        of_node_put(np);
         return rc;
 }
 
diff --git a/arch/powerpc/platforms/pseries/hvCall.S b/arch/powerpc/platforms/pseries/hvCall.S
index 48d20573e4de..fd05fdee576a 100644
--- a/arch/powerpc/platforms/pseries/hvCall.S
+++ b/arch/powerpc/platforms/pseries/hvCall.S
@@ -11,6 +11,7 @@
 #include <asm/processor.h>
 #include <asm/ppc_asm.h>
 #include <asm/asm-offsets.h>
+#include <asm/ptrace.h>
         
 #define STK_PARM(i)     (48 + ((i)-3)*8)
 
diff --git a/arch/powerpc/platforms/pseries/hvCall_inst.c b/arch/powerpc/platforms/pseries/hvCall_inst.c
index e19ff021e711..f106662f4381 100644
--- a/arch/powerpc/platforms/pseries/hvCall_inst.c
+++ b/arch/powerpc/platforms/pseries/hvCall_inst.c
@@ -55,7 +55,7 @@ static void hc_stop(struct seq_file *m, void *p)
 static int hc_show(struct seq_file *m, void *p)
 {
         unsigned long h_num = (unsigned long)p;
-        struct hcall_stats *hs = (struct hcall_stats *)m->private;
+        struct hcall_stats *hs = m->private;
 
         if (hs[h_num].num_calls) {
                 if (cpu_has_feature(CPU_FTR_PURR))
diff --git a/arch/powerpc/platforms/pseries/io_event_irq.c b/arch/powerpc/platforms/pseries/io_event_irq.c
new file mode 100644
index 000000000000..c829e6067d54
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/io_event_irq.c
@@ -0,0 +1,231 @@
+/*
+ * Copyright 2010 2011 Mark Nelson and Tseng-Hui (Frank) Lin, IBM Corporation
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/errno.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/of.h>
+#include <linux/list.h>
+#include <linux/notifier.h>
+
+#include <asm/machdep.h>
+#include <asm/rtas.h>
+#include <asm/irq.h>
+#include <asm/io_event_irq.h>
+
+#include "pseries.h"
+
+/*
+ * IO event interrupt is a mechanism provided by RTAS to return
+ * information about hardware error and non-error events. Device
+ * drivers can register their event handlers to receive events.
+ * Device drivers are expected to use atomic_notifier_chain_register()
+ * and atomic_notifier_chain_unregister() to register and unregister
+ * their event handlers. Since multiple IO event types and scopes
+ * share an IO event interrupt, the event handlers are called one
+ * by one until the IO event is claimed by one of the handlers.
+ * The event handlers are expected to return NOTIFY_OK if the
+ * event is handled by the event handler or NOTIFY_DONE if the
+ * event does not belong to the handler.
+ *
+ * Usage:
+ *
+ * Notifier function:
+ * #include <asm/io_event_irq.h>
+ * int event_handler(struct notifier_block *nb, unsigned long val, void *data) {
+ *      p = (struct pseries_io_event_sect_data *) data;
+ *      if (! is_my_event(p->scope, p->event_type)) return NOTIFY_DONE;
+ *              :
+ *              :
+ *      return NOTIFY_OK;
+ * }
+ * struct notifier_block event_nb = {
+ *      .notifier_call = event_handler,
+ * }
+ *
+ * Registration:
+ * atomic_notifier_chain_register(&pseries_ioei_notifier_list, &event_nb);
+ *
+ * Unregistration:
+ * atomic_notifier_chain_unregister(&pseries_ioei_notifier_list, &event_nb);
+ */
+
+ATOMIC_NOTIFIER_HEAD(pseries_ioei_notifier_list);
+EXPORT_SYMBOL_GPL(pseries_ioei_notifier_list);
+
+static int ioei_check_exception_token;
+
+/* pSeries event log format */
+
+/* Two bytes ASCII section IDs */
+#define PSERIES_ELOG_SECT_ID_PRIV_HDR           (('P' << 8) | 'H')
+#define PSERIES_ELOG_SECT_ID_USER_HDR           (('U' << 8) | 'H')
+#define PSERIES_ELOG_SECT_ID_PRIMARY_SRC        (('P' << 8) | 'S')
+#define PSERIES_ELOG_SECT_ID_EXTENDED_UH        (('E' << 8) | 'H')
+#define PSERIES_ELOG_SECT_ID_FAILING_MTMS       (('M' << 8) | 'T')
+#define PSERIES_ELOG_SECT_ID_SECONDARY_SRC      (('S' << 8) | 'S')
+#define PSERIES_ELOG_SECT_ID_DUMP_LOCATOR       (('D' << 8) | 'H')
+#define PSERIES_ELOG_SECT_ID_FW_ERROR           (('S' << 8) | 'W')
+#define PSERIES_ELOG_SECT_ID_IMPACT_PART_ID     (('L' << 8) | 'P')
+#define PSERIES_ELOG_SECT_ID_LOGIC_RESOURCE_ID  (('L' << 8) | 'R')
+#define PSERIES_ELOG_SECT_ID_HMC_ID             (('H' << 8) | 'M')
+#define PSERIES_ELOG_SECT_ID_EPOW               (('E' << 8) | 'P')
+#define PSERIES_ELOG_SECT_ID_IO_EVENT           (('I' << 8) | 'E')
+#define PSERIES_ELOG_SECT_ID_MANUFACT_INFO      (('M' << 8) | 'I')
+#define PSERIES_ELOG_SECT_ID_CALL_HOME          (('C' << 8) | 'H')
+#define PSERIES_ELOG_SECT_ID_USER_DEF           (('U' << 8) | 'D')
+
+/* Vendor specific Platform Event Log Format, Version 6, section header */
+struct pseries_elog_section {
+        uint16_t id;                    /* 0x00 2-byte ASCII section ID */
+        uint16_t length;                /* 0x02 Section length in bytes */
+        uint8_t version;                /* 0x04 Section version         */
+        uint8_t subtype;                /* 0x05 Section subtype         */
+        uint16_t creator_component;     /* 0x06 Creator component ID    */
+        uint8_t data[];                 /* 0x08 Start of section data   */
+};
+
+static char ioei_rtas_buf[RTAS_DATA_BUF_SIZE] __cacheline_aligned;
+
+/**
+ * Find data portion of a specific section in RTAS extended event log.
+ * @elog: RTAS error/event log.
+ * @sect_id: secsion ID.
+ *
+ * Return:
+ *      pointer to the section data of the specified section
+ *      NULL if not found
+ */
+static struct pseries_elog_section *find_xelog_section(struct rtas_error_log *elog,
+                                                       uint16_t sect_id)
+{
+        struct rtas_ext_event_log_v6 *xelog =
+                (struct rtas_ext_event_log_v6 *) elog->buffer;
+        struct pseries_elog_section *sect;
+        unsigned char *p, *log_end;
+
+        /* Check that we understand the format */
+        if (elog->extended_log_length < sizeof(struct rtas_ext_event_log_v6) ||
+            xelog->log_format != RTAS_V6EXT_LOG_FORMAT_EVENT_LOG ||
+            xelog->company_id != RTAS_V6EXT_COMPANY_ID_IBM)
+                return NULL;
+
+        log_end = elog->buffer + elog->extended_log_length;
+        p = xelog->vendor_log;
+        while (p < log_end) {
+                sect = (struct pseries_elog_section *)p;
+                if (sect->id == sect_id)
+                        return sect;
+                p += sect->length;
+        }
+        return NULL;
+}
+
+/**
+ * Find the data portion of an IO Event section from event log.
+ * @elog: RTAS error/event log.
+ *
+ * Return:
+ *      pointer to a valid IO event section data. NULL if not found.
+ */
+static struct pseries_io_event * ioei_find_event(struct rtas_error_log *elog)
+{
+        struct pseries_elog_section *sect;
+
+        /* We should only ever get called for io-event interrupts, but if
+         * we do get called for another type then something went wrong so
+         * make some noise about it.
+         * RTAS_TYPE_IO only exists in extended event log version 6 or later.
+         * No need to check event log version.
+         */
+        if (unlikely(elog->type != RTAS_TYPE_IO)) {
+                printk_once(KERN_WARNING "io_event_irq: Unexpected event type %d",
+                            elog->type);
+                return NULL;
+        }
+
+        sect = find_xelog_section(elog, PSERIES_ELOG_SECT_ID_IO_EVENT);
+        if (unlikely(!sect)) {
+                printk_once(KERN_WARNING "io_event_irq: RTAS extended event "
+                            "log does not contain an IO Event section. "
+                            "Could be a bug in system firmware!\n");
+                return NULL;
+        }
+        return (struct pseries_io_event *) &sect->data;
+}
+
+/*
+ * PAPR:
+ * - check-exception returns the first found error or event and clear that
+ *   error or event so it is reported once.
+ * - Each interrupt returns one event. If a plateform chooses to report
+ *   multiple events through a single interrupt, it must ensure that the
+ *   interrupt remains asserted until check-exception has been used to
+ *   process all out-standing events for that interrupt.
+ *
+ * Implementation notes:
+ * - Events must be processed in the order they are returned. Hence,
+ *   sequential in nature.
+ * - The owner of an event is determined by combinations of scope,
+ *   event type, and sub-type. There is no easy way to pre-sort clients
+ *   by scope or event type alone. For example, Torrent ISR route change
+ *   event is reported with scope 0x00 (Not Applicatable) rather than
+ *   0x3B (Torrent-hub). It is better to let the clients to identify
+ *   who owns the the event.
+ */
+
+static irqreturn_t ioei_interrupt(int irq, void *dev_id)
+{
+        struct pseries_io_event *event;
+        int rtas_rc;
+
+        for (;;) {
+                rtas_rc = rtas_call(ioei_check_exception_token, 6, 1, NULL,
+                                    RTAS_VECTOR_EXTERNAL_INTERRUPT,
+                                    virq_to_hw(irq),
+                                    RTAS_IO_EVENTS, 1 /* Time Critical */,
+                                    __pa(ioei_rtas_buf),
+                                    RTAS_DATA_BUF_SIZE);
+                if (rtas_rc != 0)
+                        break;
+
+                event = ioei_find_event((struct rtas_error_log *)ioei_rtas_buf);
+                if (!event)
+                        continue;
+
+                atomic_notifier_call_chain(&pseries_ioei_notifier_list,
+                                           0, event);
+        }
+        return IRQ_HANDLED;
+}
+
+static int __init ioei_init(void)
+{
+        struct device_node *np;
+
+        ioei_check_exception_token = rtas_token("check-exception");
+        if (ioei_check_exception_token == RTAS_UNKNOWN_SERVICE) {
+                pr_warning("IO Event IRQ not supported on this system !\n");
+                return -ENODEV;
+        }
+        np = of_find_node_by_path("/event-sources/ibm,io-events");
+        if (np) {
+                request_event_sources_irqs(np, ioei_interrupt, "IO_EVENT");
+                of_node_put(np);
+        } else {
+                pr_err("io_event_irq: No ibm,io-events on system! "
+                       "IO Event interrupt disabled.\n");
+                return -ENODEV;
+        }
+        return 0;
+}
+machine_subsys_initcall(pseries, ioei_init);
+
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index a77bcaed80af..01faab9456ca 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -33,6 +33,7 @@
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/crash_dump.h>
+#include <linux/memory.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/rtas.h>
@@ -45,6 +46,7 @@
 #include <asm/tce.h>
 #include <asm/ppc-pci.h>
 #include <asm/udbg.h>
+#include <asm/mmzone.h>
 
 #include "plpar_wrappers.h"
 
@@ -140,7 +142,7 @@ static int tce_build_pSeriesLP(struct iommu_table *tbl, long tcenum,
         return ret;
 }
 
-static DEFINE_PER_CPU(u64 *, tce_page) = NULL;
+static DEFINE_PER_CPU(u64 *, tce_page);
 
 static int tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
                                      long npages, unsigned long uaddr,
@@ -270,6 +272,152 @@ static unsigned long tce_get_pSeriesLP(struct iommu_table *tbl, long tcenum)
         return tce_ret;
 }
 
+/* this is compatible with cells for the device tree property */
+struct dynamic_dma_window_prop {
+        __be32  liobn;          /* tce table number */
+        __be64  dma_base;       /* address hi,lo */
+        __be32  tce_shift;      /* ilog2(tce_page_size) */
+        __be32  window_shift;   /* ilog2(tce_window_size) */
+};
+
+struct direct_window {
+        struct device_node *device;
+        const struct dynamic_dma_window_prop *prop;
+        struct list_head list;
+};
+
+/* Dynamic DMA Window support */
+struct ddw_query_response {
+        u32 windows_available;
+        u32 largest_available_block;
+        u32 page_size;
+        u32 migration_capable;
+};
+
+struct ddw_create_response {
+        u32 liobn;
+        u32 addr_hi;
+        u32 addr_lo;
+};
+
+static LIST_HEAD(direct_window_list);
+/* prevents races between memory on/offline and window creation */
+static DEFINE_SPINLOCK(direct_window_list_lock);
+/* protects initializing window twice for same device */
+static DEFINE_MUTEX(direct_window_init_mutex);
+#define DIRECT64_PROPNAME "linux,direct64-ddr-window-info"
+
+static int tce_clearrange_multi_pSeriesLP(unsigned long start_pfn,
+                                        unsigned long num_pfn, const void *arg)
+{
+        const struct dynamic_dma_window_prop *maprange = arg;
+        int rc;
+        u64 tce_size, num_tce, dma_offset, next;
+        u32 tce_shift;
+        long limit;
+
+        tce_shift = be32_to_cpu(maprange->tce_shift);
+        tce_size = 1ULL << tce_shift;
+        next = start_pfn << PAGE_SHIFT;
+        num_tce = num_pfn << PAGE_SHIFT;
+
+        /* round back to the beginning of the tce page size */
+        num_tce += next & (tce_size - 1);
+        next &= ~(tce_size - 1);
+
+        /* covert to number of tces */
+        num_tce |= tce_size - 1;
+        num_tce >>= tce_shift;
+
+        do {
+                /*
+                 * Set up the page with TCE data, looping through and setting
+                 * the values.
+                 */
+                limit = min_t(long, num_tce, 512);
+                dma_offset = next + be64_to_cpu(maprange->dma_base);
+
+                rc = plpar_tce_stuff((u64)be32_to_cpu(maprange->liobn),
+                                             dma_offset,
+                                             0, limit);
+                num_tce -= limit;
+        } while (num_tce > 0 && !rc);
+
+        return rc;
+}
+
+static int tce_setrange_multi_pSeriesLP(unsigned long start_pfn,
+                                        unsigned long num_pfn, const void *arg)
+{
+        const struct dynamic_dma_window_prop *maprange = arg;
+        u64 *tcep, tce_size, num_tce, dma_offset, next, proto_tce, liobn;
+        u32 tce_shift;
+        u64 rc = 0;
+        long l, limit;
+
+        local_irq_disable();    /* to protect tcep and the page behind it */
+        tcep = __get_cpu_var(tce_page);
+
+        if (!tcep) {
+                tcep = (u64 *)__get_free_page(GFP_ATOMIC);
+                if (!tcep) {
+                        local_irq_enable();
+                        return -ENOMEM;
+                }
+                __get_cpu_var(tce_page) = tcep;
+        }
+
+        proto_tce = TCE_PCI_READ | TCE_PCI_WRITE;
+
+        liobn = (u64)be32_to_cpu(maprange->liobn);
+        tce_shift = be32_to_cpu(maprange->tce_shift);
+        tce_size = 1ULL << tce_shift;
+        next = start_pfn << PAGE_SHIFT;
+        num_tce = num_pfn << PAGE_SHIFT;
+
+        /* round back to the beginning of the tce page size */
+        num_tce += next & (tce_size - 1);
+        next &= ~(tce_size - 1);
+
+        /* covert to number of tces */
+        num_tce |= tce_size - 1;
+        num_tce >>= tce_shift;
+
+        /* We can map max one pageful of TCEs at a time */
+        do {
+                /*
+                 * Set up the page with TCE data, looping through and setting
+                 * the values.
+                 */
+                limit = min_t(long, num_tce, 4096/TCE_ENTRY_SIZE);
+                dma_offset = next + be64_to_cpu(maprange->dma_base);
+
+                for (l = 0; l < limit; l++) {
+                        tcep[l] = proto_tce | next;
+                        next += tce_size;
+                }
+
+                rc = plpar_tce_put_indirect(liobn,
+                                            dma_offset,
+                                            (u64)virt_to_abs(tcep),
+                                            limit);
+
+                num_tce -= limit;
+        } while (num_tce > 0 && !rc);
+
+        /* error cleanup: caller will clear whole range */
+
+        local_irq_enable();
+        return rc;
+}
+
+static int tce_setrange_multi_pSeriesLP_walk(unsigned long start_pfn,
+                unsigned long num_pfn, void *arg)
+{
+        return tce_setrange_multi_pSeriesLP(start_pfn, num_pfn, arg);
+}
+
+
 #ifdef CONFIG_PCI
 static void iommu_table_setparms(struct pci_controller *phb,
                                  struct device_node *dn,
@@ -323,14 +471,13 @@ static void iommu_table_setparms(struct pci_controller *phb,
 static void iommu_table_setparms_lpar(struct pci_controller *phb,
                                       struct device_node *dn,
                                       struct iommu_table *tbl,
-                                      const void *dma_window,
-                                      int bussubno)
+                                      const void *dma_window)
 {
         unsigned long offset, size;
 
-        tbl->it_busno  = bussubno;
         of_parse_dma_window(dn, dma_window, &tbl->it_index, &offset, &size);
 
+        tbl->it_busno = phb->bus->number;
         tbl->it_base   = 0;
         tbl->it_blocksize  = 16;
         tbl->it_type = TCE_PCI;
@@ -450,14 +597,10 @@ static void pci_dma_bus_setup_pSeriesLP(struct pci_bus *bus)
         if (!ppci->iommu_table) {
                 tbl = kzalloc_node(sizeof(struct iommu_table), GFP_KERNEL,
                                    ppci->phb->node);
-                iommu_table_setparms_lpar(ppci->phb, pdn, tbl, dma_window,
-                        bus->number);
+                iommu_table_setparms_lpar(ppci->phb, pdn, tbl, dma_window);
                 ppci->iommu_table = iommu_init_table(tbl, ppci->phb->node);
                 pr_debug("  created table: %p\n", ppci->iommu_table);
         }
-
-        if (pdn != dn)
-                PCI_DN(dn)->iommu_table = ppci->iommu_table;
 }
 
 
@@ -500,6 +643,334 @@ static void pci_dma_dev_setup_pSeries(struct pci_dev *dev)
                        pci_name(dev));
 }
 
+static int __read_mostly disable_ddw;
+
+static int __init disable_ddw_setup(char *str)
+{
+        disable_ddw = 1;
+        printk(KERN_INFO "ppc iommu: disabling ddw.\n");
+
+        return 0;
+}
+
+early_param("disable_ddw", disable_ddw_setup);
+
+static void remove_ddw(struct device_node *np)
+{
+        struct dynamic_dma_window_prop *dwp;
+        struct property *win64;
+        const u32 *ddw_avail;
+        u64 liobn;
+        int len, ret;
+
+        ddw_avail = of_get_property(np, "ibm,ddw-applicable", &len);
+        win64 = of_find_property(np, DIRECT64_PROPNAME, NULL);
+        if (!win64)
+                return;
+
+        if (!ddw_avail || len < 3 * sizeof(u32) || win64->length < sizeof(*dwp))
+                goto delprop;
+
+        dwp = win64->value;
+        liobn = (u64)be32_to_cpu(dwp->liobn);
+
+        /* clear the whole window, note the arg is in kernel pages */
+        ret = tce_clearrange_multi_pSeriesLP(0,
+                1ULL << (be32_to_cpu(dwp->window_shift) - PAGE_SHIFT), dwp);
+        if (ret)
+                pr_warning("%s failed to clear tces in window.\n",
+                         np->full_name);
+        else
+                pr_debug("%s successfully cleared tces in window.\n",
+                         np->full_name);
+
+        ret = rtas_call(ddw_avail[2], 1, 1, NULL, liobn);
+        if (ret)
+                pr_warning("%s: failed to remove direct window: rtas returned "
+                        "%d to ibm,remove-pe-dma-window(%x) %llx\n",
+                        np->full_name, ret, ddw_avail[2], liobn);
+        else
+                pr_debug("%s: successfully removed direct window: rtas returned "
+                        "%d to ibm,remove-pe-dma-window(%x) %llx\n",
+                        np->full_name, ret, ddw_avail[2], liobn);
+
+delprop:
+        ret = prom_remove_property(np, win64);
+        if (ret)
+                pr_warning("%s: failed to remove direct window property: %d\n",
+                        np->full_name, ret);
+}
+
+static u64 find_existing_ddw(struct device_node *pdn)
+{
+        struct direct_window *window;
+        const struct dynamic_dma_window_prop *direct64;
+        u64 dma_addr = 0;
+
+        spin_lock(&direct_window_list_lock);
+        /* check if we already created a window and dupe that config if so */
+        list_for_each_entry(window, &direct_window_list, list) {
+                if (window->device == pdn) {
+                        direct64 = window->prop;
+                        dma_addr = direct64->dma_base;
+                        break;
+                }
+        }
+        spin_unlock(&direct_window_list_lock);
+
+        return dma_addr;
+}
+
+static int find_existing_ddw_windows(void)
+{
+        int len;
+        struct device_node *pdn;
+        struct direct_window *window;
+        const struct dynamic_dma_window_prop *direct64;
+
+        if (!firmware_has_feature(FW_FEATURE_LPAR))
+                return 0;
+
+        for_each_node_with_property(pdn, DIRECT64_PROPNAME) {
+                direct64 = of_get_property(pdn, DIRECT64_PROPNAME, &len);
+                if (!direct64)
+                        continue;
+
+                window = kzalloc(sizeof(*window), GFP_KERNEL);
+                if (!window || len < sizeof(struct dynamic_dma_window_prop)) {
+                        kfree(window);
+                        remove_ddw(pdn);
+                        continue;
+                }
+
+                window->device = pdn;
+                window->prop = direct64;
+                spin_lock(&direct_window_list_lock);
+                list_add(&window->list, &direct_window_list);
+                spin_unlock(&direct_window_list_lock);
+        }
+
+        return 0;
+}
+machine_arch_initcall(pseries, find_existing_ddw_windows);
+
+static int query_ddw(struct pci_dev *dev, const u32 *ddw_avail,
+                        struct ddw_query_response *query)
+{
+        struct device_node *dn;
+        struct pci_dn *pcidn;
+        u32 cfg_addr;
+        u64 buid;
+        int ret;
+
+        /*
+         * Get the config address and phb buid of the PE window.
+         * Rely on eeh to retrieve this for us.
+         * Retrieve them from the pci device, not the node with the
+         * dma-window property
+         */
+        dn = pci_device_to_OF_node(dev);
+        pcidn = PCI_DN(dn);
+        cfg_addr = pcidn->eeh_config_addr;
+        if (pcidn->eeh_pe_config_addr)
+                cfg_addr = pcidn->eeh_pe_config_addr;
+        buid = pcidn->phb->buid;
+        ret = rtas_call(ddw_avail[0], 3, 5, (u32 *)query,
+                  cfg_addr, BUID_HI(buid), BUID_LO(buid));
+        dev_info(&dev->dev, "ibm,query-pe-dma-windows(%x) %x %x %x"
+                " returned %d\n", ddw_avail[0], cfg_addr, BUID_HI(buid),
+                BUID_LO(buid), ret);
+        return ret;
+}
+
+static int create_ddw(struct pci_dev *dev, const u32 *ddw_avail,
+                        struct ddw_create_response *create, int page_shift,
+                        int window_shift)
+{
+        struct device_node *dn;
+        struct pci_dn *pcidn;
+        u32 cfg_addr;
+        u64 buid;
+        int ret;
+
+        /*
+         * Get the config address and phb buid of the PE window.
+         * Rely on eeh to retrieve this for us.
+         * Retrieve them from the pci device, not the node with the
+         * dma-window property
+         */
+        dn = pci_device_to_OF_node(dev);
+        pcidn = PCI_DN(dn);
+        cfg_addr = pcidn->eeh_config_addr;
+        if (pcidn->eeh_pe_config_addr)
+                cfg_addr = pcidn->eeh_pe_config_addr;
+        buid = pcidn->phb->buid;
+
+        do {
+                /* extra outputs are LIOBN and dma-addr (hi, lo) */
+                ret = rtas_call(ddw_avail[1], 5, 4, (u32 *)create, cfg_addr,
+                                BUID_HI(buid), BUID_LO(buid), page_shift, window_shift);
+        } while (rtas_busy_delay(ret));
+        dev_info(&dev->dev,
+                "ibm,create-pe-dma-window(%x) %x %x %x %x %x returned %d "
+                "(liobn = 0x%x starting addr = %x %x)\n", ddw_avail[1],
+                 cfg_addr, BUID_HI(buid), BUID_LO(buid), page_shift,
+                 window_shift, ret, create->liobn, create->addr_hi, create->addr_lo);
+
+        return ret;
+}
+
+/*
+ * If the PE supports dynamic dma windows, and there is space for a table
+ * that can map all pages in a linear offset, then setup such a table,
+ * and record the dma-offset in the struct device.
+ *
+ * dev: the pci device we are checking
+ * pdn: the parent pe node with the ibm,dma_window property
+ * Future: also check if we can remap the base window for our base page size
+ *
+ * returns the dma offset for use by dma_set_mask
+ */
+static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)
+{
+        int len, ret;
+        struct ddw_query_response query;
+        struct ddw_create_response create;
+        int page_shift;
+        u64 dma_addr, max_addr;
+        struct device_node *dn;
+        const u32 *uninitialized_var(ddw_avail);
+        struct direct_window *window;
+        struct property *win64;
+        struct dynamic_dma_window_prop *ddwprop;
+
+        mutex_lock(&direct_window_init_mutex);
+
+        dma_addr = find_existing_ddw(pdn);
+        if (dma_addr != 0)
+                goto out_unlock;
+
+        /*
+         * the ibm,ddw-applicable property holds the tokens for:
+         * ibm,query-pe-dma-window
+         * ibm,create-pe-dma-window
+         * ibm,remove-pe-dma-window
+         * for the given node in that order.
+         * the property is actually in the parent, not the PE
+         */
+        ddw_avail = of_get_property(pdn, "ibm,ddw-applicable", &len);
+        if (!ddw_avail || len < 3 * sizeof(u32))
+                goto out_unlock;
+
+       /*
+         * Query if there is a second window of size to map the
+         * whole partition.  Query returns number of windows, largest
+         * block assigned to PE (partition endpoint), and two bitmasks
+         * of page sizes: supported and supported for migrate-dma.
+         */
+        dn = pci_device_to_OF_node(dev);
+        ret = query_ddw(dev, ddw_avail, &query);
+        if (ret != 0)
+                goto out_unlock;
+
+        if (query.windows_available == 0) {
+                /*
+                 * no additional windows are available for this device.
+                 * We might be able to reallocate the existing window,
+                 * trading in for a larger page size.
+                 */
+                dev_dbg(&dev->dev, "no free dynamic windows");
+                goto out_unlock;
+        }
+        if (query.page_size & 4) {
+                page_shift = 24; /* 16MB */
+        } else if (query.page_size & 2) {
+                page_shift = 16; /* 64kB */
+        } else if (query.page_size & 1) {
+                page_shift = 12; /* 4kB */
+        } else {
+                dev_dbg(&dev->dev, "no supported direct page size in mask %x",
+                          query.page_size);
+                goto out_unlock;
+        }
+        /* verify the window * number of ptes will map the partition */
+        /* check largest block * page size > max memory hotplug addr */
+        max_addr = memory_hotplug_max();
+        if (query.largest_available_block < (max_addr >> page_shift)) {
+                dev_dbg(&dev->dev, "can't map partiton max 0x%llx with %u "
+                          "%llu-sized pages\n", max_addr,  query.largest_available_block,
+                          1ULL << page_shift);
+                goto out_unlock;
+        }
+        len = order_base_2(max_addr);
+        win64 = kzalloc(sizeof(struct property), GFP_KERNEL);
+        if (!win64) {
+                dev_info(&dev->dev,
+                        "couldn't allocate property for 64bit dma window\n");
+                goto out_unlock;
+        }
+        win64->name = kstrdup(DIRECT64_PROPNAME, GFP_KERNEL);
+        win64->value = ddwprop = kmalloc(sizeof(*ddwprop), GFP_KERNEL);
+        win64->length = sizeof(*ddwprop);
+        if (!win64->name || !win64->value) {
+                dev_info(&dev->dev,
+                        "couldn't allocate property name and value\n");
+                goto out_free_prop;
+        }
+
+        ret = create_ddw(dev, ddw_avail, &create, page_shift, len);
+        if (ret != 0)
+                goto out_free_prop;
+
+        ddwprop->liobn = cpu_to_be32(create.liobn);
+        ddwprop->dma_base = cpu_to_be64(of_read_number(&create.addr_hi, 2));
+        ddwprop->tce_shift = cpu_to_be32(page_shift);
+        ddwprop->window_shift = cpu_to_be32(len);
+
+        dev_dbg(&dev->dev, "created tce table LIOBN 0x%x for %s\n",
+                  create.liobn, dn->full_name);
+
+        window = kzalloc(sizeof(*window), GFP_KERNEL);
+        if (!window)
+                goto out_clear_window;
+
+        ret = walk_system_ram_range(0, memblock_end_of_DRAM() >> PAGE_SHIFT,
+                        win64->value, tce_setrange_multi_pSeriesLP_walk);
+        if (ret) {
+                dev_info(&dev->dev, "failed to map direct window for %s: %d\n",
+                         dn->full_name, ret);
+                goto out_clear_window;
+        }
+
+        ret = prom_add_property(pdn, win64);
+        if (ret) {
+                dev_err(&dev->dev, "unable to add dma window property for %s: %d",
+                         pdn->full_name, ret);
+                goto out_clear_window;
+        }
+
+        window->device = pdn;
+        window->prop = ddwprop;
+        spin_lock(&direct_window_list_lock);
+        list_add(&window->list, &direct_window_list);
+        spin_unlock(&direct_window_list_lock);
+
+        dma_addr = of_read_number(&create.addr_hi, 2);
+        goto out_unlock;
+
+out_clear_window:
+        remove_ddw(pdn);
+
+out_free_prop:
+        kfree(win64->name);
+        kfree(win64->value);
+        kfree(win64);
+
+out_unlock:
+        mutex_unlock(&direct_window_init_mutex);
+        return dma_addr;
+}
+
 static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)
 {
         struct device_node *pdn, *dn;
@@ -510,7 +981,7 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)
         pr_debug("pci_dma_dev_setup_pSeriesLP: %s\n", pci_name(dev));
 
         /* dev setup for LPAR is a little tricky, since the device tree might
-         * contain the dma-window properties per-device and not neccesarily
+         * contain the dma-window properties per-device and not necessarily
          * for the bus. So we need to search upwards in the tree until we
          * either hit a dma-window property, OR find a parent with a table
          * already allocated.
@@ -533,21 +1004,11 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)
         }
         pr_debug("  parent is %s\n", pdn->full_name);
 
-        /* Check for parent == NULL so we don't try to setup the empty EADS
-         * slots on POWER4 machines.
-         */
-        if (dma_window == NULL || pdn->parent == NULL) {
-                pr_debug("  no dma window for device, linking to parent\n");
-                set_iommu_table_base(&dev->dev, PCI_DN(pdn)->iommu_table);
-                return;
-        }
-
         pci = PCI_DN(pdn);
         if (!pci->iommu_table) {
                 tbl = kzalloc_node(sizeof(struct iommu_table), GFP_KERNEL,
                                    pci->phb->node);
-                iommu_table_setparms_lpar(pci->phb, pdn, tbl, dma_window,
-                        pci->phb->bus->number);
+                iommu_table_setparms_lpar(pci->phb, pdn, tbl, dma_window);
                 pci->iommu_table = iommu_init_table(tbl, pci->phb->node);
                 pr_debug("  created table: %p\n", pci->iommu_table);
         } else {
@@ -556,24 +1017,145 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)
 
         set_iommu_table_base(&dev->dev, pci->iommu_table);
 }
+
+static int dma_set_mask_pSeriesLP(struct device *dev, u64 dma_mask)
+{
+        bool ddw_enabled = false;
+        struct device_node *pdn, *dn;
+        struct pci_dev *pdev;
+        const void *dma_window = NULL;
+        u64 dma_offset;
+
+        if (!dev->dma_mask)
+                return -EIO;
+
+        if (!dev_is_pci(dev))
+                goto check_mask;
+
+        pdev = to_pci_dev(dev);
+
+        /* only attempt to use a new window if 64-bit DMA is requested */
+        if (!disable_ddw && dma_mask == DMA_BIT_MASK(64)) {
+                dn = pci_device_to_OF_node(pdev);
+                dev_dbg(dev, "node is %s\n", dn->full_name);
+
+                /*
+                 * the device tree might contain the dma-window properties
+                 * per-device and not necessarily for the bus. So we need to
+                 * search upwards in the tree until we either hit a dma-window
+                 * property, OR find a parent with a table already allocated.
+                 */
+                for (pdn = dn; pdn && PCI_DN(pdn) && !PCI_DN(pdn)->iommu_table;
+                                pdn = pdn->parent) {
+                        dma_window = of_get_property(pdn, "ibm,dma-window", NULL);
+                        if (dma_window)
+                                break;
+                }
+                if (pdn && PCI_DN(pdn)) {
+                        dma_offset = enable_ddw(pdev, pdn);
+                        if (dma_offset != 0) {
+                                dev_info(dev, "Using 64-bit direct DMA at offset %llx\n", dma_offset);
+                                set_dma_offset(dev, dma_offset);
+                                set_dma_ops(dev, &dma_direct_ops);
+                                ddw_enabled = true;
+                        }
+                }
+        }
+
+        /* fall back on iommu ops, restore table pointer with ops */
+        if (!ddw_enabled && get_dma_ops(dev) != &dma_iommu_ops) {
+                dev_info(dev, "Restoring 32-bit DMA via iommu\n");
+                set_dma_ops(dev, &dma_iommu_ops);
+                pci_dma_dev_setup_pSeriesLP(pdev);
+        }
+
+check_mask:
+        if (!dma_supported(dev, dma_mask))
+                return -EIO;
+
+        *dev->dma_mask = dma_mask;
+        return 0;
+}
+
 #else  /* CONFIG_PCI */
 #define pci_dma_bus_setup_pSeries       NULL
 #define pci_dma_dev_setup_pSeries       NULL
 #define pci_dma_bus_setup_pSeriesLP     NULL
 #define pci_dma_dev_setup_pSeriesLP     NULL
+#define dma_set_mask_pSeriesLP          NULL
 #endif /* !CONFIG_PCI */
 
+static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action,
+                void *data)
+{
+        struct direct_window *window;
+        struct memory_notify *arg = data;
+        int ret = 0;
+
+        switch (action) {
+        case MEM_GOING_ONLINE:
+                spin_lock(&direct_window_list_lock);
+                list_for_each_entry(window, &direct_window_list, list) {
+                        ret |= tce_setrange_multi_pSeriesLP(arg->start_pfn,
+                                        arg->nr_pages, window->prop);
+                        /* XXX log error */
+                }
+                spin_unlock(&direct_window_list_lock);
+                break;
+        case MEM_CANCEL_ONLINE:
+        case MEM_OFFLINE:
+                spin_lock(&direct_window_list_lock);
+                list_for_each_entry(window, &direct_window_list, list) {
+                        ret |= tce_clearrange_multi_pSeriesLP(arg->start_pfn,
+                                        arg->nr_pages, window->prop);
+                        /* XXX log error */
+                }
+                spin_unlock(&direct_window_list_lock);
+                break;
+        default:
+                break;
+        }
+        if (ret && action != MEM_CANCEL_ONLINE)
+                return NOTIFY_BAD;
+
+        return NOTIFY_OK;
+}
+
+static struct notifier_block iommu_mem_nb = {
+        .notifier_call = iommu_mem_notifier,
+};
+
 static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long action, void *node)
 {
         int err = NOTIFY_OK;
         struct device_node *np = node;
         struct pci_dn *pci = PCI_DN(np);
+        struct direct_window *window;
 
         switch (action) {
         case PSERIES_RECONFIG_REMOVE:
-                if (pci && pci->iommu_table &&
-                    of_get_property(np, "ibm,dma-window", NULL))
+                if (pci && pci->iommu_table)
                         iommu_free_table(pci->iommu_table, np->full_name);
+
+                spin_lock(&direct_window_list_lock);
+                list_for_each_entry(window, &direct_window_list, list) {
+                        if (window->device == np) {
+                                list_del(&window->list);
+                                kfree(window);
+                                break;
+                        }
+                }
+                spin_unlock(&direct_window_list_lock);
+
+                /*
+                 * Because the notifier runs after isolation of the
+                 * slot, we are guaranteed any DMA window has already
+                 * been revoked and the TCEs have been marked invalid,
+                 * so we don't need a call to remove_ddw(np). However,
+                 * if an additional notifier action is added before the
+                 * isolate call, we should update this code for
+                 * completeness with such a call.
+                 */
                 break;
         default:
                 err = NOTIFY_DONE;
@@ -589,13 +1171,8 @@ static struct notifier_block iommu_reconfig_nb = {
 /* These are called very early. */
 void iommu_init_early_pSeries(void)
 {
-        if (of_chosen && of_get_property(of_chosen, "linux,iommu-off", NULL)) {
-                /* Direct I/O, IOMMU off */
-                ppc_md.pci_dma_dev_setup = NULL;
-                ppc_md.pci_dma_bus_setup = NULL;
-                set_pci_dma_ops(&dma_direct_ops);
+        if (of_chosen && of_get_property(of_chosen, "linux,iommu-off", NULL))
                 return;
-        }
 
         if (firmware_has_feature(FW_FEATURE_LPAR)) {
                 if (firmware_has_feature(FW_FEATURE_MULTITCE)) {
@@ -608,6 +1185,7 @@ void iommu_init_early_pSeries(void)
                 ppc_md.tce_get   = tce_get_pSeriesLP;
                 ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_pSeriesLP;
                 ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_pSeriesLP;
+                ppc_md.dma_set_mask = dma_set_mask_pSeriesLP;
         } else {
                 ppc_md.tce_build = tce_build_pSeries;
                 ppc_md.tce_free  = tce_free_pSeries;
@@ -618,7 +1196,22 @@ void iommu_init_early_pSeries(void)
 
 
         pSeries_reconfig_notifier_register(&iommu_reconfig_nb);
+        register_memory_notifier(&iommu_mem_nb);
 
         set_pci_dma_ops(&dma_iommu_ops);
 }
 
+static int __init disable_multitce(char *str)
+{
+        if (strcmp(str, "off") == 0 &&
+            firmware_has_feature(FW_FEATURE_LPAR) &&
+            firmware_has_feature(FW_FEATURE_MULTITCE)) {
+                printk(KERN_INFO "Disabling MULTITCE firmware feature\n");
+                ppc_md.tce_build = tce_build_pSeriesLP;
+                ppc_md.tce_free  = tce_free_pSeriesLP;
+                powerpc_firmware_features &= ~FW_FEATURE_MULTITCE;
+        }
+        return 1;
+}
+
+__setup("multitce=", disable_multitce);
diff --git a/arch/powerpc/platforms/pseries/kexec.c b/arch/powerpc/platforms/pseries/kexec.c
index 53cbd53d8740..54cf3a4aa16b 100644
--- a/arch/powerpc/platforms/pseries/kexec.c
+++ b/arch/powerpc/platforms/pseries/kexec.c
@@ -7,15 +7,18 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+
 #include <asm/machdep.h>
 #include <asm/page.h>
 #include <asm/firmware.h>
 #include <asm/kexec.h>
 #include <asm/mpic.h>
+#include <asm/xics.h>
 #include <asm/smp.h>
 
 #include "pseries.h"
-#include "xics.h"
 #include "plpar_wrappers.h"
 
 static void pseries_kexec_cpu_down(int crash_shutdown, int secondary)
@@ -61,13 +64,3 @@ void __init setup_kexec_cpu_down_xics(void)
 {
         ppc_md.kexec_cpu_down = pseries_kexec_cpu_down_xics;
 }
-
-static int __init pseries_kexec_setup(void)
-{
-        ppc_md.machine_kexec = default_machine_kexec;
-        ppc_md.machine_kexec_prepare = default_machine_kexec_prepare;
-        ppc_md.machine_crash_shutdown = default_machine_crash_shutdown;
-
-        return 0;
-}
-machine_device_initcall(pseries, pseries_kexec_setup);
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index cf79b46d8f88..39e6e0a7b2fa 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -248,11 +248,13 @@ void vpa_init(int cpu)
         int hwcpu = get_hard_smp_processor_id(cpu);
         unsigned long addr;
         long ret;
+        struct paca_struct *pp;
+        struct dtl_entry *dtl;
 
         if (cpu_has_feature(CPU_FTR_ALTIVEC))
-                lppaca[cpu].vmxregs_in_use = 1;
+                lppaca_of(cpu).vmxregs_in_use = 1;
 
-        addr = __pa(&lppaca[cpu]);
+        addr = __pa(&lppaca_of(cpu));
         ret = register_vpa(hwcpu, addr);
 
         if (ret) {
@@ -274,6 +276,25 @@ void vpa_init(int cpu)
                                "registration for cpu %d (hw %d) of area %lx "
                                "returns %ld\n", cpu, hwcpu, addr, ret);
         }
+
+        /*
+         * Register dispatch trace log, if one has been allocated.
+         */
+        pp = &paca[cpu];
+        dtl = pp->dispatch_log;
+        if (dtl) {
+                pp->dtl_ridx = 0;
+                pp->dtl_curr = dtl;
+                lppaca_of(cpu).dtl_idx = 0;
+
+                /* hypervisor reads buffer length from this field */
+                dtl->enqueue_to_dispatch_time = DISPATCH_LOG_BYTES;
+                ret = register_dtl(hwcpu, __pa(dtl));
+                if (ret)
+                        pr_warn("DTL registration failed for cpu %d (%ld)\n",
+                                cpu, ret);
+                lppaca_of(cpu).dtl_enable_mask = 2;
+        }
 }
 
 static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
@@ -308,6 +329,8 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
         /* Make pHyp happy */
         if ((rflags & _PAGE_NO_CACHE) & !(rflags & _PAGE_WRITETHRU))
                 hpte_r &= ~_PAGE_COHERENT;
+        if (firmware_has_feature(FW_FEATURE_XCMO) && !(hpte_r & HPTE_R_N))
+                flags |= H_COALESCE_CAND;
 
         lpar_rc = plpar_pte_enter(flags, hpte_group, hpte_v, hpte_r, &slot);
         if (unlikely(lpar_rc == H_PTEG_FULL)) {
@@ -552,7 +575,7 @@ static void pSeries_lpar_flush_hash_range(unsigned long number, int local)
         unsigned long i, pix, rc;
         unsigned long flags = 0;
         struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
-        int lock_tlbie = !cpu_has_feature(CPU_FTR_LOCKLESS_TLBIE);
+        int lock_tlbie = !mmu_has_feature(MMU_FTR_LOCKLESS_TLBIE);
         unsigned long param[9];
         unsigned long va;
         unsigned long hash, index, shift, hidx, slot;
@@ -606,6 +629,18 @@ static void pSeries_lpar_flush_hash_range(unsigned long number, int local)
                 spin_unlock_irqrestore(&pSeries_lpar_tlbie_lock, flags);
 }
 
+static int __init disable_bulk_remove(char *str)
+{
+        if (strcmp(str, "off") == 0 &&
+            firmware_has_feature(FW_FEATURE_BULK_REMOVE)) {
+                        printk(KERN_INFO "Disabling BULK_REMOVE firmware feature");
+                        powerpc_firmware_features &= ~FW_FEATURE_BULK_REMOVE;
+        }
+        return 1;
+}
+
+__setup("bulk_remove=", disable_bulk_remove);
+
 void __init hpte_init_lpar(void)
 {
         ppc_md.hpte_invalidate  = pSeries_lpar_hpte_invalidate;
@@ -680,6 +715,13 @@ EXPORT_SYMBOL(arch_free_page);
 /* NB: reg/unreg are called while guarded with the tracepoints_mutex */
 extern long hcall_tracepoint_refcount;
 
+/* 
+ * Since the tracing code might execute hcalls we need to guard against
+ * recursion. One example of this are spinlocks calling H_YIELD on
+ * shared processor partitions.
+ */
+static DEFINE_PER_CPU(unsigned int, hcall_trace_depth);
+
 void hcall_tracepoint_regfunc(void)
 {
         hcall_tracepoint_refcount++;
@@ -692,12 +734,86 @@ void hcall_tracepoint_unregfunc(void)
 
 void __trace_hcall_entry(unsigned long opcode, unsigned long *args)
 {
+        unsigned long flags;
+        unsigned int *depth;
+
+        local_irq_save(flags);
+
+        depth = &__get_cpu_var(hcall_trace_depth);
+
+        if (*depth)
+                goto out;
+
+        (*depth)++;
         trace_hcall_entry(opcode, args);
+        (*depth)--;
+
+out:
+        local_irq_restore(flags);
 }
 
 void __trace_hcall_exit(long opcode, unsigned long retval,
                         unsigned long *retbuf)
 {
+        unsigned long flags;
+        unsigned int *depth;
+
+        local_irq_save(flags);
+
+        depth = &__get_cpu_var(hcall_trace_depth);
+
+        if (*depth)
+                goto out;
+
+        (*depth)++;
         trace_hcall_exit(opcode, retval, retbuf);
+        (*depth)--;
+
+out:
+        local_irq_restore(flags);
 }
 #endif
+
+/**
+ * h_get_mpp
+ * H_GET_MPP hcall returns info in 7 parms
+ */
+int h_get_mpp(struct hvcall_mpp_data *mpp_data)
+{
+        int rc;
+        unsigned long retbuf[PLPAR_HCALL9_BUFSIZE];
+
+        rc = plpar_hcall9(H_GET_MPP, retbuf);
+
+        mpp_data->entitled_mem = retbuf[0];
+        mpp_data->mapped_mem = retbuf[1];
+
+        mpp_data->group_num = (retbuf[2] >> 2 * 8) & 0xffff;
+        mpp_data->pool_num = retbuf[2] & 0xffff;
+
+        mpp_data->mem_weight = (retbuf[3] >> 7 * 8) & 0xff;
+        mpp_data->unallocated_mem_weight = (retbuf[3] >> 6 * 8) & 0xff;
+        mpp_data->unallocated_entitlement = retbuf[3] & 0xffffffffffff;
+
+        mpp_data->pool_size = retbuf[4];
+        mpp_data->loan_request = retbuf[5];
+        mpp_data->backing_mem = retbuf[6];
+
+        return rc;
+}
+EXPORT_SYMBOL(h_get_mpp);
+
+int h_get_mpp_x(struct hvcall_mpp_x_data *mpp_x_data)
+{
+        int rc;
+        unsigned long retbuf[PLPAR_HCALL9_BUFSIZE] = { 0 };
+
+        rc = plpar_hcall9(H_GET_MPP_X, retbuf);
+
+        mpp_x_data->coalesced_bytes = retbuf[0];
+        mpp_x_data->pool_coalesced_bytes = retbuf[1];
+        mpp_x_data->pool_purr_cycles = retbuf[2];
+        mpp_x_data->pool_spurr_cycles = retbuf[3];
+
+        return rc;
+}
diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c
new file mode 100644
index 000000000000..3e7f651e50ac
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/mobility.c
@@ -0,0 +1,362 @@
+/*
+ * Support for Partition Mobility/Migration
+ *
+ * Copyright (C) 2010 Nathan Fontenot
+ * Copyright (C) 2010 IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version
+ * 2 as published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/kobject.h>
+#include <linux/smp.h>
+#include <linux/completion.h>
+#include <linux/device.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+
+#include <asm/rtas.h>
+#include "pseries.h"
+
+static struct kobject *mobility_kobj;
+
+struct update_props_workarea {
+        u32 phandle;
+        u32 state;
+        u64 reserved;
+        u32 nprops;
+};
+
+#define NODE_ACTION_MASK        0xff000000
+#define NODE_COUNT_MASK         0x00ffffff
+
+#define DELETE_DT_NODE  0x01000000
+#define UPDATE_DT_NODE  0x02000000
+#define ADD_DT_NODE     0x03000000
+
+static int mobility_rtas_call(int token, char *buf)
+{
+        int rc;
+
+        spin_lock(&rtas_data_buf_lock);
+
+        memcpy(rtas_data_buf, buf, RTAS_DATA_BUF_SIZE);
+        rc = rtas_call(token, 2, 1, NULL, rtas_data_buf, 1);
+        memcpy(buf, rtas_data_buf, RTAS_DATA_BUF_SIZE);
+
+        spin_unlock(&rtas_data_buf_lock);
+        return rc;
+}
+
+static int delete_dt_node(u32 phandle)
+{
+        struct device_node *dn;
+
+        dn = of_find_node_by_phandle(phandle);
+        if (!dn)
+                return -ENOENT;
+
+        dlpar_detach_node(dn);
+        return 0;
+}
+
+static int update_dt_property(struct device_node *dn, struct property **prop,
+                              const char *name, u32 vd, char *value)
+{
+        struct property *new_prop = *prop;
+        struct property *old_prop;
+        int more = 0;
+
+        /* A negative 'vd' value indicates that only part of the new property
+         * value is contained in the buffer and we need to call
+         * ibm,update-properties again to get the rest of the value.
+         *
+         * A negative value is also the two's compliment of the actual value.
+         */
+        if (vd & 0x80000000) {
+                vd = ~vd + 1;
+                more = 1;
+        }
+
+        if (new_prop) {
+                /* partial property fixup */
+                char *new_data = kzalloc(new_prop->length + vd, GFP_KERNEL);
+                if (!new_data)
+                        return -ENOMEM;
+
+                memcpy(new_data, new_prop->value, new_prop->length);
+                memcpy(new_data + new_prop->length, value, vd);
+
+                kfree(new_prop->value);
+                new_prop->value = new_data;
+                new_prop->length += vd;
+        } else {
+                new_prop = kzalloc(sizeof(*new_prop), GFP_KERNEL);
+                if (!new_prop)
+                        return -ENOMEM;
+
+                new_prop->name = kstrdup(name, GFP_KERNEL);
+                if (!new_prop->name) {
+                        kfree(new_prop);
+                        return -ENOMEM;
+                }
+
+                new_prop->length = vd;
+                new_prop->value = kzalloc(new_prop->length, GFP_KERNEL);
+                if (!new_prop->value) {
+                        kfree(new_prop->name);
+                        kfree(new_prop);
+                        return -ENOMEM;
+                }
+
+                memcpy(new_prop->value, value, vd);
+                *prop = new_prop;
+        }
+
+        if (!more) {
+                old_prop = of_find_property(dn, new_prop->name, NULL);
+                if (old_prop)
+                        prom_update_property(dn, new_prop, old_prop);
+                else
+                        prom_add_property(dn, new_prop);
+
+                new_prop = NULL;
+        }
+
+        return 0;
+}
+
+static int update_dt_node(u32 phandle)
+{
+        struct update_props_workarea *upwa;
+        struct device_node *dn;
+        struct property *prop = NULL;
+        int i, rc;
+        char *prop_data;
+        char *rtas_buf;
+        int update_properties_token;
+
+        update_properties_token = rtas_token("ibm,update-properties");
+        if (update_properties_token == RTAS_UNKNOWN_SERVICE)
+                return -EINVAL;
+
+        rtas_buf = kzalloc(RTAS_DATA_BUF_SIZE, GFP_KERNEL);
+        if (!rtas_buf)
+                return -ENOMEM;
+
+        dn = of_find_node_by_phandle(phandle);
+        if (!dn) {
+                kfree(rtas_buf);
+                return -ENOENT;
+        }
+
+        upwa = (struct update_props_workarea *)&rtas_buf[0];
+        upwa->phandle = phandle;
+
+        do {
+                rc = mobility_rtas_call(update_properties_token, rtas_buf);
+                if (rc < 0)
+                        break;
+
+                prop_data = rtas_buf + sizeof(*upwa);
+
+                for (i = 0; i < upwa->nprops; i++) {
+                        char *prop_name;
+                        u32 vd;
+
+                        prop_name = prop_data + 1;
+                        prop_data += strlen(prop_name) + 1;
+                        vd = *prop_data++;
+
+                        switch (vd) {
+                        case 0x00000000:
+                                /* name only property, nothing to do */
+                                break;
+
+                        case 0x80000000:
+                                prop = of_find_property(dn, prop_name, NULL);
+                                prom_remove_property(dn, prop);
+                                prop = NULL;
+                                break;
+
+                        default:
+                                rc = update_dt_property(dn, &prop, prop_name,
+                                                        vd, prop_data);
+                                if (rc) {
+                                        printk(KERN_ERR "Could not update %s"
+                                               " property\n", prop_name);
+                                }
+
+                                prop_data += vd;
+                        }
+                }
+        } while (rc == 1);
+
+        of_node_put(dn);
+        kfree(rtas_buf);
+        return 0;
+}
+
+static int add_dt_node(u32 parent_phandle, u32 drc_index)
+{
+        struct device_node *dn;
+        struct device_node *parent_dn;
+        int rc;
+
+        dn = dlpar_configure_connector(drc_index);
+        if (!dn)
+                return -ENOENT;
+
+        parent_dn = of_find_node_by_phandle(parent_phandle);
+        if (!parent_dn) {
+                dlpar_free_cc_nodes(dn);
+                return -ENOENT;
+        }
+
+        dn->parent = parent_dn;
+        rc = dlpar_attach_node(dn);
+        if (rc)
+                dlpar_free_cc_nodes(dn);
+
+        of_node_put(parent_dn);
+        return rc;
+}
+
+static int pseries_devicetree_update(void)
+{
+        char *rtas_buf;
+        u32 *data;
+        int update_nodes_token;
+        int rc;
+
+        update_nodes_token = rtas_token("ibm,update-nodes");
+        if (update_nodes_token == RTAS_UNKNOWN_SERVICE)
+                return -EINVAL;
+
+        rtas_buf = kzalloc(RTAS_DATA_BUF_SIZE, GFP_KERNEL);
+        if (!rtas_buf)
+                return -ENOMEM;
+
+        do {
+                rc = mobility_rtas_call(update_nodes_token, rtas_buf);
+                if (rc && rc != 1)
+                        break;
+
+                data = (u32 *)rtas_buf + 4;
+                while (*data & NODE_ACTION_MASK) {
+                        int i;
+                        u32 action = *data & NODE_ACTION_MASK;
+                        int node_count = *data & NODE_COUNT_MASK;
+
+                        data++;
+
+                        for (i = 0; i < node_count; i++) {
+                                u32 phandle = *data++;
+                                u32 drc_index;
+
+                                switch (action) {
+                                case DELETE_DT_NODE:
+                                        delete_dt_node(phandle);
+                                        break;
+                                case UPDATE_DT_NODE:
+                                        update_dt_node(phandle);
+                                        break;
+                                case ADD_DT_NODE:
+                                        drc_index = *data++;
+                                        add_dt_node(phandle, drc_index);
+                                        break;
+                                }
+                        }
+                }
+        } while (rc == 1);
+
+        kfree(rtas_buf);
+        return rc;
+}
+
+void post_mobility_fixup(void)
+{
+        int rc;
+        int activate_fw_token;
+
+        rc = pseries_devicetree_update();
+        if (rc) {
+                printk(KERN_ERR "Initial post-mobility device tree update "
+                       "failed: %d\n", rc);
+                return;
+        }
+
+        activate_fw_token = rtas_token("ibm,activate-firmware");
+        if (activate_fw_token == RTAS_UNKNOWN_SERVICE) {
+                printk(KERN_ERR "Could not make post-mobility "
+                       "activate-fw call.\n");
+                return;
+        }
+
+        rc = rtas_call(activate_fw_token, 0, 1, NULL);
+        if (!rc) {
+                rc = pseries_devicetree_update();
+                if (rc)
+                        printk(KERN_ERR "Secondary post-mobility device tree "
+                               "update failed: %d\n", rc);
+        } else {
+                printk(KERN_ERR "Post-mobility activate-fw failed: %d\n", rc);
+                return;
+        }
+
+        return;
+}
+
+static ssize_t migrate_store(struct class *class, struct class_attribute *attr,
+                             const char *buf, size_t count)
+{
+        struct rtas_args args;
+        u64 streamid;
+        int rc;
+
+        rc = strict_strtoull(buf, 0, &streamid);
+        if (rc)
+                return rc;
+
+        memset(&args, 0, sizeof(args));
+        args.token = rtas_token("ibm,suspend-me");
+        args.nargs = 2;
+        args.nret = 1;
+
+        args.args[0] = streamid >> 32 ;
+        args.args[1] = streamid & 0xffffffff;
+        args.rets = &args.args[args.nargs];
+
+        do {
+                args.rets[0] = 0;
+                rc = rtas_ibm_suspend_me(&args);
+                if (!rc && args.rets[0] == RTAS_NOT_SUSPENDABLE)
+                        ssleep(1);
+        } while (!rc && args.rets[0] == RTAS_NOT_SUSPENDABLE);
+
+        if (rc)
+                return rc;
+        else if (args.rets[0])
+                return args.rets[0];
+
+        post_mobility_fixup();
+        return count;
+}
+
+static CLASS_ATTR(migration, S_IWUSR, NULL, migrate_store);
+
+static int __init mobility_sysfs_init(void)
+{
+        int rc;
+
+        mobility_kobj = kobject_create_and_add("mobility", kernel_kobj);
+        if (!mobility_kobj)
+                return -ENOMEM;
+
+        rc = sysfs_create_file(mobility_kobj, &class_attr_migration.attr);
+
+        return rc;
+}
+device_initcall(mobility_sysfs_init);
diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c
index 1164c3430f2c..38d24e7e7bb1 100644
--- a/arch/powerpc/platforms/pseries/msi.c
+++ b/arch/powerpc/platforms/pseries/msi.c
@@ -93,8 +93,18 @@ static void rtas_disable_msi(struct pci_dev *pdev)
         if (!pdn)
                 return;
 
-        if (rtas_change_msi(pdn, RTAS_CHANGE_FN, 0) != 0)
-                pr_debug("rtas_msi: Setting MSIs to 0 failed!\n");
+        /*
+         * disabling MSI with the explicit interface also disables MSI-X
+         */
+        if (rtas_change_msi(pdn, RTAS_CHANGE_MSI_FN, 0) != 0) {
+                /* 
+                 * may have failed because explicit interface is not
+                 * present
+                 */
+                if (rtas_change_msi(pdn, RTAS_CHANGE_FN, 0) != 0) {
+                        pr_debug("rtas_msi: Setting MSIs to 0 failed!\n");
+                }
+        }
 }
 
 static int rtas_query_irq_number(struct pci_dn *pdn, int offset)
@@ -127,7 +137,7 @@ static void rtas_teardown_msi_irqs(struct pci_dev *pdev)
                 if (entry->irq == NO_IRQ)
                         continue;
 
-                set_irq_msi(entry->irq, NULL);
+                irq_set_msi_desc(entry->irq, NULL);
                 irq_dispose_mapping(entry->irq);
         }
 
@@ -427,7 +437,7 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
                 }
 
                 dev_dbg(&pdev->dev, "rtas_msi: allocated virq %d\n", virq);
-                set_irq_msi(virq, entry);
+                irq_set_msi_desc(virq, entry);
 
                 /* Read config space back so we can restore after reset */
                 read_msi_msg(virq, &msg);
diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c
index bc3c7f2abd79..00cc3a094885 100644
--- a/arch/powerpc/platforms/pseries/nvram.c
+++ b/arch/powerpc/platforms/pseries/nvram.c
@@ -16,17 +16,70 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
+#include <linux/slab.h>
+#include <linux/kmsg_dump.h>
 #include <asm/uaccess.h>
 #include <asm/nvram.h>
 #include <asm/rtas.h>
 #include <asm/prom.h>
 #include <asm/machdep.h>
 
+/* Max bytes to read/write in one go */
+#define NVRW_CNT 0x20
+
 static unsigned int nvram_size;
 static int nvram_fetch, nvram_store;
 static char nvram_buf[NVRW_CNT];        /* assume this is in the first 4GB */
 static DEFINE_SPINLOCK(nvram_lock);
 
+struct err_log_info {
+        int error_type;
+        unsigned int seq_num;
+};
+
+struct nvram_os_partition {
+        const char *name;
+        int req_size;   /* desired size, in bytes */
+        int min_size;   /* minimum acceptable size (0 means req_size) */
+        long size;      /* size of data portion (excluding err_log_info) */
+        long index;     /* offset of data portion of partition */
+};
+
+static struct nvram_os_partition rtas_log_partition = {
+        .name = "ibm,rtas-log",
+        .req_size = 2079,
+        .min_size = 1055,
+        .index = -1
+};
+
+static struct nvram_os_partition oops_log_partition = {
+        .name = "lnx,oops-log",
+        .req_size = 4000,
+        .min_size = 2000,
+        .index = -1
+};
+
+static const char *pseries_nvram_os_partitions[] = {
+        "ibm,rtas-log",
+        "lnx,oops-log",
+        NULL
+};
+
+static void oops_to_nvram(struct kmsg_dumper *dumper,
+                enum kmsg_dump_reason reason,
+                const char *old_msgs, unsigned long old_len,
+                const char *new_msgs, unsigned long new_len);
+
+static struct kmsg_dumper nvram_kmsg_dumper = {
+        .dump = oops_to_nvram
+};
+
+/* See clobbering_unread_rtas_event() */
+#define NVRAM_RTAS_READ_TIMEOUT 5               /* seconds */
+static unsigned long last_unread_rtas_event;    /* timestamp */
+
+/* We preallocate oops_buf during init to avoid kmalloc during oops/panic. */
+static char *oops_buf;
 
 static ssize_t pSeries_nvram_read(char *buf, size_t count, loff_t *index)
 {
@@ -119,6 +172,239 @@ static ssize_t pSeries_nvram_get_size(void)
         return nvram_size ? nvram_size : -ENODEV;
 }
 
+
+/* nvram_write_os_partition, nvram_write_error_log
+ *
+ * We need to buffer the error logs into nvram to ensure that we have
+ * the failure information to decode.  If we have a severe error there
+ * is no way to guarantee that the OS or the machine is in a state to
+ * get back to user land and write the error to disk.  For example if
+ * the SCSI device driver causes a Machine Check by writing to a bad
+ * IO address, there is no way of guaranteeing that the device driver
+ * is in any state that is would also be able to write the error data
+ * captured to disk, thus we buffer it in NVRAM for analysis on the
+ * next boot.
+ *
+ * In NVRAM the partition containing the error log buffer will looks like:
+ * Header (in bytes):
+ * +-----------+----------+--------+------------+------------------+
+ * | signature | checksum | length | name       | data             |
+ * |0          |1         |2      3|4         15|16        length-1|
+ * +-----------+----------+--------+------------+------------------+
+ *
+ * The 'data' section would look like (in bytes):
+ * +--------------+------------+-----------------------------------+
+ * | event_logged | sequence # | error log                         |
+ * |0            3|4          7|8                  error_log_size-1|
+ * +--------------+------------+-----------------------------------+
+ *
+ * event_logged: 0 if event has not been logged to syslog, 1 if it has
+ * sequence #: The unique sequence # for each event. (until it wraps)
+ * error log: The error log from event_scan
+ */
+int nvram_write_os_partition(struct nvram_os_partition *part, char * buff,
+                int length, unsigned int err_type, unsigned int error_log_cnt)
+{
+        int rc;
+        loff_t tmp_index;
+        struct err_log_info info;
+        
+        if (part->index == -1) {
+                return -ESPIPE;
+        }
+
+        if (length > part->size) {
+                length = part->size;
+        }
+
+        info.error_type = err_type;
+        info.seq_num = error_log_cnt;
+
+        tmp_index = part->index;
+
+        rc = ppc_md.nvram_write((char *)&info, sizeof(struct err_log_info), &tmp_index);
+        if (rc <= 0) {
+                pr_err("%s: Failed nvram_write (%d)\n", __FUNCTION__, rc);
+                return rc;
+        }
+
+        rc = ppc_md.nvram_write(buff, length, &tmp_index);
+        if (rc <= 0) {
+                pr_err("%s: Failed nvram_write (%d)\n", __FUNCTION__, rc);
+                return rc;
+        }
+        
+        return 0;
+}
+
+int nvram_write_error_log(char * buff, int length,
+                          unsigned int err_type, unsigned int error_log_cnt)
+{
+        int rc = nvram_write_os_partition(&rtas_log_partition, buff, length,
+                                                err_type, error_log_cnt);
+        if (!rc)
+                last_unread_rtas_event = get_seconds();
+        return rc;
+}
+
+/* nvram_read_error_log
+ *
+ * Reads nvram for error log for at most 'length'
+ */
+int nvram_read_error_log(char * buff, int length,
+                         unsigned int * err_type, unsigned int * error_log_cnt)
+{
+        int rc;
+        loff_t tmp_index;
+        struct err_log_info info;
+        
+        if (rtas_log_partition.index == -1)
+                return -1;
+
+        if (length > rtas_log_partition.size)
+                length = rtas_log_partition.size;
+
+        tmp_index = rtas_log_partition.index;
+
+        rc = ppc_md.nvram_read((char *)&info, sizeof(struct err_log_info), &tmp_index);
+        if (rc <= 0) {
+                printk(KERN_ERR "nvram_read_error_log: Failed nvram_read (%d)\n", rc);
+                return rc;
+        }
+
+        rc = ppc_md.nvram_read(buff, length, &tmp_index);
+        if (rc <= 0) {
+                printk(KERN_ERR "nvram_read_error_log: Failed nvram_read (%d)\n", rc);
+                return rc;
+        }
+
+        *error_log_cnt = info.seq_num;
+        *err_type = info.error_type;
+
+        return 0;
+}
+
+/* This doesn't actually zero anything, but it sets the event_logged
+ * word to tell that this event is safely in syslog.
+ */
+int nvram_clear_error_log(void)
+{
+        loff_t tmp_index;
+        int clear_word = ERR_FLAG_ALREADY_LOGGED;
+        int rc;
+
+        if (rtas_log_partition.index == -1)
+                return -1;
+
+        tmp_index = rtas_log_partition.index;
+        
+        rc = ppc_md.nvram_write((char *)&clear_word, sizeof(int), &tmp_index);
+        if (rc <= 0) {
+                printk(KERN_ERR "nvram_clear_error_log: Failed nvram_write (%d)\n", rc);
+                return rc;
+        }
+        last_unread_rtas_event = 0;
+
+        return 0;
+}
+
+/* pseries_nvram_init_os_partition
+ *
+ * This sets up a partition with an "OS" signature.
+ *
+ * The general strategy is the following:
+ * 1.) If a partition with the indicated name already exists...
+ *      - If it's large enough, use it.
+ *      - Otherwise, recycle it and keep going.
+ * 2.) Search for a free partition that is large enough.
+ * 3.) If there's not a free partition large enough, recycle any obsolete
+ * OS partitions and try again.
+ * 4.) Will first try getting a chunk that will satisfy the requested size.
+ * 5.) If a chunk of the requested size cannot be allocated, then try finding
+ * a chunk that will satisfy the minum needed.
+ *
+ * Returns 0 on success, else -1.
+ */
+static int __init pseries_nvram_init_os_partition(struct nvram_os_partition
+                                                                        *part)
+{
+        loff_t p;
+        int size;
+
+        /* Scan nvram for partitions */
+        nvram_scan_partitions();
+
+        /* Look for ours */
+        p = nvram_find_partition(part->name, NVRAM_SIG_OS, &size);
+
+        /* Found one but too small, remove it */
+        if (p && size < part->min_size) {
+                pr_info("nvram: Found too small %s partition,"
+                                        " removing it...\n", part->name);
+                nvram_remove_partition(part->name, NVRAM_SIG_OS, NULL);
+                p = 0;
+        }
+
+        /* Create one if we didn't find */
+        if (!p) {
+                p = nvram_create_partition(part->name, NVRAM_SIG_OS,
+                                        part->req_size, part->min_size);
+                if (p == -ENOSPC) {
+                        pr_info("nvram: No room to create %s partition, "
+                                "deleting any obsolete OS partitions...\n",
+                                part->name);
+                        nvram_remove_partition(NULL, NVRAM_SIG_OS,
+                                                pseries_nvram_os_partitions);
+                        p = nvram_create_partition(part->name, NVRAM_SIG_OS,
+                                        part->req_size, part->min_size);
+                }
+        }
+
+        if (p <= 0) {
+                pr_err("nvram: Failed to find or create %s"
+                       " partition, err %d\n", part->name, (int)p);
+                return -1;
+        }
+
+        part->index = p;
+        part->size = nvram_get_partition_size(p) - sizeof(struct err_log_info);
+        
+        return 0;
+}
+
+static void __init nvram_init_oops_partition(int rtas_partition_exists)
+{
+        int rc;
+
+        rc = pseries_nvram_init_os_partition(&oops_log_partition);
+        if (rc != 0) {
+                if (!rtas_partition_exists)
+                        return;
+                pr_notice("nvram: Using %s partition to log both"
+                        " RTAS errors and oops/panic reports\n",
+                        rtas_log_partition.name);
+                memcpy(&oops_log_partition, &rtas_log_partition,
+                                                sizeof(rtas_log_partition));
+        }
+        oops_buf = kmalloc(oops_log_partition.size, GFP_KERNEL);
+        rc = kmsg_dump_register(&nvram_kmsg_dumper);
+        if (rc != 0) {
+                pr_err("nvram: kmsg_dump_register() failed; returned %d\n", rc);
+                kfree(oops_buf);
+                return;
+        }
+}
+
+static int __init pseries_nvram_init_log_partitions(void)
+{
+        int rc;
+
+        rc = pseries_nvram_init_os_partition(&rtas_log_partition);
+        nvram_init_oops_partition(rc == 0);
+        return 0;
+}
+machine_arch_initcall(pseries, pseries_nvram_init_log_partitions);
+
 int __init pSeries_nvram_init(void)
 {
         struct device_node *nvram;
@@ -148,3 +434,83 @@ int __init pSeries_nvram_init(void)
 
         return 0;
 }
+
+/*
+ * Try to capture the last capture_len bytes of the printk buffer.  Return
+ * the amount actually captured.
+ */
+static size_t capture_last_msgs(const char *old_msgs, size_t old_len,
+                                const char *new_msgs, size_t new_len,
+                                char *captured, size_t capture_len)
+{
+        if (new_len >= capture_len) {
+                memcpy(captured, new_msgs + (new_len - capture_len),
+                                                                capture_len);
+                return capture_len;
+        } else {
+                /* Grab the end of old_msgs. */
+                size_t old_tail_len = min(old_len, capture_len - new_len);
+                memcpy(captured, old_msgs + (old_len - old_tail_len),
+                                                                old_tail_len);
+                memcpy(captured + old_tail_len, new_msgs, new_len);
+                return old_tail_len + new_len;
+        }
+}
+
+/*
+ * Are we using the ibm,rtas-log for oops/panic reports?  And if so,
+ * would logging this oops/panic overwrite an RTAS event that rtas_errd
+ * hasn't had a chance to read and process?  Return 1 if so, else 0.
+ *
+ * We assume that if rtas_errd hasn't read the RTAS event in
+ * NVRAM_RTAS_READ_TIMEOUT seconds, it's probably not going to.
+ */
+static int clobbering_unread_rtas_event(void)
+{
+        return (oops_log_partition.index == rtas_log_partition.index
+                && last_unread_rtas_event
+                && get_seconds() - last_unread_rtas_event <=
+                                                NVRAM_RTAS_READ_TIMEOUT);
+}
+
+/* our kmsg_dump callback */
+static void oops_to_nvram(struct kmsg_dumper *dumper,
+                enum kmsg_dump_reason reason,
+                const char *old_msgs, unsigned long old_len,
+                const char *new_msgs, unsigned long new_len)
+{
+        static unsigned int oops_count = 0;
+        static bool panicking = false;
+        size_t text_len;
+
+        switch (reason) {
+        case KMSG_DUMP_RESTART:
+        case KMSG_DUMP_HALT:
+        case KMSG_DUMP_POWEROFF:
+                /* These are almost always orderly shutdowns. */
+                return;
+        case KMSG_DUMP_OOPS:
+        case KMSG_DUMP_KEXEC:
+                break;
+        case KMSG_DUMP_PANIC:
+                panicking = true;
+                break;
+        case KMSG_DUMP_EMERG:
+                if (panicking)
+                        /* Panic report already captured. */
+                        return;
+                break;
+        default:
+                pr_err("%s: ignoring unrecognized KMSG_DUMP_* reason %d\n",
+                                                __FUNCTION__, (int) reason);
+                return;
+        }
+
+        if (clobbering_unread_rtas_event())
+                return;
+
+        text_len = capture_last_msgs(old_msgs, old_len, new_msgs, new_len,
+                                        oops_buf, oops_log_partition.size);
+        (void) nvram_write_os_partition(&oops_log_partition, oops_buf,
+                (int) text_len, ERR_TYPE_KERNEL_PANIC, ++oops_count);
+}
diff --git a/arch/powerpc/platforms/pseries/offline_states.h b/arch/powerpc/platforms/pseries/offline_states.h
index 75a6f480d931..08672d9136ab 100644
--- a/arch/powerpc/platforms/pseries/offline_states.h
+++ b/arch/powerpc/platforms/pseries/offline_states.h
@@ -34,6 +34,4 @@ static inline void set_default_offline_state(int cpu)
 #endif
 
 extern enum cpu_state_vals get_preferred_offline_state(int cpu);
-extern int start_secondary(void);
-extern void start_secondary_resume(void);
 #endif
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index 4b7a062dee15..3bf4488aaec6 100644
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -25,8 +25,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#undef DEBUG
-
 #include <linux/pci.h>
 #include <asm/pci-bridge.h>
 #include <asm/ppc-pci.h>
@@ -151,7 +149,7 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
         if (dn->child)
                 eeh_add_device_tree_early(dn);
 
-        pcibios_scan_phb(phb, dn);
+        pcibios_scan_phb(phb);
         pcibios_finish_adding_to_bus(phb->bus);
 
         return phb;
diff --git a/arch/powerpc/platforms/pseries/plpar_wrappers.h b/arch/powerpc/platforms/pseries/plpar_wrappers.h
index d9801117124b..4bf21207d7d3 100644
--- a/arch/powerpc/platforms/pseries/plpar_wrappers.h
+++ b/arch/powerpc/platforms/pseries/plpar_wrappers.h
@@ -270,31 +270,4 @@ static inline long plpar_put_term_char(unsigned long termno, unsigned long len,
                         lbuf[1]);
 }
 
-static inline long plpar_eoi(unsigned long xirr)
-{
-        return plpar_hcall_norets(H_EOI, xirr);
-}
-
-static inline long plpar_cppr(unsigned long cppr)
-{
-        return plpar_hcall_norets(H_CPPR, cppr);
-}
-
-static inline long plpar_ipi(unsigned long servernum, unsigned long mfrr)
-{
-        return plpar_hcall_norets(H_IPI, servernum, mfrr);
-}
-
-static inline long plpar_xirr(unsigned long *xirr_ret, unsigned char cppr)
-{
-        long rc;
-        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
-
-        rc = plpar_hcall(H_XIRR, retbuf, cppr);
-
-        *xirr_ret = retbuf[0];
-
-        return rc;
-}
-
 #endif /* _PSERIES_PLPAR_WRAPPERS_H */
diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h
index 40c93cad91d2..e9f6d2859c3c 100644
--- a/arch/powerpc/platforms/pseries/pseries.h
+++ b/arch/powerpc/platforms/pseries/pseries.h
@@ -17,6 +17,8 @@ struct device_node;
 extern void request_event_sources_irqs(struct device_node *np,
                                        irq_handler_t handler, const char *name);
 
+#include <linux/of.h>
+
 extern void __init fw_feature_init(const char *hypertas, unsigned long len);
 
 struct pt_regs;
@@ -47,4 +49,11 @@ extern unsigned long rtas_poweron_auto;
 
 extern void find_udbg_vterm(void);
 
+/* Dynamic logical Partitioning/Mobility */
+extern void dlpar_free_cc_nodes(struct device_node *);
+extern void dlpar_free_cc_property(struct property *);
+extern struct device_node *dlpar_configure_connector(u32);
+extern int dlpar_attach_node(struct device_node *);
+extern int dlpar_detach_node(struct device_node *);
+
 #endif /* _PSERIES_PSERIES_H */
diff --git a/arch/powerpc/platforms/pseries/pseries_energy.c b/arch/powerpc/platforms/pseries/pseries_energy.c
new file mode 100644
index 000000000000..c8b3c69fe891
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/pseries_energy.c
@@ -0,0 +1,326 @@
+/*
+ * POWER platform energy management driver
+ * Copyright (C) 2010 IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This pseries platform device driver provides access to
+ * platform energy management capabilities.
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/seq_file.h>
+#include <linux/sysdev.h>
+#include <linux/cpu.h>
+#include <linux/of.h>
+#include <asm/cputhreads.h>
+#include <asm/page.h>
+#include <asm/hvcall.h>
+
+
+#define MODULE_VERS "1.0"
+#define MODULE_NAME "pseries_energy"
+
+/* Driver flags */
+
+static int sysfs_entries;
+
+/* Helper routines */
+
+/*
+ * Routine to detect firmware support for hcall
+ * return 1 if H_BEST_ENERGY is supported
+ * else return 0
+ */
+
+static int check_for_h_best_energy(void)
+{
+        struct device_node *rtas = NULL;
+        const char *hypertas, *s;
+        int length;
+        int rc = 0;
+
+        rtas = of_find_node_by_path("/rtas");
+        if (!rtas)
+                return 0;
+
+        hypertas = of_get_property(rtas, "ibm,hypertas-functions", &length);
+        if (!hypertas) {
+                of_node_put(rtas);
+                return 0;
+        }
+
+        /* hypertas will have list of strings with hcall names */
+        for (s = hypertas; s < hypertas + length; s += strlen(s) + 1) {
+                if (!strncmp("hcall-best-energy-1", s, 19)) {
+                        rc = 1; /* Found the string */
+                        break;
+                }
+        }
+        of_node_put(rtas);
+        return rc;
+}
+
+/* Helper Routines to convert between drc_index to cpu numbers */
+
+static u32 cpu_to_drc_index(int cpu)
+{
+        struct device_node *dn = NULL;
+        const int *indexes;
+        int i;
+        int rc = 1;
+        u32 ret = 0;
+
+        dn = of_find_node_by_path("/cpus");
+        if (dn == NULL)
+                goto err;
+        indexes = of_get_property(dn, "ibm,drc-indexes", NULL);
+        if (indexes == NULL)
+                goto err_of_node_put;
+        /* Convert logical cpu number to core number */
+        i = cpu_core_index_of_thread(cpu);
+        /*
+         * The first element indexes[0] is the number of drc_indexes
+         * returned in the list.  Hence i+1 will get the drc_index
+         * corresponding to core number i.
+         */
+        WARN_ON(i > indexes[0]);
+        ret = indexes[i + 1];
+        rc = 0;
+
+err_of_node_put:
+        of_node_put(dn);
+err:
+        if (rc)
+                printk(KERN_WARNING "cpu_to_drc_index(%d) failed", cpu);
+        return ret;
+}
+
+static int drc_index_to_cpu(u32 drc_index)
+{
+        struct device_node *dn = NULL;
+        const int *indexes;
+        int i, cpu = 0;
+        int rc = 1;
+
+        dn = of_find_node_by_path("/cpus");
+        if (dn == NULL)
+                goto err;
+        indexes = of_get_property(dn, "ibm,drc-indexes", NULL);
+        if (indexes == NULL)
+                goto err_of_node_put;
+        /*
+         * First element in the array is the number of drc_indexes
+         * returned.  Search through the list to find the matching
+         * drc_index and get the core number
+         */
+        for (i = 0; i < indexes[0]; i++) {
+                if (indexes[i + 1] == drc_index)
+                        break;
+        }
+        /* Convert core number to logical cpu number */
+        cpu = cpu_first_thread_of_core(i);
+        rc = 0;
+
+err_of_node_put:
+        of_node_put(dn);
+err:
+        if (rc)
+                printk(KERN_WARNING "drc_index_to_cpu(%d) failed", drc_index);
+        return cpu;
+}
+
+/*
+ * pseries hypervisor call H_BEST_ENERGY provides hints to OS on
+ * preferred logical cpus to activate or deactivate for optimized
+ * energy consumption.
+ */
+
+#define FLAGS_MODE1     0x004E200000080E01
+#define FLAGS_MODE2     0x004E200000080401
+#define FLAGS_ACTIVATE  0x100
+
+static ssize_t get_best_energy_list(char *page, int activate)
+{
+        int rc, cnt, i, cpu;
+        unsigned long retbuf[PLPAR_HCALL9_BUFSIZE];
+        unsigned long flags = 0;
+        u32 *buf_page;
+        char *s = page;
+
+        buf_page = (u32 *) get_zeroed_page(GFP_KERNEL);
+        if (!buf_page)
+                return -ENOMEM;
+
+        flags = FLAGS_MODE1;
+        if (activate)
+                flags |= FLAGS_ACTIVATE;
+
+        rc = plpar_hcall9(H_BEST_ENERGY, retbuf, flags, 0, __pa(buf_page),
+                                0, 0, 0, 0, 0, 0);
+        if (rc != H_SUCCESS) {
+                free_page((unsigned long) buf_page);
+                return -EINVAL;
+        }
+
+        cnt = retbuf[0];
+        for (i = 0; i < cnt; i++) {
+                cpu = drc_index_to_cpu(buf_page[2*i+1]);
+                if ((cpu_online(cpu) && !activate) ||
+                    (!cpu_online(cpu) && activate))
+                        s += sprintf(s, "%d,", cpu);
+        }
+        if (s > page) { /* Something to show */
+                s--; /* Suppress last comma */
+                s += sprintf(s, "\n");
+        }
+
+        free_page((unsigned long) buf_page);
+        return s-page;
+}
+
+static ssize_t get_best_energy_data(struct sys_device *dev,
+                                        char *page, int activate)
+{
+        int rc;
+        unsigned long retbuf[PLPAR_HCALL9_BUFSIZE];
+        unsigned long flags = 0;
+
+        flags = FLAGS_MODE2;
+        if (activate)
+                flags |= FLAGS_ACTIVATE;
+
+        rc = plpar_hcall9(H_BEST_ENERGY, retbuf, flags,
+                                cpu_to_drc_index(dev->id),
+                                0, 0, 0, 0, 0, 0, 0);
+
+        if (rc != H_SUCCESS)
+                return -EINVAL;
+
+        return sprintf(page, "%lu\n", retbuf[1] >> 32);
+}
+
+/* Wrapper functions */
+
+static ssize_t cpu_activate_hint_list_show(struct sysdev_class *class,
+                        struct sysdev_class_attribute *attr, char *page)
+{
+        return get_best_energy_list(page, 1);
+}
+
+static ssize_t cpu_deactivate_hint_list_show(struct sysdev_class *class,
+                        struct sysdev_class_attribute *attr, char *page)
+{
+        return get_best_energy_list(page, 0);
+}
+
+static ssize_t percpu_activate_hint_show(struct sys_device *dev,
+                        struct sysdev_attribute *attr, char *page)
+{
+        return get_best_energy_data(dev, page, 1);
+}
+
+static ssize_t percpu_deactivate_hint_show(struct sys_device *dev,
+                        struct sysdev_attribute *attr, char *page)
+{
+        return get_best_energy_data(dev, page, 0);
+}
+
+/*
+ * Create sysfs interface:
+ * /sys/devices/system/cpu/pseries_activate_hint_list
+ * /sys/devices/system/cpu/pseries_deactivate_hint_list
+ *      Comma separated list of cpus to activate or deactivate
+ * /sys/devices/system/cpu/cpuN/pseries_activate_hint
+ * /sys/devices/system/cpu/cpuN/pseries_deactivate_hint
+ *      Per-cpu value of the hint
+ */
+
+struct sysdev_class_attribute attr_cpu_activate_hint_list =
+                _SYSDEV_CLASS_ATTR(pseries_activate_hint_list, 0444,
+                cpu_activate_hint_list_show, NULL);
+
+struct sysdev_class_attribute attr_cpu_deactivate_hint_list =
+                _SYSDEV_CLASS_ATTR(pseries_deactivate_hint_list, 0444,
+                cpu_deactivate_hint_list_show, NULL);
+
+struct sysdev_attribute attr_percpu_activate_hint =
+                _SYSDEV_ATTR(pseries_activate_hint, 0444,
+                percpu_activate_hint_show, NULL);
+
+struct sysdev_attribute attr_percpu_deactivate_hint =
+                _SYSDEV_ATTR(pseries_deactivate_hint, 0444,
+                percpu_deactivate_hint_show, NULL);
+
+static int __init pseries_energy_init(void)
+{
+        int cpu, err;
+        struct sys_device *cpu_sys_dev;
+
+        if (!check_for_h_best_energy()) {
+                printk(KERN_INFO "Hypercall H_BEST_ENERGY not supported\n");
+                return 0;
+        }
+        /* Create the sysfs files */
+        err = sysfs_create_file(&cpu_sysdev_class.kset.kobj,
+                                &attr_cpu_activate_hint_list.attr);
+        if (!err)
+                err = sysfs_create_file(&cpu_sysdev_class.kset.kobj,
+                                &attr_cpu_deactivate_hint_list.attr);
+
+        if (err)
+                return err;
+        for_each_possible_cpu(cpu) {
+                cpu_sys_dev = get_cpu_sysdev(cpu);
+                err = sysfs_create_file(&cpu_sys_dev->kobj,
+                                &attr_percpu_activate_hint.attr);
+                if (err)
+                        break;
+                err = sysfs_create_file(&cpu_sys_dev->kobj,
+                                &attr_percpu_deactivate_hint.attr);
+                if (err)
+                        break;
+        }
+
+        if (err)
+                return err;
+
+        sysfs_entries = 1; /* Removed entries on cleanup */
+        return 0;
+
+}
+
+static void __exit pseries_energy_cleanup(void)
+{
+        int cpu;
+        struct sys_device *cpu_sys_dev;
+
+        if (!sysfs_entries)
+                return;
+
+        /* Remove the sysfs files */
+        sysfs_remove_file(&cpu_sysdev_class.kset.kobj,
+                                &attr_cpu_activate_hint_list.attr);
+
+        sysfs_remove_file(&cpu_sysdev_class.kset.kobj,
+                                &attr_cpu_deactivate_hint_list.attr);
+
+        for_each_possible_cpu(cpu) {
+                cpu_sys_dev = get_cpu_sysdev(cpu);
+                sysfs_remove_file(&cpu_sys_dev->kobj,
+                                &attr_percpu_activate_hint.attr);
+                sysfs_remove_file(&cpu_sys_dev->kobj,
+                                &attr_percpu_deactivate_hint.attr);
+        }
+}
+
+module_init(pseries_energy_init);
+module_exit(pseries_energy_cleanup);
+MODULE_DESCRIPTION("Driver for pSeries platform energy management");
+MODULE_AUTHOR("Vaidyanathan Srinivasan");
+MODULE_LICENSE("GPL");
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index a4fc6da87c2e..086d2ae4e06a 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -54,7 +54,8 @@
 static unsigned char ras_log_buf[RTAS_ERROR_LOG_MAX];
 static DEFINE_SPINLOCK(ras_log_buf_lock);
 
-static char mce_data_buf[RTAS_ERROR_LOG_MAX];
+static char global_mce_data_buf[RTAS_ERROR_LOG_MAX];
+static DEFINE_PER_CPU(__u64, mce_data_buf);
 
 static int ras_get_sensor_state_token;
 static int ras_check_exception_token;
@@ -121,7 +122,7 @@ static irqreturn_t ras_epow_interrupt(int irq, void *dev_id)
 
         status = rtas_call(ras_check_exception_token, 6, 1, NULL,
                            RTAS_VECTOR_EXTERNAL_INTERRUPT,
-                           irq_map[irq].hwirq,
+                           virq_to_hw(irq),
                            RTAS_EPOW_WARNING | RTAS_POWERMGM_EVENTS,
                            critical, __pa(&ras_log_buf),
                                 rtas_get_error_log_max());
@@ -156,7 +157,7 @@ static irqreturn_t ras_error_interrupt(int irq, void *dev_id)
 
         status = rtas_call(ras_check_exception_token, 6, 1, NULL,
                            RTAS_VECTOR_EXTERNAL_INTERRUPT,
-                           irq_map[irq].hwirq,
+                           virq_to_hw(irq),
                            RTAS_INTERNAL_ERROR, 1 /*Time Critical */,
                            __pa(&ras_log_buf),
                                 rtas_get_error_log_max());
@@ -196,12 +197,24 @@ static irqreturn_t ras_error_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-/* Get the error information for errors coming through the
+/*
+ * Some versions of FWNMI place the buffer inside the 4kB page starting at
+ * 0x7000. Other versions place it inside the rtas buffer. We check both.
+ */
+#define VALID_FWNMI_BUFFER(A) \
+        ((((A) >= 0x7000) && ((A) < 0x7ff0)) || \
+        (((A) >= rtas.base) && ((A) < (rtas.base + rtas.size - 16))))
+
+/*
+ * Get the error information for errors coming through the
  * FWNMI vectors.  The pt_regs' r3 will be updated to reflect
  * the actual r3 if possible, and a ptr to the error log entry
  * will be returned if found.
  *
- * The mce_data_buf does not have any locks or protection around it,
+ * If the RTAS error is not of the extended type, then we put it in a per
+ * cpu 64bit buffer. If it is the extended type we use global_mce_data_buf.
+ *
+ * The global_mce_data_buf does not have any locks or protection around it,
  * if a second machine check comes in, or a system reset is done
  * before we have logged the error, then we will get corruption in the
  * error log.  This is preferable over holding off on calling
@@ -210,20 +223,31 @@ static irqreturn_t ras_error_interrupt(int irq, void *dev_id)
  */
 static struct rtas_error_log *fwnmi_get_errinfo(struct pt_regs *regs)
 {
-        unsigned long errdata = regs->gpr[3];
-        struct rtas_error_log *errhdr = NULL;
         unsigned long *savep;
+        struct rtas_error_log *h, *errhdr = NULL;
+
+        if (!VALID_FWNMI_BUFFER(regs->gpr[3])) {
+                printk(KERN_ERR "FWNMI: corrupt r3 0x%016lx\n", regs->gpr[3]);
+                return NULL;
+        }
 
-        if ((errdata >= 0x7000 && errdata < 0x7fff0) ||
-            (errdata >= rtas.base && errdata < rtas.base + rtas.size - 16)) {
-                savep = __va(errdata);
-                regs->gpr[3] = savep[0];        /* restore original r3 */
-                memset(mce_data_buf, 0, RTAS_ERROR_LOG_MAX);
-                memcpy(mce_data_buf, (char *)(savep + 1), RTAS_ERROR_LOG_MAX);
-                errhdr = (struct rtas_error_log *)mce_data_buf;
+        savep = __va(regs->gpr[3]);
+        regs->gpr[3] = savep[0];        /* restore original r3 */
+
+        /* If it isn't an extended log we can use the per cpu 64bit buffer */
+        h = (struct rtas_error_log *)&savep[1];
+        if (!h->extended) {
+                memcpy(&__get_cpu_var(mce_data_buf), h, sizeof(__u64));
+                errhdr = (struct rtas_error_log *)&__get_cpu_var(mce_data_buf);
         } else {
-                printk("FWNMI: corrupt r3\n");
+                int len;
+
+                len = max_t(int, 8+h->extended_log_length, RTAS_ERROR_LOG_MAX);
+                memset(global_mce_data_buf, 0, RTAS_ERROR_LOG_MAX);
+                memcpy(global_mce_data_buf, h, len);
+                errhdr = (struct rtas_error_log *)global_mce_data_buf;
         }
+
         return errhdr;
 }
 
@@ -235,7 +259,7 @@ static void fwnmi_release_errinfo(void)
 {
         int ret = rtas_call(rtas_token("ibm,nmi-interlock"), 0, 1, NULL);
         if (ret != 0)
-                printk("FWNMI: nmi-interlock failed: %d\n", ret);
+                printk(KERN_ERR "FWNMI: nmi-interlock failed: %d\n", ret);
 }
 
 int pSeries_system_reset_exception(struct pt_regs *regs)
@@ -259,31 +283,43 @@ int pSeries_system_reset_exception(struct pt_regs *regs)
  * Return 1 if corrected (or delivered a signal).
  * Return 0 if there is nothing we can do.
  */
-static int recover_mce(struct pt_regs *regs, struct rtas_error_log * err)
+static int recover_mce(struct pt_regs *regs, struct rtas_error_log *err)
 {
-        int nonfatal = 0;
+        int recovered = 0;
 
-        if (err->disposition == RTAS_DISP_FULLY_RECOVERED) {
+        if (!(regs->msr & MSR_RI)) {
+                /* If MSR_RI isn't set, we cannot recover */
+                recovered = 0;
+
+        } else if (err->disposition == RTAS_DISP_FULLY_RECOVERED) {
                 /* Platform corrected itself */
-                nonfatal = 1;
-        } else if ((regs->msr & MSR_RI) &&
-                   user_mode(regs) &&
-                   err->severity == RTAS_SEVERITY_ERROR_SYNC &&
-                   err->disposition == RTAS_DISP_NOT_RECOVERED &&
-                   err->target == RTAS_TARGET_MEMORY &&
-                   err->type == RTAS_TYPE_ECC_UNCORR &&
-                   !(current->pid == 0 || is_global_init(current))) {
-                /* Kill off a user process with an ECC error */
-                printk(KERN_ERR "MCE: uncorrectable ecc error for pid %d\n",
-                       current->pid);
-                /* XXX something better for ECC error? */
-                _exception(SIGBUS, regs, BUS_ADRERR, regs->nip);
-                nonfatal = 1;
+                recovered = 1;
+
+        } else if (err->disposition == RTAS_DISP_LIMITED_RECOVERY) {
+                /* Platform corrected itself but could be degraded */
+                printk(KERN_ERR "MCE: limited recovery, system may "
+                       "be degraded\n");
+                recovered = 1;
+
+        } else if (user_mode(regs) && !is_global_init(current) &&
+                   err->severity == RTAS_SEVERITY_ERROR_SYNC) {
+
+                /*
+                 * If we received a synchronous error when in userspace
+                 * kill the task. Firmware may report details of the fail
+                 * asynchronously, so we can't rely on the target and type
+                 * fields being valid here.
+                 */
+                printk(KERN_ERR "MCE: uncorrectable error, killing task "
+                       "%s:%d\n", current->comm, current->pid);
+
+                _exception(SIGBUS, regs, BUS_MCEERR_AR, regs->nip);
+                recovered = 1;
         }
 
-        log_error((char *)err, ERR_TYPE_RTAS_LOG, !nonfatal);
+        log_error((char *)err, ERR_TYPE_RTAS_LOG, 0);
 
-        return nonfatal;
+        return recovered;
 }
 
 /*
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index 57ddbb43b33a..1de2cbb92303 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -539,7 +539,8 @@ out:
 }
 
 static const struct file_operations ofdt_fops = {
-        .write = ofdt_write
+        .write = ofdt_write,
+        .llseek = noop_llseek,
 };
 
 /* create /proc/powerpc/ofdt write-only by root */
diff --git a/arch/powerpc/platforms/pseries/scanlog.c b/arch/powerpc/platforms/pseries/scanlog.c
index 80e9e7652a4d..554457294a2b 100644
--- a/arch/powerpc/platforms/pseries/scanlog.c
+++ b/arch/powerpc/platforms/pseries/scanlog.c
@@ -170,6 +170,7 @@ const struct file_operations scanlog_fops = {
         .write          = scanlog_write,
         .open           = scanlog_open,
         .release        = scanlog_release,
+        .llseek         = noop_llseek,
 };
 
 static int __init scanlog_init(void)
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index a6d19e3a505e..593acceeff96 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -53,9 +53,9 @@
 #include <asm/irq.h>
 #include <asm/time.h>
 #include <asm/nvram.h>
-#include "xics.h"
 #include <asm/pmc.h>
 #include <asm/mpic.h>
+#include <asm/xics.h>
 #include <asm/ppc-pci.h>
 #include <asm/i8259.h>
 #include <asm/udbg.h>
@@ -114,10 +114,13 @@ static void __init fwnmi_init(void)
 
 static void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc)
 {
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         unsigned int cascade_irq = i8259_irq();
+
         if (cascade_irq != NO_IRQ)
                 generic_handle_irq(cascade_irq);
-        desc->chip->eoi(irq);
+
+        chip->irq_eoi(&desc->irq_data);
 }
 
 static void __init pseries_setup_i8259_cascade(void)
@@ -166,7 +169,7 @@ static void __init pseries_setup_i8259_cascade(void)
                 printk(KERN_DEBUG "pic: PCI 8259 intack at 0x%016lx\n", intack);
         i8259_init(found, intack);
         of_node_put(found);
-        set_irq_chained_handler(cascade, pseries_8259_cascade);
+        irq_set_chained_handler(cascade, pseries_8259_cascade);
 }
 
 static void __init pseries_mpic_init_IRQ(void)
@@ -202,6 +205,9 @@ static void __init pseries_mpic_init_IRQ(void)
                 mpic_assign_isu(mpic, n, isuaddr);
         }
 
+        /* Setup top-level get_irq */
+        ppc_md.get_irq = mpic_get_irq;
+
         /* All ISUs are setup, complete initialization */
         mpic_init(mpic);
 
@@ -211,7 +217,7 @@ static void __init pseries_mpic_init_IRQ(void)
 
 static void __init pseries_xics_init_IRQ(void)
 {
-        xics_init_IRQ();
+        xics_init();
         pseries_setup_i8259_cascade();
 }
 
@@ -235,7 +241,6 @@ static void __init pseries_discover_pic(void)
                 if (strstr(typep, "open-pic")) {
                         pSeries_mpic_node = of_node_get(np);
                         ppc_md.init_IRQ       = pseries_mpic_init_IRQ;
-                        ppc_md.get_irq        = mpic_get_irq;
                         setup_kexec_cpu_down_mpic();
                         smp_init_pseries_mpic();
                         return;
@@ -273,6 +278,79 @@ static struct notifier_block pci_dn_reconfig_nb = {
         .notifier_call = pci_dn_reconfig_notifier,
 };
 
+struct kmem_cache *dtl_cache;
+
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
+/*
+ * Allocate space for the dispatch trace log for all possible cpus
+ * and register the buffers with the hypervisor.  This is used for
+ * computing time stolen by the hypervisor.
+ */
+static int alloc_dispatch_logs(void)
+{
+        int cpu, ret;
+        struct paca_struct *pp;
+        struct dtl_entry *dtl;
+
+        if (!firmware_has_feature(FW_FEATURE_SPLPAR))
+                return 0;
+
+        if (!dtl_cache)
+                return 0;
+
+        for_each_possible_cpu(cpu) {
+                pp = &paca[cpu];
+                dtl = kmem_cache_alloc(dtl_cache, GFP_KERNEL);
+                if (!dtl) {
+                        pr_warn("Failed to allocate dispatch trace log for cpu %d\n",
+                                cpu);
+                        pr_warn("Stolen time statistics will be unreliable\n");
+                        break;
+                }
+
+                pp->dtl_ridx = 0;
+                pp->dispatch_log = dtl;
+                pp->dispatch_log_end = dtl + N_DISPATCH_LOG;
+                pp->dtl_curr = dtl;
+        }
+
+        /* Register the DTL for the current (boot) cpu */
+        dtl = get_paca()->dispatch_log;
+        get_paca()->dtl_ridx = 0;
+        get_paca()->dtl_curr = dtl;
+        get_paca()->lppaca_ptr->dtl_idx = 0;
+
+        /* hypervisor reads buffer length from this field */
+        dtl->enqueue_to_dispatch_time = DISPATCH_LOG_BYTES;
+        ret = register_dtl(hard_smp_processor_id(), __pa(dtl));
+        if (ret)
+                pr_warn("DTL registration failed for boot cpu %d (%d)\n",
+                        smp_processor_id(), ret);
+        get_paca()->lppaca_ptr->dtl_enable_mask = 2;
+
+        return 0;
+}
+#else /* !CONFIG_VIRT_CPU_ACCOUNTING */
+static inline int alloc_dispatch_logs(void)
+{
+        return 0;
+}
+#endif /* CONFIG_VIRT_CPU_ACCOUNTING */
+
+static int alloc_dispatch_log_kmem_cache(void)
+{
+        dtl_cache = kmem_cache_create("dtl", DISPATCH_LOG_BYTES,
+                                                DISPATCH_LOG_BYTES, 0, NULL);
+        if (!dtl_cache) {
+                pr_warn("Failed to create dispatch trace log buffer cache\n");
+                pr_warn("Stolen time statistics will be unreliable\n");
+                return 0;
+        }
+
+        return alloc_dispatch_logs();
+}
+early_initcall(alloc_dispatch_log_kmem_cache);
+
 static void __init pSeries_setup_arch(void)
 {
         /* Discover PIC type and setup ppc_md accordingly */
@@ -323,7 +401,7 @@ static int __init pSeries_init_panel(void)
 
         return 0;
 }
-arch_initcall(pSeries_init_panel);
+machine_arch_initcall(pseries, pSeries_init_panel);
 
 static int pseries_set_dabr(unsigned long dabr)
 {
@@ -340,6 +418,16 @@ static int pseries_set_xdabr(unsigned long dabr)
 #define CMO_CHARACTERISTICS_TOKEN 44
 #define CMO_MAXLENGTH 1026
 
+void pSeries_coalesce_init(void)
+{
+        struct hvcall_mpp_x_data mpp_x_data;
+
+        if (firmware_has_feature(FW_FEATURE_CMO) && !h_get_mpp_x(&mpp_x_data))
+                powerpc_firmware_features |= FW_FEATURE_XCMO;
+        else
+                powerpc_firmware_features &= ~FW_FEATURE_XCMO;
+}
+
 /**
  * fw_cmo_feature_init - FW_FEATURE_CMO is not stored in ibm,hypertas-functions,
  * handle that here. (Stolen from parse_system_parameter_string)
@@ -409,6 +497,7 @@ void pSeries_cmo_feature_init(void)
                 pr_debug("CMO enabled, PrPSP=%d, SecPSP=%d\n", CMO_PrPSP,
                          CMO_SecPSP);
                 powerpc_firmware_features |= FW_FEATURE_CMO;
+                pSeries_coalesce_init();
         } else
                 pr_debug("CMO not enabled, PrPSP=%d, SecPSP=%d\n", CMO_PrPSP,
                          CMO_SecPSP);
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index 0317cce877c6..fbffd7e47ab8 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -44,10 +44,11 @@
 #include <asm/mpic.h>
 #include <asm/vdso_datapage.h>
 #include <asm/cputhreads.h>
+#include <asm/mpic.h>
+#include <asm/xics.h>
 
 #include "plpar_wrappers.h"
 #include "pseries.h"
-#include "xics.h"
 #include "offline_states.h"
 
 
@@ -64,8 +65,8 @@ int smp_query_cpu_stopped(unsigned int pcpu)
         int qcss_tok = rtas_token("query-cpu-stopped-state");
 
         if (qcss_tok == RTAS_UNKNOWN_SERVICE) {
-                printk(KERN_INFO "Firmware doesn't support "
-                                "query-cpu-stopped-state\n");
+                printk_once(KERN_INFO
+                        "Firmware doesn't support query-cpu-stopped-state\n");
                 return QCSS_HARDWARE_ERROR;
         }
 
@@ -112,10 +113,10 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
 
         /* Fixup atomic count: it exited inside IRQ handler. */
         task_thread_info(paca[lcpu].__current)->preempt_count   = 0;
-
+#ifdef CONFIG_HOTPLUG_CPU
         if (get_cpu_current_state(lcpu) == CPU_STATE_INACTIVE)
                 goto out;
-
+#endif
         /* 
          * If the RTAS start-cpu token does not exist then presume the
          * cpu is already spinning.
@@ -130,11 +131,12 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
                 return 0;
         }
 
+#ifdef CONFIG_HOTPLUG_CPU
 out:
+#endif
         return 1;
 }
 
-#ifdef CONFIG_XICS
 static void __devinit smp_xics_setup_cpu(int cpu)
 {
         if (cpu != boot_cpuid)
@@ -144,20 +146,18 @@ static void __devinit smp_xics_setup_cpu(int cpu)
                 vpa_init(cpu);
 
         cpumask_clear_cpu(cpu, of_spin_mask);
+#ifdef CONFIG_HOTPLUG_CPU
         set_cpu_current_state(cpu, CPU_STATE_ONLINE);
         set_default_offline_state(cpu);
-
+#endif
 }
-#endif /* CONFIG_XICS */
 
-static void __devinit smp_pSeries_kick_cpu(int nr)
+static int __devinit smp_pSeries_kick_cpu(int nr)
 {
-        long rc;
-        unsigned long hcpuid;
         BUG_ON(nr < 0 || nr >= NR_CPUS);
 
         if (!smp_startup_cpu(nr))
-                return;
+                return -ENOENT;
 
         /*
          * The processor is currently spinning, waiting for the
@@ -165,16 +165,22 @@ static void __devinit smp_pSeries_kick_cpu(int nr)
          * the processor will continue on to secondary_start
          */
         paca[nr].cpu_start = 1;
-
+#ifdef CONFIG_HOTPLUG_CPU
         set_preferred_offline_state(nr, CPU_STATE_ONLINE);
 
         if (get_cpu_current_state(nr) == CPU_STATE_INACTIVE) {
+                long rc;
+                unsigned long hcpuid;
+
                 hcpuid = get_hard_smp_processor_id(nr);
                 rc = plpar_hcall_norets(H_PROD, hcpuid);
                 if (rc != H_SUCCESS)
                         printk(KERN_ERR "Error: Prod to wake up processor %d "
                                                 "Ret= %ld\n", nr, rc);
         }
+#endif
+
+        return 0;
 }
 
 static int smp_pSeries_cpu_bootable(unsigned int nr)
@@ -192,23 +198,22 @@ static int smp_pSeries_cpu_bootable(unsigned int nr)
 
         return 1;
 }
-#ifdef CONFIG_MPIC
+
 static struct smp_ops_t pSeries_mpic_smp_ops = {
         .message_pass   = smp_mpic_message_pass,
         .probe          = smp_mpic_probe,
         .kick_cpu       = smp_pSeries_kick_cpu,
         .setup_cpu      = smp_mpic_setup_cpu,
 };
-#endif
-#ifdef CONFIG_XICS
+
 static struct smp_ops_t pSeries_xics_smp_ops = {
-        .message_pass   = smp_xics_message_pass,
-        .probe          = smp_xics_probe,
+        .message_pass   = smp_muxed_ipi_message_pass,
+        .cause_ipi      = NULL, /* Filled at runtime by xics_smp_probe() */
+        .probe          = xics_smp_probe,
         .kick_cpu       = smp_pSeries_kick_cpu,
         .setup_cpu      = smp_xics_setup_cpu,
         .cpu_bootable   = smp_pSeries_cpu_bootable,
 };
-#endif
 
 /* This is called very early */
 static void __init smp_init_pseries(void)
@@ -240,14 +245,12 @@ static void __init smp_init_pseries(void)
         pr_debug(" <- smp_init_pSeries()\n");
 }
 
-#ifdef CONFIG_MPIC
 void __init smp_init_pseries_mpic(void)
 {
         smp_ops = &pSeries_mpic_smp_ops;
 
         smp_init_pseries();
 }
-#endif
 
 void __init smp_init_pseries_xics(void)
 {
diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c
index ed72098bb4e3..a8ca289ff267 100644
--- a/arch/powerpc/platforms/pseries/suspend.c
+++ b/arch/powerpc/platforms/pseries/suspend.c
@@ -153,7 +153,7 @@ static struct sysdev_class suspend_sysdev_class = {
         .name = "power",
 };
 
-static struct platform_suspend_ops pseries_suspend_ops = {
+static const struct platform_suspend_ops pseries_suspend_ops = {
         .valid          = suspend_valid_only_mem,
         .begin          = pseries_suspend_begin,
         .prepare_late   = pseries_prepare_late,
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
deleted file mode 100644
index 93834b0d8272..000000000000
--- a/arch/powerpc/platforms/pseries/xics.c
+++ /dev/null
@@ -1,943 +0,0 @@
-/*
- * arch/powerpc/platforms/pseries/xics.c
- *
- * Copyright 2000 IBM Corporation.
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version
- *  2 of the License, or (at your option) any later version.
- */
-
-#include <linux/types.h>
-#include <linux/threads.h>
-#include <linux/kernel.h>
-#include <linux/irq.h>
-#include <linux/smp.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/radix-tree.h>
-#include <linux/cpu.h>
-#include <linux/msi.h>
-#include <linux/of.h>
-#include <linux/percpu.h>
-
-#include <asm/firmware.h>
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/smp.h>
-#include <asm/rtas.h>
-#include <asm/hvcall.h>
-#include <asm/machdep.h>
-
-#include "xics.h"
-#include "plpar_wrappers.h"
-
-static struct irq_host *xics_host;
-
-#define XICS_IPI                2
-#define XICS_IRQ_SPURIOUS       0
-
-/* Want a priority other than 0.  Various HW issues require this. */
-#define DEFAULT_PRIORITY        5
-
-/*
- * Mark IPIs as higher priority so we can take them inside interrupts that
- * arent marked IRQF_DISABLED
- */
-#define IPI_PRIORITY            4
-
-/* The least favored priority */
-#define LOWEST_PRIORITY         0xFF
-
-/* The number of priorities defined above */
-#define MAX_NUM_PRIORITIES      3
-
-static unsigned int default_server = 0xFF;
-static unsigned int default_distrib_server = 0;
-static unsigned int interrupt_server_size = 8;
-
-/* RTAS service tokens */
-static int ibm_get_xive;
-static int ibm_set_xive;
-static int ibm_int_on;
-static int ibm_int_off;
-
-struct xics_cppr {
-        unsigned char stack[MAX_NUM_PRIORITIES];
-        int index;
-};
-
-static DEFINE_PER_CPU(struct xics_cppr, xics_cppr);
-
-/* Direct hardware low level accessors */
-
-/* The part of the interrupt presentation layer that we care about */
-struct xics_ipl {
-        union {
-                u32 word;
-                u8 bytes[4];
-        } xirr_poll;
-        union {
-                u32 word;
-                u8 bytes[4];
-        } xirr;
-        u32 dummy;
-        union {
-                u32 word;
-                u8 bytes[4];
-        } qirr;
-};
-
-static struct xics_ipl __iomem *xics_per_cpu[NR_CPUS];
-
-static inline unsigned int direct_xirr_info_get(void)
-{
-        int cpu = smp_processor_id();
-
-        return in_be32(&xics_per_cpu[cpu]->xirr.word);
-}
-
-static inline void direct_xirr_info_set(unsigned int value)
-{
-        int cpu = smp_processor_id();
-
-        out_be32(&xics_per_cpu[cpu]->xirr.word, value);
-}
-
-static inline void direct_cppr_info(u8 value)
-{
-        int cpu = smp_processor_id();
-
-        out_8(&xics_per_cpu[cpu]->xirr.bytes[0], value);
-}
-
-static inline void direct_qirr_info(int n_cpu, u8 value)
-{
-        out_8(&xics_per_cpu[n_cpu]->qirr.bytes[0], value);
-}
-
-
-/* LPAR low level accessors */
-
-static inline unsigned int lpar_xirr_info_get(unsigned char cppr)
-{
-        unsigned long lpar_rc;
-        unsigned long return_value;
-
-        lpar_rc = plpar_xirr(&return_value, cppr);
-        if (lpar_rc != H_SUCCESS)
-                panic(" bad return code xirr - rc = %lx\n", lpar_rc);
-        return (unsigned int)return_value;
-}
-
-static inline void lpar_xirr_info_set(unsigned int value)
-{
-        unsigned long lpar_rc;
-
-        lpar_rc = plpar_eoi(value);
-        if (lpar_rc != H_SUCCESS)
-                panic("bad return code EOI - rc = %ld, value=%x\n", lpar_rc,
-                      value);
-}
-
-static inline void lpar_cppr_info(u8 value)
-{
-        unsigned long lpar_rc;
-
-        lpar_rc = plpar_cppr(value);
-        if (lpar_rc != H_SUCCESS)
-                panic("bad return code cppr - rc = %lx\n", lpar_rc);
-}
-
-static inline void lpar_qirr_info(int n_cpu , u8 value)
-{
-        unsigned long lpar_rc;
-
-        lpar_rc = plpar_ipi(get_hard_smp_processor_id(n_cpu), value);
-        if (lpar_rc != H_SUCCESS)
-                panic("bad return code qirr - rc = %lx\n", lpar_rc);
-}
-
-
-/* Interface to generic irq subsystem */
-
-#ifdef CONFIG_SMP
-/*
- * For the moment we only implement delivery to all cpus or one cpu.
- *
- * If the requested affinity is cpu_all_mask, we set global affinity.
- * If not we set it to the first cpu in the mask, even if multiple cpus
- * are set. This is so things like irqbalance (which set core and package
- * wide affinities) do the right thing.
- */
-static int get_irq_server(unsigned int virq, const struct cpumask *cpumask,
-                          unsigned int strict_check)
-{
-
-        if (!distribute_irqs)
-                return default_server;
-
-        if (!cpumask_equal(cpumask, cpu_all_mask)) {
-                int server = cpumask_first_and(cpu_online_mask, cpumask);
-
-                if (server < nr_cpu_ids)
-                        return get_hard_smp_processor_id(server);
-
-                if (strict_check)
-                        return -1;
-        }
-
-        /*
-         * Workaround issue with some versions of JS20 firmware that
-         * deliver interrupts to cpus which haven't been started. This
-         * happens when using the maxcpus= boot option.
-         */
-        if (cpumask_equal(cpu_online_mask, cpu_present_mask))
-                return default_distrib_server;
-
-        return default_server;
-}
-#else
-#define get_irq_server(virq, cpumask, strict_check) (default_server)
-#endif
-
-static void xics_unmask_irq(unsigned int virq)
-{
-        unsigned int irq;
-        int call_status;
-        int server;
-
-        pr_devel("xics: unmask virq %d\n", virq);
-
-        irq = (unsigned int)irq_map[virq].hwirq;
-        pr_devel(" -> map to hwirq 0x%x\n", irq);
-        if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)
-                return;
-
-        server = get_irq_server(virq, irq_to_desc(virq)->affinity, 0);
-
-        call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server,
-                                DEFAULT_PRIORITY);
-        if (call_status != 0) {
-                printk(KERN_ERR
-                        "%s: ibm_set_xive irq %u server %x returned %d\n",
-                        __func__, irq, server, call_status);
-                return;
-        }
-
-        /* Now unmask the interrupt (often a no-op) */
-        call_status = rtas_call(ibm_int_on, 1, 1, NULL, irq);
-        if (call_status != 0) {
-                printk(KERN_ERR "%s: ibm_int_on irq=%u returned %d\n",
-                        __func__, irq, call_status);
-                return;
-        }
-}
-
-static unsigned int xics_startup(unsigned int virq)
-{
-        /*
-         * The generic MSI code returns with the interrupt disabled on the
-         * card, using the MSI mask bits. Firmware doesn't appear to unmask
-         * at that level, so we do it here by hand.
-         */
-        if (irq_to_desc(virq)->msi_desc)
-                unmask_msi_irq(virq);
-
-        /* unmask it */
-        xics_unmask_irq(virq);
-        return 0;
-}
-
-static void xics_mask_real_irq(unsigned int irq)
-{
-        int call_status;
-
-        if (irq == XICS_IPI)
-                return;
-
-        call_status = rtas_call(ibm_int_off, 1, 1, NULL, irq);
-        if (call_status != 0) {
-                printk(KERN_ERR "%s: ibm_int_off irq=%u returned %d\n",
-                        __func__, irq, call_status);
-                return;
-        }
-
-        /* Have to set XIVE to 0xff to be able to remove a slot */
-        call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq,
-                                default_server, 0xff);
-        if (call_status != 0) {
-                printk(KERN_ERR "%s: ibm_set_xive(0xff) irq=%u returned %d\n",
-                        __func__, irq, call_status);
-                return;
-        }
-}
-
-static void xics_mask_irq(unsigned int virq)
-{
-        unsigned int irq;
-
-        pr_devel("xics: mask virq %d\n", virq);
-
-        irq = (unsigned int)irq_map[virq].hwirq;
-        if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)
-                return;
-        xics_mask_real_irq(irq);
-}
-
-static void xics_mask_unknown_vec(unsigned int vec)
-{
-        printk(KERN_ERR "Interrupt %u (real) is invalid, disabling it.\n", vec);
-        xics_mask_real_irq(vec);
-}
-
-static inline unsigned int xics_xirr_vector(unsigned int xirr)
-{
-        /*
-         * The top byte is the old cppr, to be restored on EOI.
-         * The remaining 24 bits are the vector.
-         */
-        return xirr & 0x00ffffff;
-}
-
-static void push_cppr(unsigned int vec)
-{
-        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
-
-        if (WARN_ON(os_cppr->index >= MAX_NUM_PRIORITIES - 1))
-                return;
-
-        if (vec == XICS_IPI)
-                os_cppr->stack[++os_cppr->index] = IPI_PRIORITY;
-        else
-                os_cppr->stack[++os_cppr->index] = DEFAULT_PRIORITY;
-}
-
-static unsigned int xics_get_irq_direct(void)
-{
-        unsigned int xirr = direct_xirr_info_get();
-        unsigned int vec = xics_xirr_vector(xirr);
-        unsigned int irq;
-
-        if (vec == XICS_IRQ_SPURIOUS)
-                return NO_IRQ;
-
-        irq = irq_radix_revmap_lookup(xics_host, vec);
-        if (likely(irq != NO_IRQ)) {
-                push_cppr(vec);
-                return irq;
-        }
-
-        /* We don't have a linux mapping, so have rtas mask it. */
-        xics_mask_unknown_vec(vec);
-
-        /* We might learn about it later, so EOI it */
-        direct_xirr_info_set(xirr);
-        return NO_IRQ;
-}
-
-static unsigned int xics_get_irq_lpar(void)
-{
-        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
-        unsigned int xirr = lpar_xirr_info_get(os_cppr->stack[os_cppr->index]);
-        unsigned int vec = xics_xirr_vector(xirr);
-        unsigned int irq;
-
-        if (vec == XICS_IRQ_SPURIOUS)
-                return NO_IRQ;
-
-        irq = irq_radix_revmap_lookup(xics_host, vec);
-        if (likely(irq != NO_IRQ)) {
-                push_cppr(vec);
-                return irq;
-        }
-
-        /* We don't have a linux mapping, so have RTAS mask it. */
-        xics_mask_unknown_vec(vec);
-
-        /* We might learn about it later, so EOI it */
-        lpar_xirr_info_set(xirr);
-        return NO_IRQ;
-}
-
-static unsigned char pop_cppr(void)
-{
-        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
-
-        if (WARN_ON(os_cppr->index < 1))
-                return LOWEST_PRIORITY;
-
-        return os_cppr->stack[--os_cppr->index];
-}
-
-static void xics_eoi_direct(unsigned int virq)
-{
-        unsigned int irq = (unsigned int)irq_map[virq].hwirq;
-
-        iosync();
-        direct_xirr_info_set((pop_cppr() << 24) | irq);
-}
-
-static void xics_eoi_lpar(unsigned int virq)
-{
-        unsigned int irq = (unsigned int)irq_map[virq].hwirq;
-
-        iosync();
-        lpar_xirr_info_set((pop_cppr() << 24) | irq);
-}
-
-static int xics_set_affinity(unsigned int virq, const struct cpumask *cpumask)
-{
-        unsigned int irq;
-        int status;
-        int xics_status[2];
-        int irq_server;
-
-        irq = (unsigned int)irq_map[virq].hwirq;
-        if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)
-                return -1;
-
-        status = rtas_call(ibm_get_xive, 1, 3, xics_status, irq);
-
-        if (status) {
-                printk(KERN_ERR "%s: ibm,get-xive irq=%u returns %d\n",
-                        __func__, irq, status);
-                return -1;
-        }
-
-        irq_server = get_irq_server(virq, cpumask, 1);
-        if (irq_server == -1) {
-                char cpulist[128];
-                cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);
-                printk(KERN_WARNING
-                        "%s: No online cpus in the mask %s for irq %d\n",
-                        __func__, cpulist, virq);
-                return -1;
-        }
-
-        status = rtas_call(ibm_set_xive, 3, 1, NULL,
-                                irq, irq_server, xics_status[1]);
-
-        if (status) {
-                printk(KERN_ERR "%s: ibm,set-xive irq=%u returns %d\n",
-                        __func__, irq, status);
-                return -1;
-        }
-
-        return 0;
-}
-
-static struct irq_chip xics_pic_direct = {
-        .name = "XICS",
-        .startup = xics_startup,
-        .mask = xics_mask_irq,
-        .unmask = xics_unmask_irq,
-        .eoi = xics_eoi_direct,
-        .set_affinity = xics_set_affinity
-};
-
-static struct irq_chip xics_pic_lpar = {
-        .name = "XICS",
-        .startup = xics_startup,
-        .mask = xics_mask_irq,
-        .unmask = xics_unmask_irq,
-        .eoi = xics_eoi_lpar,
-        .set_affinity = xics_set_affinity
-};
-
-
-/* Interface to arch irq controller subsystem layer */
-
-/* Points to the irq_chip we're actually using */
-static struct irq_chip *xics_irq_chip;
-
-static int xics_host_match(struct irq_host *h, struct device_node *node)
-{
-        /* IBM machines have interrupt parents of various funky types for things
-         * like vdevices, events, etc... The trick we use here is to match
-         * everything here except the legacy 8259 which is compatible "chrp,iic"
-         */
-        return !of_device_is_compatible(node, "chrp,iic");
-}
-
-static int xics_host_map(struct irq_host *h, unsigned int virq,
-                         irq_hw_number_t hw)
-{
-        pr_devel("xics: map virq %d, hwirq 0x%lx\n", virq, hw);
-
-        /* Insert the interrupt mapping into the radix tree for fast lookup */
-        irq_radix_revmap_insert(xics_host, virq, hw);
-
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, xics_irq_chip, handle_fasteoi_irq);
-        return 0;
-}
-
-static int xics_host_xlate(struct irq_host *h, struct device_node *ct,
-                           const u32 *intspec, unsigned int intsize,
-                           irq_hw_number_t *out_hwirq, unsigned int *out_flags)
-
-{
-        /* Current xics implementation translates everything
-         * to level. It is not technically right for MSIs but this
-         * is irrelevant at this point. We might get smarter in the future
-         */
-        *out_hwirq = intspec[0];
-        *out_flags = IRQ_TYPE_LEVEL_LOW;
-
-        return 0;
-}
-
-static struct irq_host_ops xics_host_ops = {
-        .match = xics_host_match,
-        .map = xics_host_map,
-        .xlate = xics_host_xlate,
-};
-
-static void __init xics_init_host(void)
-{
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                xics_irq_chip = &xics_pic_lpar;
-        else
-                xics_irq_chip = &xics_pic_direct;
-
-        xics_host = irq_alloc_host(NULL, IRQ_HOST_MAP_TREE, 0, &xics_host_ops,
-                                   XICS_IRQ_SPURIOUS);
-        BUG_ON(xics_host == NULL);
-        irq_set_default_host(xics_host);
-}
-
-
-/* Inter-processor interrupt support */
-
-#ifdef CONFIG_SMP
-/*
- * XICS only has a single IPI, so encode the messages per CPU
- */
-static DEFINE_PER_CPU_SHARED_ALIGNED(unsigned long, xics_ipi_message);
-
-static inline void smp_xics_do_message(int cpu, int msg)
-{
-        unsigned long *tgt = &per_cpu(xics_ipi_message, cpu);
-
-        set_bit(msg, tgt);
-        mb();
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                lpar_qirr_info(cpu, IPI_PRIORITY);
-        else
-                direct_qirr_info(cpu, IPI_PRIORITY);
-}
-
-void smp_xics_message_pass(int target, int msg)
-{
-        unsigned int i;
-
-        if (target < NR_CPUS) {
-                smp_xics_do_message(target, msg);
-        } else {
-                for_each_online_cpu(i) {
-                        if (target == MSG_ALL_BUT_SELF
-                            && i == smp_processor_id())
-                                continue;
-                        smp_xics_do_message(i, msg);
-                }
-        }
-}
-
-static irqreturn_t xics_ipi_dispatch(int cpu)
-{
-        unsigned long *tgt = &per_cpu(xics_ipi_message, cpu);
-
-        mb();   /* order mmio clearing qirr */
-        while (*tgt) {
-                if (test_and_clear_bit(PPC_MSG_CALL_FUNCTION, tgt)) {
-                        smp_message_recv(PPC_MSG_CALL_FUNCTION);
-                }
-                if (test_and_clear_bit(PPC_MSG_RESCHEDULE, tgt)) {
-                        smp_message_recv(PPC_MSG_RESCHEDULE);
-                }
-                if (test_and_clear_bit(PPC_MSG_CALL_FUNC_SINGLE, tgt)) {
-                        smp_message_recv(PPC_MSG_CALL_FUNC_SINGLE);
-                }
-#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
-                if (test_and_clear_bit(PPC_MSG_DEBUGGER_BREAK, tgt)) {
-                        smp_message_recv(PPC_MSG_DEBUGGER_BREAK);
-                }
-#endif
-        }
-        return IRQ_HANDLED;
-}
-
-static irqreturn_t xics_ipi_action_direct(int irq, void *dev_id)
-{
-        int cpu = smp_processor_id();
-
-        direct_qirr_info(cpu, 0xff);
-
-        return xics_ipi_dispatch(cpu);
-}
-
-static irqreturn_t xics_ipi_action_lpar(int irq, void *dev_id)
-{
-        int cpu = smp_processor_id();
-
-        lpar_qirr_info(cpu, 0xff);
-
-        return xics_ipi_dispatch(cpu);
-}
-
-static void xics_request_ipi(void)
-{
-        unsigned int ipi;
-        int rc;
-
-        ipi = irq_create_mapping(xics_host, XICS_IPI);
-        BUG_ON(ipi == NO_IRQ);
-
-        /*
-         * IPIs are marked IRQF_DISABLED as they must run with irqs
-         * disabled
-         */
-        set_irq_handler(ipi, handle_percpu_irq);
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                rc = request_irq(ipi, xics_ipi_action_lpar,
-                                IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL);
-        else
-                rc = request_irq(ipi, xics_ipi_action_direct,
-                                IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL);
-        BUG_ON(rc);
-}
-
-int __init smp_xics_probe(void)
-{
-        xics_request_ipi();
-
-        return cpumask_weight(cpu_possible_mask);
-}
-
-#endif /* CONFIG_SMP */
-
-
-/* Initialization */
-
-static void xics_update_irq_servers(void)
-{
-        int i, j;
-        struct device_node *np;
-        u32 ilen;
-        const u32 *ireg;
-        u32 hcpuid;
-
-        /* Find the server numbers for the boot cpu. */
-        np = of_get_cpu_node(boot_cpuid, NULL);
-        BUG_ON(!np);
-
-        ireg = of_get_property(np, "ibm,ppc-interrupt-gserver#s", &ilen);
-        if (!ireg) {
-                of_node_put(np);
-                return;
-        }
-
-        i = ilen / sizeof(int);
-        hcpuid = get_hard_smp_processor_id(boot_cpuid);
-
-        /* Global interrupt distribution server is specified in the last
-         * entry of "ibm,ppc-interrupt-gserver#s" property. Get the last
-         * entry fom this property for current boot cpu id and use it as
-         * default distribution server
-         */
-        for (j = 0; j < i; j += 2) {
-                if (ireg[j] == hcpuid) {
-                        default_server = hcpuid;
-                        default_distrib_server = ireg[j+1];
-                }
-        }
-
-        of_node_put(np);
-}
-
-static void __init xics_map_one_cpu(int hw_id, unsigned long addr,
-                                     unsigned long size)
-{
-        int i;
-
-        /* This may look gross but it's good enough for now, we don't quite
-         * have a hard -> linux processor id matching.
-         */
-        for_each_possible_cpu(i) {
-                if (!cpu_present(i))
-                        continue;
-                if (hw_id == get_hard_smp_processor_id(i)) {
-                        xics_per_cpu[i] = ioremap(addr, size);
-                        return;
-                }
-        }
-}
-
-static void __init xics_init_one_node(struct device_node *np,
-                                      unsigned int *indx)
-{
-        unsigned int ilen;
-        const u32 *ireg;
-
-        /* This code does the theorically broken assumption that the interrupt
-         * server numbers are the same as the hard CPU numbers.
-         * This happens to be the case so far but we are playing with fire...
-         * should be fixed one of these days. -BenH.
-         */
-        ireg = of_get_property(np, "ibm,interrupt-server-ranges", NULL);
-
-        /* Do that ever happen ? we'll know soon enough... but even good'old
-         * f80 does have that property ..
-         */
-        WARN_ON(ireg == NULL);
-        if (ireg) {
-                /*
-                 * set node starting index for this node
-                 */
-                *indx = *ireg;
-        }
-        ireg = of_get_property(np, "reg", &ilen);
-        if (!ireg)
-                panic("xics_init_IRQ: can't find interrupt reg property");
-
-        while (ilen >= (4 * sizeof(u32))) {
-                unsigned long addr, size;
-
-                /* XXX Use proper OF parsing code here !!! */
-                addr = (unsigned long)*ireg++ << 32;
-                ilen -= sizeof(u32);
-                addr |= *ireg++;
-                ilen -= sizeof(u32);
-                size = (unsigned long)*ireg++ << 32;
-                ilen -= sizeof(u32);
-                size |= *ireg++;
-                ilen -= sizeof(u32);
-                xics_map_one_cpu(*indx, addr, size);
-                (*indx)++;
-        }
-}
-
-void __init xics_init_IRQ(void)
-{
-        struct device_node *np;
-        u32 indx = 0;
-        int found = 0;
-        const u32 *isize;
-
-        ppc64_boot_msg(0x20, "XICS Init");
-
-        ibm_get_xive = rtas_token("ibm,get-xive");
-        ibm_set_xive = rtas_token("ibm,set-xive");
-        ibm_int_on  = rtas_token("ibm,int-on");
-        ibm_int_off = rtas_token("ibm,int-off");
-
-        for_each_node_by_type(np, "PowerPC-External-Interrupt-Presentation") {
-                found = 1;
-                if (firmware_has_feature(FW_FEATURE_LPAR)) {
-                        of_node_put(np);
-                        break;
-                        }
-                xics_init_one_node(np, &indx);
-        }
-        if (found == 0)
-                return;
-
-        /* get the bit size of server numbers */
-        found = 0;
-
-        for_each_compatible_node(np, NULL, "ibm,ppc-xics") {
-                isize = of_get_property(np, "ibm,interrupt-server#-size", NULL);
-
-                if (!isize)
-                        continue;
-
-                if (!found) {
-                        interrupt_server_size = *isize;
-                        found = 1;
-                } else if (*isize != interrupt_server_size) {
-                        printk(KERN_WARNING "XICS: "
-                               "mismatched ibm,interrupt-server#-size\n");
-                        interrupt_server_size = max(*isize,
-                                                    interrupt_server_size);
-                }
-        }
-
-        xics_update_irq_servers();
-        xics_init_host();
-
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                ppc_md.get_irq = xics_get_irq_lpar;
-        else
-                ppc_md.get_irq = xics_get_irq_direct;
-
-        xics_setup_cpu();
-
-        ppc64_boot_msg(0x21, "XICS Done");
-}
-
-/* Cpu startup, shutdown, and hotplug */
-
-static void xics_set_cpu_priority(unsigned char cppr)
-{
-        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
-
-        /*
-         * we only really want to set the priority when there's
-         * just one cppr value on the stack
-         */
-        WARN_ON(os_cppr->index != 0);
-
-        os_cppr->stack[0] = cppr;
-
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                lpar_cppr_info(cppr);
-        else
-                direct_cppr_info(cppr);
-        iosync();
-}
-
-/* Have the calling processor join or leave the specified global queue */
-static void xics_set_cpu_giq(unsigned int gserver, unsigned int join)
-{
-        int index;
-        int status;
-
-        if (!rtas_indicator_present(GLOBAL_INTERRUPT_QUEUE, NULL))
-                return;
-
-        index = (1UL << interrupt_server_size) - 1 - gserver;
-
-        status = rtas_set_indicator_fast(GLOBAL_INTERRUPT_QUEUE, index, join);
-
-        WARN(status < 0, "set-indicator(%d, %d, %u) returned %d\n",
-             GLOBAL_INTERRUPT_QUEUE, index, join, status);
-}
-
-void xics_setup_cpu(void)
-{
-        xics_set_cpu_priority(LOWEST_PRIORITY);
-
-        xics_set_cpu_giq(default_distrib_server, 1);
-}
-
-void xics_teardown_cpu(void)
-{
-        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
-        int cpu = smp_processor_id();
-
-        /*
-         * we have to reset the cppr index to 0 because we're
-         * not going to return from the IPI
-         */
-        os_cppr->index = 0;
-        xics_set_cpu_priority(0);
-
-        /* Clear any pending IPI request */
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                lpar_qirr_info(cpu, 0xff);
-        else
-                direct_qirr_info(cpu, 0xff);
-}
-
-void xics_kexec_teardown_cpu(int secondary)
-{
-        xics_teardown_cpu();
-
-        /*
-         * we take the ipi irq but and never return so we
-         * need to EOI the IPI, but want to leave our priority 0
-         *
-         * should we check all the other interrupts too?
-         * should we be flagging idle loop instead?
-         * or creating some task to be scheduled?
-         */
-
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                lpar_xirr_info_set((0x00 << 24) | XICS_IPI);
-        else
-                direct_xirr_info_set((0x00 << 24) | XICS_IPI);
-
-        /*
-         * Some machines need to have at least one cpu in the GIQ,
-         * so leave the master cpu in the group.
-         */
-        if (secondary)
-                xics_set_cpu_giq(default_distrib_server, 0);
-}
-
-#ifdef CONFIG_HOTPLUG_CPU
-
-/* Interrupts are disabled. */
-void xics_migrate_irqs_away(void)
-{
-        int cpu = smp_processor_id(), hw_cpu = hard_smp_processor_id();
-        unsigned int irq, virq;
-
-        /* If we used to be the default server, move to the new "boot_cpuid" */
-        if (hw_cpu == default_server)
-                xics_update_irq_servers();
-
-        /* Reject any interrupt that was queued to us... */
-        xics_set_cpu_priority(0);
-
-        /* Remove ourselves from the global interrupt queue */
-        xics_set_cpu_giq(default_distrib_server, 0);
-
-        /* Allow IPIs again... */
-        xics_set_cpu_priority(DEFAULT_PRIORITY);
-
-        for_each_irq(virq) {
-                struct irq_desc *desc;
-                int xics_status[2];
-                int status;
-                unsigned long flags;
-
-                /* We cant set affinity on ISA interrupts */
-                if (virq < NUM_ISA_INTERRUPTS)
-                        continue;
-                if (irq_map[virq].host != xics_host)
-                        continue;
-                irq = (unsigned int)irq_map[virq].hwirq;
-                /* We need to get IPIs still. */
-                if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)
-                        continue;
-                desc = irq_to_desc(virq);
-
-                /* We only need to migrate enabled IRQS */
-                if (desc == NULL || desc->chip == NULL
-                    || desc->action == NULL
-                    || desc->chip->set_affinity == NULL)
-                        continue;
-
-                raw_spin_lock_irqsave(&desc->lock, flags);
-
-                status = rtas_call(ibm_get_xive, 1, 3, xics_status, irq);
-                if (status) {
-                        printk(KERN_ERR "%s: ibm,get-xive irq=%u returns %d\n",
-                                        __func__, irq, status);
-                        goto unlock;
-                }
-
-                /*
-                 * We only support delivery to all cpus or to one cpu.
-                 * The irq has to be migrated only in the single cpu
-                 * case.
-                 */
-                if (xics_status[0] != hw_cpu)
-                        goto unlock;
-
-                /* This is expected during cpu offline. */
-                if (cpu_online(cpu))
-                        printk(KERN_WARNING "IRQ %u affinity broken off cpu %u\n",
-                               virq, cpu);
-
-                /* Reset affinity to all cpus */
-                cpumask_setall(irq_to_desc(virq)->affinity);
-                desc->chip->set_affinity(virq, cpu_all_mask);
-unlock:
-                raw_spin_unlock_irqrestore(&desc->lock, flags);
-        }
-}
-#endif
diff --git a/arch/powerpc/platforms/pseries/xics.h b/arch/powerpc/platforms/pseries/xics.h
deleted file mode 100644
index d1d5a83039ae..000000000000
--- a/arch/powerpc/platforms/pseries/xics.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * arch/powerpc/platforms/pseries/xics.h
- *
- * Copyright 2000 IBM Corporation.
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version
- *  2 of the License, or (at your option) any later version.
- */
-
-#ifndef _POWERPC_KERNEL_XICS_H
-#define _POWERPC_KERNEL_XICS_H
-
-extern void xics_init_IRQ(void);
-extern void xics_setup_cpu(void);
-extern void xics_teardown_cpu(void);
-extern void xics_kexec_teardown_cpu(int secondary);
-extern void xics_migrate_irqs_away(void);
-extern int smp_xics_probe(void);
-extern void smp_xics_message_pass(int target, int msg);
-
-#endif /* _POWERPC_KERNEL_XICS_H */
diff --git a/arch/powerpc/platforms/wsp/Kconfig b/arch/powerpc/platforms/wsp/Kconfig
new file mode 100644
index 000000000000..c3c48eb62cc1
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/Kconfig
@@ -0,0 +1,28 @@
+config PPC_WSP
+        bool
+        default n
+
+menu "WSP platform selection"
+        depends on PPC_BOOK3E_64
+
+config PPC_PSR2
+        bool "PSR-2 platform"
+        select PPC_A2
+        select GENERIC_TBSYNC
+        select PPC_SCOM
+        select EPAPR_BOOT
+        select PPC_WSP
+        select PPC_XICS
+        select PPC_ICP_NATIVE
+        default y
+
+endmenu
+
+config PPC_A2_DD2
+        bool "Support for DD2 based A2/WSP systems"
+        depends on PPC_A2
+
+config WORKAROUND_ERRATUM_463
+        depends on PPC_A2_DD2
+        bool "Workaround erratum 463"
+        default y
diff --git a/arch/powerpc/platforms/wsp/Makefile b/arch/powerpc/platforms/wsp/Makefile
new file mode 100644
index 000000000000..095be73d6cd4
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/Makefile
@@ -0,0 +1,6 @@
+ccflags-y                       += -mno-minimal-toc
+
+obj-y                           += setup.o ics.o
+obj-$(CONFIG_PPC_PSR2)          += psr2.o opb_pic.o
+obj-$(CONFIG_PPC_WSP)           += scom_wsp.o
+obj-$(CONFIG_SMP)               += smp.o scom_smp.o
diff --git a/arch/powerpc/platforms/wsp/ics.c b/arch/powerpc/platforms/wsp/ics.c
new file mode 100644
index 000000000000..e53bd9e7b125
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/ics.c
@@ -0,0 +1,712 @@
+/*
+ * Copyright 2008-2011 IBM Corporation.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/cpu.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/msi.h>
+#include <linux/of.h>
+#include <linux/slab.h>
+#include <linux/smp.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/xics.h>
+
+#include "wsp.h"
+#include "ics.h"
+
+
+/* WSP ICS */
+
+struct wsp_ics {
+        struct ics ics;
+        struct device_node *dn;
+        void __iomem *regs;
+        spinlock_t lock;
+        unsigned long *bitmap;
+        u32 chip_id;
+        u32 lsi_base;
+        u32 lsi_count;
+        u64 hwirq_start;
+        u64 count;
+#ifdef CONFIG_SMP
+        int *hwirq_cpu_map;
+#endif
+};
+
+#define to_wsp_ics(ics) container_of(ics, struct wsp_ics, ics)
+
+#define INT_SRC_LAYER_BUID_REG(base)    ((base) + 0x00)
+#define IODA_TBL_ADDR_REG(base)         ((base) + 0x18)
+#define IODA_TBL_DATA_REG(base)         ((base) + 0x20)
+#define XIVE_UPDATE_REG(base)           ((base) + 0x28)
+#define ICS_INT_CAPS_REG(base)          ((base) + 0x30)
+
+#define TBL_AUTO_INCREMENT      ((1UL << 63) | (1UL << 15))
+#define TBL_SELECT_XIST         (1UL << 48)
+#define TBL_SELECT_XIVT         (1UL << 49)
+
+#define IODA_IRQ(irq)           ((irq) & (0x7FFULL))    /* HRM 5.1.3.4 */
+
+#define XIST_REQUIRED           0x8
+#define XIST_REJECTED           0x4
+#define XIST_PRESENTED          0x2
+#define XIST_PENDING            0x1
+
+#define XIVE_SERVER_SHIFT       42
+#define XIVE_SERVER_MASK        0xFFFFULL
+#define XIVE_PRIORITY_MASK      0xFFULL
+#define XIVE_PRIORITY_SHIFT     32
+#define XIVE_WRITE_ENABLE       (1ULL << 63)
+
+/*
+ * The docs refer to a 6 bit field called ChipID, which consists of a
+ * 3 bit NodeID and a 3 bit ChipID. On WSP the ChipID is always zero
+ * so we ignore it, and every where we use "chip id" in this code we
+ * mean the NodeID.
+ */
+#define WSP_ICS_CHIP_SHIFT              17
+
+
+static struct wsp_ics *ics_list;
+static int num_ics;
+
+/* ICS Source controller accessors */
+
+static u64 wsp_ics_get_xive(struct wsp_ics *ics, unsigned int irq)
+{
+        unsigned long flags;
+        u64 xive;
+
+        spin_lock_irqsave(&ics->lock, flags);
+        out_be64(IODA_TBL_ADDR_REG(ics->regs), TBL_SELECT_XIVT | IODA_IRQ(irq));
+        xive = in_be64(IODA_TBL_DATA_REG(ics->regs));
+        spin_unlock_irqrestore(&ics->lock, flags);
+
+        return xive;
+}
+
+static void wsp_ics_set_xive(struct wsp_ics *ics, unsigned int irq, u64 xive)
+{
+        xive &= ~XIVE_ADDR_MASK;
+        xive |= (irq & XIVE_ADDR_MASK);
+        xive |= XIVE_WRITE_ENABLE;
+
+        out_be64(XIVE_UPDATE_REG(ics->regs), xive);
+}
+
+static u64 xive_set_server(u64 xive, unsigned int server)
+{
+        u64 mask = ~(XIVE_SERVER_MASK << XIVE_SERVER_SHIFT);
+
+        xive &= mask;
+        xive |= (server & XIVE_SERVER_MASK) << XIVE_SERVER_SHIFT;
+
+        return xive;
+}
+
+static u64 xive_set_priority(u64 xive, unsigned int priority)
+{
+        u64 mask = ~(XIVE_PRIORITY_MASK << XIVE_PRIORITY_SHIFT);
+
+        xive &= mask;
+        xive |= (priority & XIVE_PRIORITY_MASK) << XIVE_PRIORITY_SHIFT;
+
+        return xive;
+}
+
+
+#ifdef CONFIG_SMP
+/* Find logical CPUs within mask on a given chip and store result in ret */
+void cpus_on_chip(int chip_id, cpumask_t *mask, cpumask_t *ret)
+{
+        int cpu, chip;
+        struct device_node *cpu_dn, *dn;
+        const u32 *prop;
+
+        cpumask_clear(ret);
+        for_each_cpu(cpu, mask) {
+                cpu_dn = of_get_cpu_node(cpu, NULL);
+                if (!cpu_dn)
+                        continue;
+
+                prop = of_get_property(cpu_dn, "at-node", NULL);
+                if (!prop) {
+                        of_node_put(cpu_dn);
+                        continue;
+                }
+
+                dn = of_find_node_by_phandle(*prop);
+                of_node_put(cpu_dn);
+
+                chip = wsp_get_chip_id(dn);
+                if (chip == chip_id)
+                        cpumask_set_cpu(cpu, ret);
+
+                of_node_put(dn);
+        }
+}
+
+/* Store a suitable CPU to handle a hwirq in the ics->hwirq_cpu_map cache */
+static int cache_hwirq_map(struct wsp_ics *ics, unsigned int hwirq,
+                           const cpumask_t *affinity)
+{
+        cpumask_var_t avail, newmask;
+        int ret = -ENOMEM, cpu, cpu_rover = 0, target;
+        int index = hwirq - ics->hwirq_start;
+        unsigned int nodeid;
+
+        BUG_ON(index < 0 || index >= ics->count);
+
+        if (!ics->hwirq_cpu_map)
+                return -ENOMEM;
+
+        if (!distribute_irqs) {
+                ics->hwirq_cpu_map[hwirq - ics->hwirq_start] = xics_default_server;
+                return 0;
+        }
+
+        /* Allocate needed CPU masks */
+        if (!alloc_cpumask_var(&avail, GFP_KERNEL))
+                goto ret;
+        if (!alloc_cpumask_var(&newmask, GFP_KERNEL))
+                goto freeavail;
+
+        /* Find PBus attached to the source of this IRQ */
+        nodeid = (hwirq >> WSP_ICS_CHIP_SHIFT) & 0x3; /* 12:14 */
+
+        /* Find CPUs that could handle this IRQ */
+        if (affinity)
+                cpumask_and(avail, cpu_online_mask, affinity);
+        else
+                cpumask_copy(avail, cpu_online_mask);
+
+        /* Narrow selection down to logical CPUs on the same chip */
+        cpus_on_chip(nodeid, avail, newmask);
+
+        /* Ensure we haven't narrowed it down to 0 */
+        if (unlikely(cpumask_empty(newmask))) {
+                if (unlikely(cpumask_empty(avail))) {
+                        ret = -1;
+                        goto out;
+                }
+                cpumask_copy(newmask, avail);
+        }
+
+        /* Choose a CPU out of those we narrowed it down to in round robin */
+        target = hwirq % cpumask_weight(newmask);
+        for_each_cpu(cpu, newmask) {
+                if (cpu_rover++ >= target) {
+                        ics->hwirq_cpu_map[index] = get_hard_smp_processor_id(cpu);
+                        ret = 0;
+                        goto out;
+                }
+        }
+
+        /* Shouldn't happen */
+        WARN_ON(1);
+
+out:
+        free_cpumask_var(newmask);
+freeavail:
+        free_cpumask_var(avail);
+ret:
+        if (ret < 0) {
+                ics->hwirq_cpu_map[index] = cpumask_first(cpu_online_mask);
+                pr_warning("Error, falling hwirq 0x%x routing back to CPU %i\n",
+                           hwirq, ics->hwirq_cpu_map[index]);
+        }
+        return ret;
+}
+
+static void alloc_irq_map(struct wsp_ics *ics)
+{
+        int i;
+
+        ics->hwirq_cpu_map = kmalloc(sizeof(int) * ics->count, GFP_KERNEL);
+        if (!ics->hwirq_cpu_map) {
+                pr_warning("Allocate hwirq_cpu_map failed, "
+                           "IRQ balancing disabled\n");
+                return;
+        }
+
+        for (i=0; i < ics->count; i++)
+                ics->hwirq_cpu_map[i] = xics_default_server;
+}
+
+static int get_irq_server(struct wsp_ics *ics, unsigned int hwirq)
+{
+        int index = hwirq - ics->hwirq_start;
+
+        BUG_ON(index < 0 || index >= ics->count);
+
+        if (!ics->hwirq_cpu_map)
+                return xics_default_server;
+
+        return ics->hwirq_cpu_map[index];
+}
+#else /* !CONFIG_SMP */
+static int cache_hwirq_map(struct wsp_ics *ics, unsigned int hwirq,
+                           const cpumask_t *affinity)
+{
+        return 0;
+}
+
+static int get_irq_server(struct wsp_ics *ics, unsigned int hwirq)
+{
+        return xics_default_server;
+}
+
+static void alloc_irq_map(struct wsp_ics *ics) { }
+#endif
+
+static void wsp_chip_unmask_irq(struct irq_data *d)
+{
+        unsigned int hw_irq = (unsigned int)irqd_to_hwirq(d);
+        struct wsp_ics *ics;
+        int server;
+        u64 xive;
+
+        if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS)
+                return;
+
+        ics = d->chip_data;
+        if (WARN_ON(!ics))
+                return;
+
+        server = get_irq_server(ics, hw_irq);
+
+        xive = wsp_ics_get_xive(ics, hw_irq);
+        xive = xive_set_server(xive, server);
+        xive = xive_set_priority(xive, DEFAULT_PRIORITY);
+        wsp_ics_set_xive(ics, hw_irq, xive);
+}
+
+static unsigned int wsp_chip_startup(struct irq_data *d)
+{
+        /* unmask it */
+        wsp_chip_unmask_irq(d);
+        return 0;
+}
+
+static void wsp_mask_real_irq(unsigned int hw_irq, struct wsp_ics *ics)
+{
+        u64 xive;
+
+        if (hw_irq == XICS_IPI)
+                return;
+
+        if (WARN_ON(!ics))
+                return;
+        xive = wsp_ics_get_xive(ics, hw_irq);
+        xive = xive_set_server(xive, xics_default_server);
+        xive = xive_set_priority(xive, LOWEST_PRIORITY);
+        wsp_ics_set_xive(ics, hw_irq, xive);
+}
+
+static void wsp_chip_mask_irq(struct irq_data *d)
+{
+        unsigned int hw_irq = (unsigned int)irqd_to_hwirq(d);
+        struct wsp_ics *ics = d->chip_data;
+
+        if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS)
+                return;
+
+        wsp_mask_real_irq(hw_irq, ics);
+}
+
+static int wsp_chip_set_affinity(struct irq_data *d,
+                                 const struct cpumask *cpumask, bool force)
+{
+        unsigned int hw_irq = (unsigned int)irqd_to_hwirq(d);
+        struct wsp_ics *ics;
+        int ret;
+        u64 xive;
+
+        if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS)
+                return -1;
+
+        ics = d->chip_data;
+        if (WARN_ON(!ics))
+                return -1;
+        xive = wsp_ics_get_xive(ics, hw_irq);
+
+        /*
+         * For the moment only implement delivery to all cpus or one cpu.
+         * Get current irq_server for the given irq
+         */
+        ret = cache_hwirq_map(ics, d->irq, cpumask);
+        if (ret == -1) {
+                char cpulist[128];
+                cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);
+                pr_warning("%s: No online cpus in the mask %s for irq %d\n",
+                           __func__, cpulist, d->irq);
+                return -1;
+        } else if (ret == -ENOMEM) {
+                pr_warning("%s: Out of memory\n", __func__);
+                return -1;
+        }
+
+        xive = xive_set_server(xive, get_irq_server(ics, hw_irq));
+        wsp_ics_set_xive(ics, hw_irq, xive);
+
+        return 0;
+}
+
+static struct irq_chip wsp_irq_chip = {
+        .name = "WSP ICS",
+        .irq_startup            = wsp_chip_startup,
+        .irq_mask               = wsp_chip_mask_irq,
+        .irq_unmask             = wsp_chip_unmask_irq,
+        .irq_set_affinity       = wsp_chip_set_affinity
+};
+
+static int wsp_ics_host_match(struct ics *ics, struct device_node *dn)
+{
+        /* All ICSs in the system implement a global irq number space,
+         * so match against them all. */
+        return of_device_is_compatible(dn, "ibm,ppc-xics");
+}
+
+static int wsp_ics_match_hwirq(struct wsp_ics *wsp_ics, unsigned int hwirq)
+{
+        if (hwirq >= wsp_ics->hwirq_start &&
+            hwirq <  wsp_ics->hwirq_start + wsp_ics->count)
+                return 1;
+
+        return 0;
+}
+
+static int wsp_ics_map(struct ics *ics, unsigned int virq)
+{
+        struct wsp_ics *wsp_ics = to_wsp_ics(ics);
+        unsigned int hw_irq = virq_to_hw(virq);
+        unsigned long flags;
+
+        if (!wsp_ics_match_hwirq(wsp_ics, hw_irq))
+                return -ENOENT;
+
+        irq_set_chip_and_handler(virq, &wsp_irq_chip, handle_fasteoi_irq);
+
+        irq_set_chip_data(virq, wsp_ics);
+
+        spin_lock_irqsave(&wsp_ics->lock, flags);
+        bitmap_allocate_region(wsp_ics->bitmap, hw_irq - wsp_ics->hwirq_start, 0);
+        spin_unlock_irqrestore(&wsp_ics->lock, flags);
+
+        return 0;
+}
+
+static void wsp_ics_mask_unknown(struct ics *ics, unsigned long hw_irq)
+{
+        struct wsp_ics *wsp_ics = to_wsp_ics(ics);
+
+        if (!wsp_ics_match_hwirq(wsp_ics, hw_irq))
+                return;
+
+        pr_err("%s: IRQ %lu (real) is invalid, disabling it.\n", __func__, hw_irq);
+        wsp_mask_real_irq(hw_irq, wsp_ics);
+}
+
+static long wsp_ics_get_server(struct ics *ics, unsigned long hw_irq)
+{
+        struct wsp_ics *wsp_ics = to_wsp_ics(ics);
+
+        if (!wsp_ics_match_hwirq(wsp_ics, hw_irq))
+                return -ENOENT;
+
+        return get_irq_server(wsp_ics, hw_irq);
+}
+
+/* HW Number allocation API */
+
+static struct wsp_ics *wsp_ics_find_dn_ics(struct device_node *dn)
+{
+        struct device_node *iparent;
+        int i;
+
+        iparent = of_irq_find_parent(dn);
+        if (!iparent) {
+                pr_err("wsp_ics: Failed to find interrupt parent!\n");
+                return NULL;
+        }
+
+        for(i = 0; i < num_ics; i++) {
+                if(ics_list[i].dn == iparent)
+                        break;
+        }
+
+        if (i >= num_ics) {
+                pr_err("wsp_ics: Unable to find parent bitmap!\n");
+                return NULL;
+        }
+
+        return &ics_list[i];
+}
+
+int wsp_ics_alloc_irq(struct device_node *dn, int num)
+{
+        struct wsp_ics *ics;
+        int order, offset;
+
+        ics = wsp_ics_find_dn_ics(dn);
+        if (!ics)
+                return -ENODEV;
+
+        /* Fast, but overly strict if num isn't a power of two */
+        order = get_count_order(num);
+
+        spin_lock_irq(&ics->lock);
+        offset = bitmap_find_free_region(ics->bitmap, ics->count, order);
+        spin_unlock_irq(&ics->lock);
+
+        if (offset < 0)
+                return offset;
+
+        return offset + ics->hwirq_start;
+}
+
+void wsp_ics_free_irq(struct device_node *dn, unsigned int irq)
+{
+        struct wsp_ics *ics;
+
+        ics = wsp_ics_find_dn_ics(dn);
+        if (WARN_ON(!ics))
+                return;
+
+        spin_lock_irq(&ics->lock);
+        bitmap_release_region(ics->bitmap, irq, 0);
+        spin_unlock_irq(&ics->lock);
+}
+
+/* Initialisation */
+
+static int __init wsp_ics_bitmap_setup(struct wsp_ics *ics,
+                                      struct device_node *dn)
+{
+        int len, i, j, size;
+        u32 start, count;
+        const u32 *p;
+
+        size = BITS_TO_LONGS(ics->count) * sizeof(long);
+        ics->bitmap = kzalloc(size, GFP_KERNEL);
+        if (!ics->bitmap) {
+                pr_err("wsp_ics: ENOMEM allocating IRQ bitmap!\n");
+                return -ENOMEM;
+        }
+
+        spin_lock_init(&ics->lock);
+
+        p = of_get_property(dn, "available-ranges", &len);
+        if (!p || !len) {
+                /* FIXME this should be a WARN() once mambo is updated */
+                pr_err("wsp_ics: No available-ranges defined for %s\n",
+                        dn->full_name);
+                return 0;
+        }
+
+        if (len % (2 * sizeof(u32)) != 0) {
+                /* FIXME this should be a WARN() once mambo is updated */
+                pr_err("wsp_ics: Invalid available-ranges for %s\n",
+                        dn->full_name);
+                return 0;
+        }
+
+        bitmap_fill(ics->bitmap, ics->count);
+
+        for (i = 0; i < len / sizeof(u32); i += 2) {
+                start = of_read_number(p + i, 1);
+                count = of_read_number(p + i + 1, 1);
+
+                pr_devel("%s: start: %d count: %d\n", __func__, start, count);
+
+                if ((start + count) > (ics->hwirq_start + ics->count) ||
+                     start < ics->hwirq_start) {
+                        pr_err("wsp_ics: Invalid range! -> %d to %d\n",
+                                        start, start + count);
+                        break;
+                }
+
+                for (j = 0; j < count; j++)
+                        bitmap_release_region(ics->bitmap,
+                                (start + j) - ics->hwirq_start, 0);
+        }
+
+        /* Ensure LSIs are not available for allocation */
+        bitmap_allocate_region(ics->bitmap, ics->lsi_base,
+                               get_count_order(ics->lsi_count));
+
+        return 0;
+}
+
+static int __init wsp_ics_setup(struct wsp_ics *ics, struct device_node *dn)
+{
+        u32 lsi_buid, msi_buid, msi_base, msi_count;
+        void __iomem *regs;
+        const u32 *p;
+        int rc, len, i;
+        u64 caps, buid;
+
+        p = of_get_property(dn, "interrupt-ranges", &len);
+        if (!p || len < (2 * sizeof(u32))) {
+                pr_err("wsp_ics: No/bad interrupt-ranges found on %s\n",
+                        dn->full_name);
+                return -ENOENT;
+        }
+
+        if (len > (2 * sizeof(u32))) {
+                pr_err("wsp_ics: Multiple ics ranges not supported.\n");
+                return -EINVAL;
+        }
+
+        regs = of_iomap(dn, 0);
+        if (!regs) {
+                pr_err("wsp_ics: of_iomap(%s) failed\n", dn->full_name);
+                return -ENXIO;
+        }
+
+        ics->hwirq_start = of_read_number(p, 1);
+        ics->count = of_read_number(p + 1, 1);
+        ics->regs = regs;
+
+        ics->chip_id = wsp_get_chip_id(dn);
+        if (WARN_ON(ics->chip_id < 0))
+                ics->chip_id = 0;
+
+        /* Get some informations about the critter */
+        caps = in_be64(ICS_INT_CAPS_REG(ics->regs));
+        buid = in_be64(INT_SRC_LAYER_BUID_REG(ics->regs));
+        ics->lsi_count = caps >> 56;
+        msi_count = (caps >> 44) & 0x7ff;
+
+        /* Note: LSI BUID is 9 bits, but really only 3 are BUID and the
+         * rest is mixed in the interrupt number. We store the whole
+         * thing though
+         */
+        lsi_buid = (buid >> 48) & 0x1ff;
+        ics->lsi_base = (ics->chip_id << WSP_ICS_CHIP_SHIFT) | lsi_buid << 5;
+        msi_buid = (buid >> 37) & 0x7;
+        msi_base = (ics->chip_id << WSP_ICS_CHIP_SHIFT) | msi_buid << 11;
+
+        pr_info("wsp_ics: Found %s\n", dn->full_name);
+        pr_info("wsp_ics:    irq range : 0x%06llx..0x%06llx\n",
+                ics->hwirq_start, ics->hwirq_start + ics->count - 1);
+        pr_info("wsp_ics:    %4d LSIs : 0x%06x..0x%06x\n",
+                ics->lsi_count, ics->lsi_base,
+                ics->lsi_base + ics->lsi_count - 1);
+        pr_info("wsp_ics:    %4d MSIs : 0x%06x..0x%06x\n",
+                msi_count, msi_base,
+                msi_base + msi_count - 1);
+
+        /* Let's check the HW config is sane */
+        if (ics->lsi_base < ics->hwirq_start ||
+            (ics->lsi_base + ics->lsi_count) > (ics->hwirq_start + ics->count))
+                pr_warning("wsp_ics: WARNING ! LSIs out of interrupt-ranges !\n");
+        if (msi_base < ics->hwirq_start ||
+            (msi_base + msi_count) > (ics->hwirq_start + ics->count))
+                pr_warning("wsp_ics: WARNING ! MSIs out of interrupt-ranges !\n");
+
+        /* We don't check for overlap between LSI and MSI, which will happen
+         * if we use the same BUID, I'm not sure yet how legit that is.
+         */
+
+        rc = wsp_ics_bitmap_setup(ics, dn);
+        if (rc) {
+                iounmap(regs);
+                return rc;
+        }
+
+        ics->dn = of_node_get(dn);
+        alloc_irq_map(ics);
+
+        for(i = 0; i < ics->count; i++)
+                wsp_mask_real_irq(ics->hwirq_start + i, ics);
+
+        ics->ics.map = wsp_ics_map;
+        ics->ics.mask_unknown = wsp_ics_mask_unknown;
+        ics->ics.get_server = wsp_ics_get_server;
+        ics->ics.host_match = wsp_ics_host_match;
+
+        xics_register_ics(&ics->ics);
+
+        return 0;
+}
+
+static void __init wsp_ics_set_default_server(void)
+{
+        struct device_node *np;
+        u32 hwid;
+
+        /* Find the server number for the boot cpu. */
+        np = of_get_cpu_node(boot_cpuid, NULL);
+        BUG_ON(!np);
+
+        hwid = get_hard_smp_processor_id(boot_cpuid);
+
+        pr_info("wsp_ics: default server is %#x, CPU %s\n", hwid, np->full_name);
+        xics_default_server = hwid;
+
+        of_node_put(np);
+}
+
+static int __init wsp_ics_init(void)
+{
+        struct device_node *dn;
+        struct wsp_ics *ics;
+        int rc, found;
+
+        wsp_ics_set_default_server();
+
+        found = 0;
+        for_each_compatible_node(dn, NULL, "ibm,ppc-xics")
+                found++;
+
+        if (found == 0) {
+                pr_err("wsp_ics: No ICS's found!\n");
+                return -ENODEV;
+        }
+
+        ics_list = kmalloc(sizeof(*ics) * found, GFP_KERNEL);
+        if (!ics_list) {
+                pr_err("wsp_ics: No memory for structs.\n");
+                return -ENOMEM;
+        }
+
+        num_ics = 0;
+        ics = ics_list;
+        for_each_compatible_node(dn, NULL, "ibm,wsp-xics") {
+                rc = wsp_ics_setup(ics, dn);
+                if (rc == 0) {
+                        ics++;
+                        num_ics++;
+                }
+        }
+
+        if (found != num_ics) {
+                pr_err("wsp_ics: Failed setting up %d ICS's\n",
+                        found - num_ics);
+                return -1;
+        }
+
+        return 0;
+}
+
+void __init wsp_init_irq(void)
+{
+        wsp_ics_init();
+        xics_init();
+
+        /* We need to patch our irq chip's EOI to point to the right ICP */
+        wsp_irq_chip.irq_eoi = icp_ops->eoi;
+}
diff --git a/arch/powerpc/platforms/wsp/ics.h b/arch/powerpc/platforms/wsp/ics.h
new file mode 100644
index 000000000000..e34d53102640
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/ics.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2009 IBM Corporation.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ */
+
+#ifndef __ICS_H
+#define __ICS_H
+
+#define XIVE_ADDR_MASK          0x7FFULL
+
+extern void wsp_init_irq(void);
+
+extern int wsp_ics_alloc_irq(struct device_node *dn, int num);
+extern void wsp_ics_free_irq(struct device_node *dn, unsigned int irq);
+
+#endif /* __ICS_H */
diff --git a/arch/powerpc/platforms/wsp/opb_pic.c b/arch/powerpc/platforms/wsp/opb_pic.c
new file mode 100644
index 000000000000..be05631a3c1c
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/opb_pic.c
@@ -0,0 +1,332 @@
+/*
+ * IBM Onboard Peripheral Bus Interrupt Controller
+ *
+ * Copyright 2010 Jack Miller, IBM Corporation.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/of.h>
+#include <linux/slab.h>
+#include <linux/time.h>
+
+#include <asm/reg_a2.h>
+#include <asm/irq.h>
+
+#define OPB_NR_IRQS 32
+
+#define OPB_MLSASIER    0x04    /* MLS Accumulated Status IER */
+#define OPB_MLSIR       0x50    /* MLS Interrupt Register */
+#define OPB_MLSIER      0x54    /* MLS Interrupt Enable Register */
+#define OPB_MLSIPR      0x58    /* MLS Interrupt Polarity Register */
+#define OPB_MLSIIR      0x5c    /* MLS Interrupt Inputs Register */
+
+static int opb_index = 0;
+
+struct opb_pic {
+        struct irq_host *host;
+        void *regs;
+        int index;
+        spinlock_t lock;
+};
+
+static u32 opb_in(struct opb_pic *opb, int offset)
+{
+        return in_be32(opb->regs + offset);
+}
+
+static void opb_out(struct opb_pic *opb, int offset, u32 val)
+{
+        out_be32(opb->regs + offset, val);
+}
+
+static void opb_unmask_irq(struct irq_data *d)
+{
+        struct opb_pic *opb;
+        unsigned long flags;
+        u32 ier, bitset;
+
+        opb = d->chip_data;
+        bitset = (1 << (31 - irqd_to_hwirq(d)));
+
+        spin_lock_irqsave(&opb->lock, flags);
+
+        ier = opb_in(opb, OPB_MLSIER);
+        opb_out(opb, OPB_MLSIER, ier | bitset);
+        ier = opb_in(opb, OPB_MLSIER);
+
+        spin_unlock_irqrestore(&opb->lock, flags);
+}
+
+static void opb_mask_irq(struct irq_data *d)
+{
+        struct opb_pic *opb;
+        unsigned long flags;
+        u32 ier, mask;
+
+        opb = d->chip_data;
+        mask = ~(1 << (31 - irqd_to_hwirq(d)));
+
+        spin_lock_irqsave(&opb->lock, flags);
+
+        ier = opb_in(opb, OPB_MLSIER);
+        opb_out(opb, OPB_MLSIER, ier & mask);
+        ier = opb_in(opb, OPB_MLSIER); // Flush posted writes
+
+        spin_unlock_irqrestore(&opb->lock, flags);
+}
+
+static void opb_ack_irq(struct irq_data *d)
+{
+        struct opb_pic *opb;
+        unsigned long flags;
+        u32 bitset;
+
+        opb = d->chip_data;
+        bitset = (1 << (31 - irqd_to_hwirq(d)));
+
+        spin_lock_irqsave(&opb->lock, flags);
+
+        opb_out(opb, OPB_MLSIR, bitset);
+        opb_in(opb, OPB_MLSIR); // Flush posted writes
+
+        spin_unlock_irqrestore(&opb->lock, flags);
+}
+
+static void opb_mask_ack_irq(struct irq_data *d)
+{
+        struct opb_pic *opb;
+        unsigned long flags;
+        u32 bitset;
+        u32 ier, ir;
+
+        opb = d->chip_data;
+        bitset = (1 << (31 - irqd_to_hwirq(d)));
+
+        spin_lock_irqsave(&opb->lock, flags);
+
+        ier = opb_in(opb, OPB_MLSIER);
+        opb_out(opb, OPB_MLSIER, ier & ~bitset);
+        ier = opb_in(opb, OPB_MLSIER); // Flush posted writes
+
+        opb_out(opb, OPB_MLSIR, bitset);
+        ir = opb_in(opb, OPB_MLSIR); // Flush posted writes
+
+        spin_unlock_irqrestore(&opb->lock, flags);
+}
+
+static int opb_set_irq_type(struct irq_data *d, unsigned int flow)
+{
+        struct opb_pic *opb;
+        unsigned long flags;
+        int invert, ipr, mask, bit;
+
+        opb = d->chip_data;
+
+        /* The only information we're interested in in the type is whether it's
+         * a high or low trigger. For high triggered interrupts, the polarity
+         * set for it in the MLS Interrupt Polarity Register is 0, for low
+         * interrupts it's 1 so that the proper input in the MLS Interrupt Input
+         * Register is interrupted as asserting the interrupt. */
+
+        switch (flow) {
+                case IRQ_TYPE_NONE:
+                        opb_mask_irq(d);
+                        return 0;
+
+                case IRQ_TYPE_LEVEL_HIGH:
+                        invert = 0;
+                        break;
+
+                case IRQ_TYPE_LEVEL_LOW:
+                        invert = 1;
+                        break;
+
+                default:
+                        return -EINVAL;
+        }
+
+        bit = (1 << (31 - irqd_to_hwirq(d)));
+        mask = ~bit;
+
+        spin_lock_irqsave(&opb->lock, flags);
+
+        ipr = opb_in(opb, OPB_MLSIPR);
+        ipr = (ipr & mask) | (invert ? bit : 0);
+        opb_out(opb, OPB_MLSIPR, ipr);
+        ipr = opb_in(opb, OPB_MLSIPR);  // Flush posted writes
+
+        spin_unlock_irqrestore(&opb->lock, flags);
+
+        /* Record the type in the interrupt descriptor */
+        irqd_set_trigger_type(d, flow);
+
+        return 0;
+}
+
+static struct irq_chip opb_irq_chip = {
+        .name           = "OPB",
+        .irq_mask       = opb_mask_irq,
+        .irq_unmask     = opb_unmask_irq,
+        .irq_mask_ack   = opb_mask_ack_irq,
+        .irq_ack        = opb_ack_irq,
+        .irq_set_type   = opb_set_irq_type
+};
+
+static int opb_host_map(struct irq_host *host, unsigned int virq,
+                irq_hw_number_t hwirq)
+{
+        struct opb_pic *opb;
+
+        opb = host->host_data;
+
+        /* Most of the important stuff is handled by the generic host code, like
+         * the lookup, so just attach some info to the virtual irq */
+
+        irq_set_chip_data(virq, opb);
+        irq_set_chip_and_handler(virq, &opb_irq_chip, handle_level_irq);
+        irq_set_irq_type(virq, IRQ_TYPE_NONE);
+
+        return 0;
+}
+
+static int opb_host_xlate(struct irq_host *host, struct device_node *dn,
+                const u32 *intspec, unsigned int intsize,
+                irq_hw_number_t *out_hwirq, unsigned int *out_type)
+{
+        /* Interrupt size must == 2 */
+        BUG_ON(intsize != 2);
+        *out_hwirq = intspec[0];
+        *out_type = intspec[1];
+        return 0;
+}
+
+static struct irq_host_ops opb_host_ops = {
+        .map = opb_host_map,
+        .xlate = opb_host_xlate,
+};
+
+irqreturn_t opb_irq_handler(int irq, void *private)
+{
+        struct opb_pic *opb;
+        u32 ir, src, subvirq;
+
+        opb = (struct opb_pic *) private;
+
+        /* Read the OPB MLS Interrupt Register for
+         * asserted interrupts */
+        ir = opb_in(opb, OPB_MLSIR);
+        if (!ir)
+                return IRQ_NONE;
+
+        do {
+                /* Get 1 - 32 source, *NOT* bit */
+                src = 32 - ffs(ir);
+
+                /* Translate from the OPB's conception of interrupt number to
+                 * Linux's virtual IRQ */
+
+                subvirq = irq_linear_revmap(opb->host, src);
+
+                generic_handle_irq(subvirq);
+        } while ((ir = opb_in(opb, OPB_MLSIR)));
+
+        return IRQ_HANDLED;
+}
+
+struct opb_pic *opb_pic_init_one(struct device_node *dn)
+{
+        struct opb_pic *opb;
+        struct resource res;
+
+        if (of_address_to_resource(dn, 0, &res)) {
+                printk(KERN_ERR "opb: Couldn't translate resource\n");
+                return  NULL;
+        }
+
+        opb = kzalloc(sizeof(struct opb_pic), GFP_KERNEL);
+        if (!opb) {
+                printk(KERN_ERR "opb: Failed to allocate opb struct!\n");
+                return NULL;
+        }
+
+        /* Get access to the OPB MMIO registers */
+        opb->regs = ioremap(res.start + 0x10000, 0x1000);
+        if (!opb->regs) {
+                printk(KERN_ERR "opb: Failed to allocate register space!\n");
+                goto free_opb;
+        }
+
+        /* Allocate an irq host so that Linux knows that despite only
+         * having one interrupt to issue, we're the controller for multiple
+         * hardware IRQs, so later we can lookup their virtual IRQs. */
+
+        opb->host = irq_alloc_host(dn, IRQ_HOST_MAP_LINEAR,
+                        OPB_NR_IRQS, &opb_host_ops, -1);
+
+        if (!opb->host) {
+                printk(KERN_ERR "opb: Failed to allocate IRQ host!\n");
+                goto free_regs;
+        }
+
+        opb->index = opb_index++;
+        spin_lock_init(&opb->lock);
+        opb->host->host_data = opb;
+
+        /* Disable all interrupts by default */
+        opb_out(opb, OPB_MLSASIER, 0);
+        opb_out(opb, OPB_MLSIER, 0);
+
+        /* ACK any interrupts left by FW */
+        opb_out(opb, OPB_MLSIR, 0xFFFFFFFF);
+
+        return opb;
+
+free_regs:
+        iounmap(opb->regs);
+free_opb:
+        kfree(opb);
+        return NULL;
+}
+
+void __init opb_pic_init(void)
+{
+        struct device_node *dn;
+        struct opb_pic *opb;
+        int virq;
+        int rc;
+
+        /* Call init_one for each OPB device */
+        for_each_compatible_node(dn, NULL, "ibm,opb") {
+
+                /* Fill in an OPB struct */
+                opb = opb_pic_init_one(dn);
+                if (!opb) {
+                        printk(KERN_WARNING "opb: Failed to init node, skipped!\n");
+                        continue;
+                }
+
+                /* Map / get opb's hardware virtual irq */
+                virq = irq_of_parse_and_map(dn, 0);
+                if (virq <= 0) {
+                        printk("opb: irq_op_parse_and_map failed!\n");
+                        continue;
+                }
+
+                /* Attach opb interrupt handler to new virtual IRQ */
+                rc = request_irq(virq, opb_irq_handler, 0, "OPB LS Cascade", opb);
+                if (rc) {
+                        printk("opb: request_irq failed: %d\n", rc);
+                        continue;
+                }
+
+                printk("OPB%d init with %d IRQs at %p\n", opb->index,
+                                OPB_NR_IRQS, opb->regs);
+        }
+}
diff --git a/arch/powerpc/platforms/wsp/psr2.c b/arch/powerpc/platforms/wsp/psr2.c
new file mode 100644
index 000000000000..40f28916ff6c
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/psr2.c
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2008-2011, IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/of.h>
+#include <linux/smp.h>
+
+#include <asm/machdep.h>
+#include <asm/system.h>
+#include <asm/time.h>
+#include <asm/udbg.h>
+
+#include "ics.h"
+#include "wsp.h"
+
+
+static void psr2_spin(void)
+{
+        hard_irq_disable();
+        for (;;) ;
+}
+
+static void psr2_restart(char *cmd)
+{
+        psr2_spin();
+}
+
+static int psr2_probe_devices(void)
+{
+        struct device_node *np;
+
+        /* Our RTC is a ds1500. It seems to be programatically compatible
+         * with the ds1511 for which we have a driver so let's use that
+         */
+        np = of_find_compatible_node(NULL, NULL, "dallas,ds1500");
+        if (np != NULL) {
+                struct resource res;
+                if (of_address_to_resource(np, 0, &res) == 0)
+                        platform_device_register_simple("ds1511", 0, &res, 1);
+        }
+        return 0;
+}
+machine_arch_initcall(psr2_md, psr2_probe_devices);
+
+static void __init psr2_setup_arch(void)
+{
+        /* init to some ~sane value until calibrate_delay() runs */
+        loops_per_jiffy = 50000000;
+
+        scom_init_wsp();
+
+        /* Setup SMP callback */
+#ifdef CONFIG_SMP
+        a2_setup_smp();
+#endif
+}
+
+static int __init psr2_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (!of_flat_dt_is_compatible(root, "ibm,psr2"))
+                return 0;
+
+        return 1;
+}
+
+static void __init psr2_init_irq(void)
+{
+        wsp_init_irq();
+        opb_pic_init();
+}
+
+define_machine(psr2_md) {
+        .name                   = "PSR2 A2",
+        .probe                  = psr2_probe,
+        .setup_arch             = psr2_setup_arch,
+        .restart                = psr2_restart,
+        .power_off              = psr2_spin,
+        .halt                   = psr2_spin,
+        .calibrate_decr         = generic_calibrate_decr,
+        .init_IRQ               = psr2_init_irq,
+        .progress               = udbg_progress,
+        .power_save             = book3e_idle,
+};
diff --git a/arch/powerpc/platforms/wsp/scom_smp.c b/arch/powerpc/platforms/wsp/scom_smp.c
new file mode 100644
index 000000000000..141e78032097
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/scom_smp.c
@@ -0,0 +1,427 @@
+/*
+ * SCOM support for A2 platforms
+ *
+ * Copyright 2007-2011 Benjamin Herrenschmidt, David Gibson,
+ *                     Michael Ellerman, IBM Corp.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/cpumask.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+
+#include <asm/cputhreads.h>
+#include <asm/reg_a2.h>
+#include <asm/scom.h>
+#include <asm/udbg.h>
+
+#include "wsp.h"
+
+#define SCOM_RAMC               0x2a            /* Ram Command */
+#define SCOM_RAMC_TGT1_EXT      0x80000000
+#define SCOM_RAMC_SRC1_EXT      0x40000000
+#define SCOM_RAMC_SRC2_EXT      0x20000000
+#define SCOM_RAMC_SRC3_EXT      0x10000000
+#define SCOM_RAMC_ENABLE        0x00080000
+#define SCOM_RAMC_THREADSEL     0x00060000
+#define SCOM_RAMC_EXECUTE       0x00010000
+#define SCOM_RAMC_MSR_OVERRIDE  0x00008000
+#define SCOM_RAMC_MSR_PR        0x00004000
+#define SCOM_RAMC_MSR_GS        0x00002000
+#define SCOM_RAMC_FORCE         0x00001000
+#define SCOM_RAMC_FLUSH         0x00000800
+#define SCOM_RAMC_INTERRUPT     0x00000004
+#define SCOM_RAMC_ERROR         0x00000002
+#define SCOM_RAMC_DONE          0x00000001
+#define SCOM_RAMI               0x29            /* Ram Instruction */
+#define SCOM_RAMIC              0x28            /* Ram Instruction and Command */
+#define SCOM_RAMIC_INSN         0xffffffff00000000
+#define SCOM_RAMD               0x2d            /* Ram Data */
+#define SCOM_RAMDH              0x2e            /* Ram Data High */
+#define SCOM_RAMDL              0x2f            /* Ram Data Low */
+#define SCOM_PCCR0              0x33            /* PC Configuration Register 0 */
+#define SCOM_PCCR0_ENABLE_DEBUG 0x80000000
+#define SCOM_PCCR0_ENABLE_RAM   0x40000000
+#define SCOM_THRCTL             0x30            /* Thread Control and Status */
+#define SCOM_THRCTL_T0_STOP     0x80000000
+#define SCOM_THRCTL_T1_STOP     0x40000000
+#define SCOM_THRCTL_T2_STOP     0x20000000
+#define SCOM_THRCTL_T3_STOP     0x10000000
+#define SCOM_THRCTL_T0_STEP     0x08000000
+#define SCOM_THRCTL_T1_STEP     0x04000000
+#define SCOM_THRCTL_T2_STEP     0x02000000
+#define SCOM_THRCTL_T3_STEP     0x01000000
+#define SCOM_THRCTL_T0_RUN      0x00800000
+#define SCOM_THRCTL_T1_RUN      0x00400000
+#define SCOM_THRCTL_T2_RUN      0x00200000
+#define SCOM_THRCTL_T3_RUN      0x00100000
+#define SCOM_THRCTL_T0_PM       0x00080000
+#define SCOM_THRCTL_T1_PM       0x00040000
+#define SCOM_THRCTL_T2_PM       0x00020000
+#define SCOM_THRCTL_T3_PM       0x00010000
+#define SCOM_THRCTL_T0_UDE      0x00008000
+#define SCOM_THRCTL_T1_UDE      0x00004000
+#define SCOM_THRCTL_T2_UDE      0x00002000
+#define SCOM_THRCTL_T3_UDE      0x00001000
+#define SCOM_THRCTL_ASYNC_DIS   0x00000800
+#define SCOM_THRCTL_TB_DIS      0x00000400
+#define SCOM_THRCTL_DEC_DIS     0x00000200
+#define SCOM_THRCTL_AND         0x31            /* Thread Control and Status */
+#define SCOM_THRCTL_OR          0x32            /* Thread Control and Status */
+
+
+static DEFINE_PER_CPU(scom_map_t, scom_ptrs);
+
+static scom_map_t get_scom(int cpu, struct device_node *np, int *first_thread)
+{
+        scom_map_t scom = per_cpu(scom_ptrs, cpu);
+        int tcpu;
+
+        if (scom_map_ok(scom)) {
+                *first_thread = 0;
+                return scom;
+        }
+
+        *first_thread = 1;
+
+        scom = scom_map_device(np, 0);
+
+        for (tcpu = cpu_first_thread_sibling(cpu);
+             tcpu <= cpu_last_thread_sibling(cpu); tcpu++)
+                per_cpu(scom_ptrs, tcpu) = scom;
+
+        /* Hack: for the boot core, this will actually get called on
+         * the second thread up, not the first so our test above will
+         * set first_thread incorrectly. */
+        if (cpu_first_thread_sibling(cpu) == 0)
+                *first_thread = 0;
+
+        return scom;
+}
+
+static int a2_scom_ram(scom_map_t scom, int thread, u32 insn, int extmask)
+{
+        u64 cmd, mask, val;
+        int n = 0;
+
+        cmd = ((u64)insn << 32) | (((u64)extmask & 0xf) << 28)
+                | ((u64)thread << 17) | SCOM_RAMC_ENABLE | SCOM_RAMC_EXECUTE;
+        mask = SCOM_RAMC_DONE | SCOM_RAMC_INTERRUPT | SCOM_RAMC_ERROR;
+
+        scom_write(scom, SCOM_RAMIC, cmd);
+
+        while (!((val = scom_read(scom, SCOM_RAMC)) & mask)) {
+                pr_devel("Waiting on RAMC = 0x%llx\n", val);
+                if (++n == 3) {
+                        pr_err("RAMC timeout on instruction 0x%08x, thread %d\n",
+                               insn, thread);
+                        return -1;
+                }
+        }
+
+        if (val & SCOM_RAMC_INTERRUPT) {
+                pr_err("RAMC interrupt on instruction 0x%08x, thread %d\n",
+                       insn, thread);
+                return -SCOM_RAMC_INTERRUPT;
+        }
+
+        if (val & SCOM_RAMC_ERROR) {
+                pr_err("RAMC error on instruction 0x%08x, thread %d\n",
+                       insn, thread);
+                return -SCOM_RAMC_ERROR;
+        }
+
+        return 0;
+}
+
+static int a2_scom_getgpr(scom_map_t scom, int thread, int gpr, int alt,
+                          u64 *out_gpr)
+{
+        int rc;
+
+        /* or rN, rN, rN */
+        u32 insn = 0x7c000378 | (gpr << 21) | (gpr << 16) | (gpr << 11);
+        rc = a2_scom_ram(scom, thread, insn, alt ? 0xf : 0x0);
+        if (rc)
+                return rc;
+
+        *out_gpr = scom_read(scom, SCOM_RAMD);
+
+        return 0;
+}
+
+static int a2_scom_getspr(scom_map_t scom, int thread, int spr, u64 *out_spr)
+{
+        int rc, sprhi, sprlo;
+        u32 insn;
+
+        sprhi = spr >> 5;
+        sprlo = spr & 0x1f;
+        insn = 0x7c2002a6 | (sprlo << 16) | (sprhi << 11); /* mfspr r1,spr */
+
+        if (spr == 0x0ff0)
+                insn = 0x7c2000a6; /* mfmsr r1 */
+
+        rc = a2_scom_ram(scom, thread, insn, 0xf);
+        if (rc)
+                return rc;
+        return a2_scom_getgpr(scom, thread, 1, 1, out_spr);
+}
+
+static int a2_scom_setgpr(scom_map_t scom, int thread, int gpr,
+                          int alt, u64 val)
+{
+        u32 lis = 0x3c000000 | (gpr << 21);
+        u32 li = 0x38000000 | (gpr << 21);
+        u32 oris = 0x64000000 | (gpr << 21) | (gpr << 16);
+        u32 ori = 0x60000000 | (gpr << 21) | (gpr << 16);
+        u32 rldicr32 = 0x780007c6 | (gpr << 21) | (gpr << 16);
+        u32 highest = val >> 48;
+        u32 higher = (val >> 32) & 0xffff;
+        u32 high = (val >> 16) & 0xffff;
+        u32 low = val & 0xffff;
+        int lext = alt ? 0x8 : 0x0;
+        int oext = alt ? 0xf : 0x0;
+        int rc = 0;
+
+        if (highest)
+                rc |= a2_scom_ram(scom, thread, lis | highest, lext);
+
+        if (higher) {
+                if (highest)
+                        rc |= a2_scom_ram(scom, thread, oris | higher, oext);
+                else
+                        rc |= a2_scom_ram(scom, thread, li | higher, lext);
+        }
+
+        if (highest || higher)
+                rc |= a2_scom_ram(scom, thread, rldicr32, oext);
+
+        if (high) {
+                if (highest || higher)
+                        rc |= a2_scom_ram(scom, thread, oris | high, oext);
+                else
+                        rc |= a2_scom_ram(scom, thread, lis | high, lext);
+        }
+
+        if (highest || higher || high)
+                rc |= a2_scom_ram(scom, thread, ori | low, oext);
+        else
+                rc |= a2_scom_ram(scom, thread, li | low, lext);
+
+        return rc;
+}
+
+static int a2_scom_setspr(scom_map_t scom, int thread, int spr, u64 val)
+{
+        int sprhi = spr >> 5;
+        int sprlo = spr & 0x1f;
+        /* mtspr spr, r1 */
+        u32 insn = 0x7c2003a6 | (sprlo << 16) | (sprhi << 11);
+
+        if (spr == 0x0ff0)
+                insn = 0x7c200124; /* mtmsr r1 */
+
+        if (a2_scom_setgpr(scom, thread, 1, 1, val))
+                return -1;
+
+        return a2_scom_ram(scom, thread, insn, 0xf);
+}
+
+static int a2_scom_initial_tlb(scom_map_t scom, int thread)
+{
+        extern u32 a2_tlbinit_code_start[], a2_tlbinit_code_end[];
+        extern u32 a2_tlbinit_after_iprot_flush[];
+        extern u32 a2_tlbinit_after_linear_map[];
+        u32 assoc, entries, i;
+        u64 epn, tlbcfg;
+        u32 *p;
+        int rc;
+
+        /* Invalidate all entries (including iprot) */
+
+        rc = a2_scom_getspr(scom, thread, SPRN_TLB0CFG, &tlbcfg);
+        if (rc)
+                goto scom_fail;
+        entries = tlbcfg & TLBnCFG_N_ENTRY;
+        assoc = (tlbcfg & TLBnCFG_ASSOC) >> 24;
+        epn = 0;
+
+        /* Set MMUCR2 to enable 4K, 64K, 1M, 16M and 1G pages */
+        a2_scom_setspr(scom, thread, SPRN_MMUCR2, 0x000a7531);
+        /* Set MMUCR3 to write all thids bit to the TLB */
+        a2_scom_setspr(scom, thread, SPRN_MMUCR3, 0x0000000f);
+
+        /* Set MAS1 for 1G page size, and MAS2 to our initial EPN */
+        a2_scom_setspr(scom, thread, SPRN_MAS1, MAS1_TSIZE(BOOK3E_PAGESZ_1GB));
+        a2_scom_setspr(scom, thread, SPRN_MAS2, epn);
+        for (i = 0; i < entries; i++) {
+
+                a2_scom_setspr(scom, thread, SPRN_MAS0, MAS0_ESEL(i % assoc));
+
+                /* tlbwe */
+                rc = a2_scom_ram(scom, thread, 0x7c0007a4, 0);
+                if (rc)
+                        goto scom_fail;
+
+                /* Next entry is new address? */
+                if((i + 1) % assoc == 0) {
+                        epn += (1 << 30);
+                        a2_scom_setspr(scom, thread, SPRN_MAS2, epn);
+                }
+        }
+
+        /* Setup args for linear mapping */
+        rc = a2_scom_setgpr(scom, thread, 3, 0, MAS0_TLBSEL(0));
+        if (rc)
+                goto scom_fail;
+
+        /* Linear mapping */
+        for (p = a2_tlbinit_code_start; p < a2_tlbinit_after_linear_map; p++) {
+                rc = a2_scom_ram(scom, thread, *p, 0);
+                if (rc)
+                        goto scom_fail;
+        }
+
+        /*
+         * For the boot thread, between the linear mapping and the debug
+         * mappings there is a loop to flush iprot mappings. Ramming doesn't do
+         * branches, but the secondary threads don't need to be nearly as smart
+         * (i.e. we don't need to worry about invalidating the mapping we're
+         * standing on).
+         */
+
+        /* Debug mappings. Expects r11 = MAS0 from linear map (set above) */
+        for (p = a2_tlbinit_after_iprot_flush; p < a2_tlbinit_code_end; p++) {
+                rc = a2_scom_ram(scom, thread, *p, 0);
+                if (rc)
+                        goto scom_fail;
+        }
+
+scom_fail:
+        if (rc)
+                pr_err("Setting up initial TLB failed, err %d\n", rc);
+
+        if (rc == -SCOM_RAMC_INTERRUPT) {
+                /* Interrupt, dump some status */
+                int rc[10];
+                u64 iar, srr0, srr1, esr, mas0, mas1, mas2, mas7_3, mas8, ccr2;
+                rc[0] = a2_scom_getspr(scom, thread, SPRN_IAR, &iar);
+                rc[1] = a2_scom_getspr(scom, thread, SPRN_SRR0, &srr0);
+                rc[2] = a2_scom_getspr(scom, thread, SPRN_SRR1, &srr1);
+                rc[3] = a2_scom_getspr(scom, thread, SPRN_ESR, &esr);
+                rc[4] = a2_scom_getspr(scom, thread, SPRN_MAS0, &mas0);
+                rc[5] = a2_scom_getspr(scom, thread, SPRN_MAS1, &mas1);
+                rc[6] = a2_scom_getspr(scom, thread, SPRN_MAS2, &mas2);
+                rc[7] = a2_scom_getspr(scom, thread, SPRN_MAS7_MAS3, &mas7_3);
+                rc[8] = a2_scom_getspr(scom, thread, SPRN_MAS8, &mas8);
+                rc[9] = a2_scom_getspr(scom, thread, SPRN_A2_CCR2, &ccr2);
+                pr_err(" -> retreived IAR =0x%llx (err %d)\n", iar, rc[0]);
+                pr_err("    retreived SRR0=0x%llx (err %d)\n", srr0, rc[1]);
+                pr_err("    retreived SRR1=0x%llx (err %d)\n", srr1, rc[2]);
+                pr_err("    retreived ESR =0x%llx (err %d)\n", esr, rc[3]);
+                pr_err("    retreived MAS0=0x%llx (err %d)\n", mas0, rc[4]);
+                pr_err("    retreived MAS1=0x%llx (err %d)\n", mas1, rc[5]);
+                pr_err("    retreived MAS2=0x%llx (err %d)\n", mas2, rc[6]);
+                pr_err("    retreived MS73=0x%llx (err %d)\n", mas7_3, rc[7]);
+                pr_err("    retreived MAS8=0x%llx (err %d)\n", mas8, rc[8]);
+                pr_err("    retreived CCR2=0x%llx (err %d)\n", ccr2, rc[9]);
+        }
+
+        return rc;
+}
+
+int __devinit a2_scom_startup_cpu(unsigned int lcpu, int thr_idx,
+                                  struct device_node *np)
+{
+        u64 init_iar, init_msr, init_ccr2;
+        unsigned long start_here;
+        int rc, core_setup;
+        scom_map_t scom;
+        u64 pccr0;
+
+        scom = get_scom(lcpu, np, &core_setup);
+        if (!scom) {
+                printk(KERN_ERR "Couldn't map SCOM for CPU%d\n", lcpu);
+                return -1;
+        }
+
+        pr_devel("Bringing up CPU%d using SCOM...\n", lcpu);
+
+        pccr0 = scom_read(scom, SCOM_PCCR0);
+        scom_write(scom, SCOM_PCCR0, pccr0 | SCOM_PCCR0_ENABLE_DEBUG |
+                                     SCOM_PCCR0_ENABLE_RAM);
+
+        /* Stop the thead with THRCTL. If we are setting up the TLB we stop all
+         * threads. We also disable asynchronous interrupts while RAMing.
+         */
+        if (core_setup)
+                scom_write(scom, SCOM_THRCTL_OR,
+                              SCOM_THRCTL_T0_STOP |
+                              SCOM_THRCTL_T1_STOP |
+                              SCOM_THRCTL_T2_STOP |
+                              SCOM_THRCTL_T3_STOP |
+                              SCOM_THRCTL_ASYNC_DIS);
+        else
+                scom_write(scom, SCOM_THRCTL_OR, SCOM_THRCTL_T0_STOP >> thr_idx);
+
+        /* Flush its pipeline just in case */
+        scom_write(scom, SCOM_RAMC, ((u64)thr_idx << 17) |
+                      SCOM_RAMC_FLUSH | SCOM_RAMC_ENABLE);
+
+        a2_scom_getspr(scom, thr_idx, SPRN_IAR, &init_iar);
+        a2_scom_getspr(scom, thr_idx, 0x0ff0, &init_msr);
+        a2_scom_getspr(scom, thr_idx, SPRN_A2_CCR2, &init_ccr2);
+
+        /* Set MSR to MSR_CM (0x0ff0 is magic value for MSR_CM) */
+        rc = a2_scom_setspr(scom, thr_idx, 0x0ff0, MSR_CM);
+        if (rc) {
+                pr_err("Failed to set MSR ! err %d\n", rc);
+                return rc;
+        }
+
+        /* RAM in an sync/isync for the sake of it */
+        a2_scom_ram(scom, thr_idx, 0x7c0004ac, 0);
+        a2_scom_ram(scom, thr_idx, 0x4c00012c, 0);
+
+        if (core_setup) {
+                pr_devel("CPU%d is first thread in core, initializing TLB...\n",
+                         lcpu);
+                rc = a2_scom_initial_tlb(scom, thr_idx);
+                if (rc)
+                        goto fail;
+        }
+
+        start_here = *(unsigned long *)(core_setup ? generic_secondary_smp_init
+                                        : generic_secondary_thread_init);
+        pr_devel("CPU%d entry point at 0x%lx...\n", lcpu, start_here);
+
+        rc |= a2_scom_setspr(scom, thr_idx, SPRN_IAR, start_here);
+        rc |= a2_scom_setgpr(scom, thr_idx, 3, 0,
+                             get_hard_smp_processor_id(lcpu));
+        /*
+         * Tell book3e_secondary_core_init not to set up the TLB, we've
+         * already done that.
+         */
+        rc |= a2_scom_setgpr(scom, thr_idx, 4, 0, 1);
+
+        rc |= a2_scom_setspr(scom, thr_idx, SPRN_TENS, 0x1 << thr_idx);
+
+        scom_write(scom, SCOM_RAMC, 0);
+        scom_write(scom, SCOM_THRCTL_AND, ~(SCOM_THRCTL_T0_STOP >> thr_idx));
+        scom_write(scom, SCOM_PCCR0, pccr0);
+fail:
+        pr_devel("  SCOM initialization %s\n", rc ? "failed" : "succeeded");
+        if (rc) {
+                pr_err("Old IAR=0x%08llx MSR=0x%08llx CCR2=0x%08llx\n",
+                       init_iar, init_msr, init_ccr2);
+        }
+
+        return rc;
+}
diff --git a/arch/powerpc/platforms/wsp/scom_wsp.c b/arch/powerpc/platforms/wsp/scom_wsp.c
new file mode 100644
index 000000000000..4052e2259f30
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/scom_wsp.c
@@ -0,0 +1,77 @@
+/*
+ *  SCOM backend for WSP
+ *
+ *  Copyright 2010 Benjamin Herrenschmidt, IBM Corp.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/cpumask.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+
+#include <asm/cputhreads.h>
+#include <asm/reg_a2.h>
+#include <asm/scom.h>
+#include <asm/udbg.h>
+
+#include "wsp.h"
+
+
+static scom_map_t wsp_scom_map(struct device_node *dev, u64 reg, u64 count)
+{
+        struct resource r;
+        u64 xscom_addr;
+
+        if (!of_get_property(dev, "scom-controller", NULL)) {
+                pr_err("%s: device %s is not a SCOM controller\n",
+                        __func__, dev->full_name);
+                return SCOM_MAP_INVALID;
+        }
+
+        if (of_address_to_resource(dev, 0, &r)) {
+                pr_debug("Failed to find SCOM controller address\n");
+                return 0;
+        }
+
+        /* Transform the SCOM address into an XSCOM offset */
+        xscom_addr = ((reg & 0x7f000000) >> 1) | ((reg & 0xfffff) << 3);
+
+        return (scom_map_t)ioremap(r.start + xscom_addr, count << 3);
+}
+
+static void wsp_scom_unmap(scom_map_t map)
+{
+        iounmap((void *)map);
+}
+
+static u64 wsp_scom_read(scom_map_t map, u32 reg)
+{
+        u64 __iomem *addr = (u64 __iomem *)map;
+
+        return in_be64(addr + reg);
+}
+
+static void wsp_scom_write(scom_map_t map, u32 reg, u64 value)
+{
+        u64 __iomem *addr = (u64 __iomem *)map;
+
+        return out_be64(addr + reg, value);
+}
+
+static const struct scom_controller wsp_scom_controller = {
+        .map    = wsp_scom_map,
+        .unmap  = wsp_scom_unmap,
+        .read   = wsp_scom_read,
+        .write  = wsp_scom_write
+};
+
+void scom_init_wsp(void)
+{
+        scom_init(&wsp_scom_controller);
+}
diff --git a/arch/powerpc/platforms/wsp/setup.c b/arch/powerpc/platforms/wsp/setup.c
new file mode 100644
index 000000000000..11ac2f05e01c
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/setup.c
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010 Michael Ellerman, IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/of_platform.h>
+
+#include "wsp.h"
+
+/*
+ * Find chip-id by walking up device tree looking for ibm,wsp-chip-id property.
+ * Won't work for nodes that are not a descendant of a wsp node.
+ */
+int wsp_get_chip_id(struct device_node *dn)
+{
+        const u32 *p;
+        int rc;
+
+        /* Start looking at the specified node, not its parent */
+        dn = of_node_get(dn);
+        while (dn && !(p = of_get_property(dn, "ibm,wsp-chip-id", NULL)))
+                dn = of_get_next_parent(dn);
+
+        if (!dn)
+                return -1;
+
+        rc = *p;
+        of_node_put(dn);
+
+        return rc;
+}
diff --git a/arch/powerpc/platforms/wsp/smp.c b/arch/powerpc/platforms/wsp/smp.c
new file mode 100644
index 000000000000..9d20fa9d3710
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/smp.c
@@ -0,0 +1,88 @@
+/*
+ *  SMP Support for A2 platforms
+ *
+ *  Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ *
+ */
+
+#include <linux/cpumask.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/smp.h>
+
+#include <asm/dbell.h>
+#include <asm/machdep.h>
+#include <asm/xics.h>
+
+#include "ics.h"
+#include "wsp.h"
+
+static void __devinit smp_a2_setup_cpu(int cpu)
+{
+        doorbell_setup_this_cpu();
+
+        if (cpu != boot_cpuid)
+                xics_setup_cpu();
+}
+
+int __devinit smp_a2_kick_cpu(int nr)
+{
+        const char *enable_method;
+        struct device_node *np;
+        int thr_idx;
+
+        if (nr < 0 || nr >= NR_CPUS)
+                return -ENOENT;
+
+        np = of_get_cpu_node(nr, &thr_idx);
+        if (!np)
+                return -ENODEV;
+
+        enable_method = of_get_property(np, "enable-method", NULL);
+        pr_devel("CPU%d has enable-method: \"%s\"\n", nr, enable_method);
+
+        if (!enable_method) {
+                printk(KERN_ERR "CPU%d has no enable-method\n", nr);
+                return -ENOENT;
+        } else if (strcmp(enable_method, "ibm,a2-scom") == 0) {
+                if (a2_scom_startup_cpu(nr, thr_idx, np))
+                        return -1;
+        } else {
+                printk(KERN_ERR "CPU%d: Don't understand enable-method \"%s\"\n",
+                       nr, enable_method);
+                return -EINVAL;
+        }
+
+        /*
+         * The processor is currently spinning, waiting for the
+         * cpu_start field to become non-zero After we set cpu_start,
+         * the processor will continue on to secondary_start
+         */
+        paca[nr].cpu_start = 1;
+
+        return 0;
+}
+
+static int __init smp_a2_probe(void)
+{
+        return cpus_weight(cpu_possible_map);
+}
+
+static struct smp_ops_t a2_smp_ops = {
+        .message_pass   = smp_muxed_ipi_message_pass,
+        .cause_ipi      = doorbell_cause_ipi,
+        .probe          = smp_a2_probe,
+        .kick_cpu       = smp_a2_kick_cpu,
+        .setup_cpu      = smp_a2_setup_cpu,
+};
+
+void __init a2_setup_smp(void)
+{
+        smp_ops = &a2_smp_ops;
+}
diff --git a/arch/powerpc/platforms/wsp/wsp.h b/arch/powerpc/platforms/wsp/wsp.h
new file mode 100644
index 000000000000..7c3e087fd2f2
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/wsp.h
@@ -0,0 +1,17 @@
+#ifndef __WSP_H
+#define __WSP_H
+
+#include <asm/wsp.h>
+
+extern void wsp_setup_pci(void);
+extern void scom_init_wsp(void);
+
+extern void a2_setup_smp(void);
+extern int a2_scom_startup_cpu(unsigned int lcpu, int thr_idx,
+                               struct device_node *np);
+int smp_a2_cpu_bootable(unsigned int nr);
+int __devinit smp_a2_kick_cpu(int nr);
+
+void opb_pic_init(void);
+
+#endif /*  __WSP_H */