Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (99 commits)
  drivers/virt: add missing linux/interrupt.h to fsl_hypervisor.c
  powerpc/85xx: fix mpic configuration in CAMP mode
  powerpc: Copy back TIF flags on return from softirq stack
  powerpc/64: Make server perfmon only built on ppc64 server devices
  powerpc/pseries: Fix hvc_vio.c build due to recent changes
  powerpc: Exporting boot_cpuid_phys
  powerpc: Add CFAR to oops output
  hvc_console: Add kdb support
  powerpc/pseries: Fix hvterm_raw_get_chars to accept < 16 chars, fixing xmon
  powerpc/irq: Quieten irq mapping printks
  powerpc: Enable lockup and hung task detectors in pseries and ppc64 defeconfigs
  powerpc: Add mpt2sas driver to pseries and ppc64 defconfig
  powerpc: Disable IRQs off tracer in ppc64 defconfig
  powerpc: Sync pseries and ppc64 defconfigs
  powerpc/pseries/hvconsole: Fix dropped console output
  hvc_console: Improve tty/console put_chars handling
  powerpc/kdump: Fix timeout in crash_kexec_wait_realmode
  powerpc/mm: Fix output of total_ram.
  powerpc/cpufreq: Add cpufreq driver for Momentum Maple boards
  powerpc: Correct annotations of pmu registration functions
  ...

Fix up trivial Kconfig/Makefile conflicts in arch/powerpc, drivers, and
drivers/cpufreq

30 files changed, 663 insertions, 370 deletions

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index b6976e1726e4..498534cd5265 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -67,6 +67,16 @@ config MPC85xx_RDB
         help
           This option enables support for the MPC85xx RDB (P2020 RDB) board
 
+config P1010_RDB
+        bool "Freescale P1010RDB"
+        select DEFAULT_UIMAGE
+        help
+          This option enables support for the MPC85xx RDB (P1010 RDB) board
+
+          P1010RDB contains P1010Si, which provides CPU performance up to 800
+          MHz and 1600 DMIPS, additional functionality and faster interfaces
+          (DDR3/3L, SATA II, and PCI  Express).
+
 config P1022_DS
         bool "Freescale P1022 DS"
         select DEFAULT_UIMAGE
@@ -75,6 +85,12 @@ config P1022_DS
         help
           This option enables support for the Freescale P1022DS reference board.
 
+config P1023_RDS
+        bool "Freescale P1023 RDS"
+        select DEFAULT_UIMAGE
+        help
+          This option enables support for the P1023 RDS board
+
 config SOCRATES
         bool "Socrates"
         select DEFAULT_UIMAGE
@@ -155,6 +171,18 @@ config SBC8560
         help
           This option enables support for the Wind River SBC8560 board
 
+config P2040_RDB
+        bool "Freescale P2040 RDB"
+        select DEFAULT_UIMAGE
+        select PPC_E500MC
+        select PHYS_64BIT
+        select SWIOTLB
+        select MPC8xxx_GPIO
+        select HAS_RAPIDIO
+        select PPC_EPAPR_HV_PIC
+        help
+          This option enables support for the P2040 RDB board
+
 config P3041_DS
         bool "Freescale P3041 DS"
         select DEFAULT_UIMAGE
@@ -163,6 +191,7 @@ config P3041_DS
         select SWIOTLB
         select MPC8xxx_GPIO
         select HAS_RAPIDIO
+        select PPC_EPAPR_HV_PIC
         help
           This option enables support for the P3041 DS board
 
@@ -174,6 +203,7 @@ config P4080_DS
         select SWIOTLB
         select MPC8xxx_GPIO
         select HAS_RAPIDIO
+        select PPC_EPAPR_HV_PIC
         help
           This option enables support for the P4080 DS board
 
@@ -188,6 +218,7 @@ config P5020_DS
         select SWIOTLB
         select MPC8xxx_GPIO
         select HAS_RAPIDIO
+        select PPC_EPAPR_HV_PIC
         help
           This option enables support for the P5020 DS board
 
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index dd70db77d63e..a971b32c5c0a 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -10,7 +10,10 @@ obj-$(CONFIG_MPC8536_DS)  += mpc8536_ds.o
 obj-$(CONFIG_MPC85xx_DS)  += mpc85xx_ds.o
 obj-$(CONFIG_MPC85xx_MDS) += mpc85xx_mds.o
 obj-$(CONFIG_MPC85xx_RDB) += mpc85xx_rdb.o
+obj-$(CONFIG_P1010_RDB)   += p1010rdb.o
 obj-$(CONFIG_P1022_DS)    += p1022_ds.o
+obj-$(CONFIG_P1023_RDS)   += p1023_rds.o
+obj-$(CONFIG_P2040_RDB)   += p2040_rdb.o corenet_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
diff --git a/arch/powerpc/platforms/85xx/corenet_ds.c b/arch/powerpc/platforms/85xx/corenet_ds.c
index 2ab338c9ac37..802ad110b757 100644
--- a/arch/powerpc/platforms/85xx/corenet_ds.c
+++ b/arch/powerpc/platforms/85xx/corenet_ds.c
@@ -3,7 +3,7 @@
  *
  * Maintained by Kumar Gala (see MAINTAINERS for contact information)
  *
- * Copyright 2009 Freescale Semiconductor Inc.
+ * Copyright 2009-2011 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
@@ -22,6 +22,7 @@
 #include <asm/time.h>
 #include <asm/machdep.h>
 #include <asm/pci-bridge.h>
+#include <asm/ppc-pci.h>
 #include <mm/mmu_decl.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
@@ -61,10 +62,6 @@ void __init corenet_ds_pic_init(void)
         mpic_init(mpic);
 }
 
-#ifdef CONFIG_PCI
-static int primary_phb_addr;
-#endif
-
 /*
  * Setup the architecture
  */
@@ -85,18 +82,19 @@ void __init corenet_ds_setup_arch(void)
 #endif
 
 #ifdef CONFIG_PCI
-        for_each_compatible_node(np, "pci", "fsl,p4080-pcie") {
-                struct resource rsrc;
-                of_address_to_resource(np, 0, &rsrc);
-                if ((rsrc.start & 0xfffff) == primary_phb_addr)
-                        fsl_add_bridge(np, 1);
-                else
+        for_each_node_by_type(np, "pci") {
+                if (of_device_is_compatible(np, "fsl,p4080-pcie") ||
+                    of_device_is_compatible(np, "fsl,qoriq-pcie-v2.2")) {
                         fsl_add_bridge(np, 0);
-
-                hose = pci_find_hose_for_OF_device(np);
-                max = min(max, hose->dma_window_base_cur +
-                                hose->dma_window_size);
+                        hose = pci_find_hose_for_OF_device(np);
+                        max = min(max, hose->dma_window_base_cur +
+                                        hose->dma_window_size);
+                }
         }
+
+#ifdef CONFIG_PPC64
+        pci_devs_phb_init();
+#endif
 #endif
 
 #ifdef CONFIG_SWIOTLB
@@ -116,6 +114,19 @@ static const struct of_device_id of_device_ids[] __devinitconst = {
         {
                 .compatible     = "fsl,rapidio-delta",
         },
+        {
+                .compatible     = "fsl,p4080-pcie",
+        },
+        {
+                .compatible     = "fsl,qoriq-pcie-v2.2",
+        },
+        /* The following two are for the Freescale hypervisor */
+        {
+                .name           = "hypervisor",
+        },
+        {
+                .name           = "handles",
+        },
         {}
 };
 
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index c7b97f70312e..1b9a8cf1873a 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -83,7 +83,8 @@ void __init mpc85xx_ds_pic_init(void)
         if (of_flat_dt_is_compatible(root, "fsl,MPC8572DS-CAMP")) {
                 mpic = mpic_alloc(np, r.start,
                         MPIC_PRIMARY |
-                        MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS,
+                        MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |
+                        MPIC_SINGLE_DEST_CPU,
                         0, 256, " OpenPIC  ");
         } else {
                 mpic = mpic_alloc(np, r.start,
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
index 088f30b0c088..f5ff9110c97e 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
@@ -58,10 +58,11 @@ void __init mpc85xx_rdb_pic_init(void)
                 return;
         }
 
-        if (of_flat_dt_is_compatible(root, "fsl,85XXRDB-CAMP")) {
+        if (of_flat_dt_is_compatible(root, "fsl,MPC85XXRDB-CAMP")) {
                 mpic = mpic_alloc(np, r.start,
                         MPIC_PRIMARY |
-                        MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS,
+                        MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |
+                        MPIC_SINGLE_DEST_CPU,
                         0, 256, " OpenPIC  ");
         } else {
                 mpic = mpic_alloc(np, r.start,
diff --git a/arch/powerpc/platforms/85xx/p1010rdb.c b/arch/powerpc/platforms/85xx/p1010rdb.c
new file mode 100644
index 000000000000..d7387fa7f534
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/p1010rdb.c
@@ -0,0 +1,122 @@
+/*
+ * P1010RDB Board Setup
+ *
+ * Copyright 2011 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/stddef.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/of_platform.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 <sysdev/fsl_soc.h>
+#include <sysdev/fsl_pci.h>
+
+void __init p1010_rdb_pic_init(void)
+{
+        struct mpic *mpic;
+        struct resource r;
+        struct device_node *np;
+
+        np = of_find_node_by_type(NULL, "open-pic");
+        if (np == NULL) {
+                printk(KERN_ERR "Could not find open-pic node\n");
+                return;
+        }
+
+        if (of_address_to_resource(np, 0, &r)) {
+                printk(KERN_ERR "Failed to map mpic register space\n");
+                of_node_put(np);
+                return;
+        }
+
+        mpic = mpic_alloc(np, r.start, MPIC_PRIMARY | MPIC_WANTS_RESET |
+          MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU,
+          0, 256, " OpenPIC  ");
+
+        BUG_ON(mpic == NULL);
+        of_node_put(np);
+
+        mpic_init(mpic);
+
+}
+
+
+/*
+ * Setup the architecture
+ */
+static void __init p1010_rdb_setup_arch(void)
+{
+#ifdef CONFIG_PCI
+        struct device_node *np;
+#endif
+
+        if (ppc_md.progress)
+                ppc_md.progress("p1010_rdb_setup_arch()", 0);
+
+#ifdef CONFIG_PCI
+        for_each_node_by_type(np, "pci") {
+                if (of_device_is_compatible(np, "fsl,p1010-pcie"))
+                        fsl_add_bridge(np, 0);
+        }
+
+#endif
+
+        printk(KERN_INFO "P1010 RDB board from Freescale Semiconductor\n");
+}
+
+static struct of_device_id __initdata p1010rdb_ids[] = {
+        { .type = "soc", },
+        { .compatible = "soc", },
+        { .compatible = "simple-bus", },
+        {},
+};
+
+static int __init p1010rdb_publish_devices(void)
+{
+        return of_platform_bus_probe(NULL, p1010rdb_ids, NULL);
+}
+machine_device_initcall(p1010_rdb, p1010rdb_publish_devices);
+machine_arch_initcall(p1010_rdb, swiotlb_setup_bus_notifier);
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init p1010_rdb_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (of_flat_dt_is_compatible(root, "fsl,P1010RDB"))
+                return 1;
+        return 0;
+}
+
+define_machine(p1010_rdb) {
+        .name                   = "P1010 RDB",
+        .probe                  = p1010_rdb_probe,
+        .setup_arch             = p1010_rdb_setup_arch,
+        .init_IRQ               = p1010_rdb_pic_init,
+#ifdef CONFIG_PCI
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
+        .get_irq                = mpic_get_irq,
+        .restart                = fsl_rstcr_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
index 7eb5c40c069f..266b3aadfe5e 100644
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -129,6 +129,7 @@ static void p1022ds_set_gamma_table(int monitor_port, char *gamma_table_base)
 static void p1022ds_set_monitor_port(int monitor_port)
 {
         struct device_node *pixis_node;
+        void __iomem *pixis;
         u8 __iomem *brdcfg1;
 
         pixis_node = of_find_compatible_node(NULL, NULL, "fsl,p1022ds-pixis");
@@ -137,12 +138,12 @@ static void p1022ds_set_monitor_port(int monitor_port)
                 return;
         }
 
-        brdcfg1 = of_iomap(pixis_node, 0);
-        if (!brdcfg1) {
+        pixis = of_iomap(pixis_node, 0);
+        if (!pixis) {
                 pr_err("p1022ds: could not map ngPIXIS registers\n");
                 return;
         }
-        brdcfg1 += 9;   /* BRDCFG1 is at offset 9 in the ngPIXIS */
+        brdcfg1 = pixis + 9;    /* BRDCFG1 is at offset 9 in the ngPIXIS */
 
         switch (monitor_port) {
         case 0: /* DVI */
@@ -158,6 +159,8 @@ static void p1022ds_set_monitor_port(int monitor_port)
         default:
                 pr_err("p1022ds: unsupported monitor port %i\n", monitor_port);
         }
+
+        iounmap(pixis);
 }
 
 /**
@@ -192,8 +195,13 @@ void p1022ds_set_pixel_clock(unsigned int pixclock)
         do_div(temp, pixclock);
         freq = temp;
 
-        /* pixclk is the ratio of the platform clock to the pixel clock */
+        /*
+         * 'pxclk' is the ratio of the platform clock to the pixel clock.
+         * This number is programmed into the CLKDVDR register, and the valid
+         * range of values is 2-255.
+         */
         pxclk = DIV_ROUND_CLOSEST(fsl_get_sys_freq(), freq);
+        pxclk = clamp_t(u32, pxclk, 2, 255);
 
         /* Disable the pixel clock, and set it to non-inverted and no delay */
         clrbits32(&guts->clkdvdr,
@@ -201,6 +209,8 @@ void p1022ds_set_pixel_clock(unsigned int pixclock)
 
         /* Enable the clock and set the pxclk */
         setbits32(&guts->clkdvdr, CLKDVDR_PXCKEN | (pxclk << 16));
+
+        iounmap(guts);
 }
 
 /**
diff --git a/arch/powerpc/platforms/85xx/p1023_rds.c b/arch/powerpc/platforms/85xx/p1023_rds.c
new file mode 100644
index 000000000000..835e0b335bfa
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/p1023_rds.c
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2010-2011 Freescale Semiconductor, Inc.
+ *
+ * Author: Roy Zang <tie-fei.zang@freescale.com>
+ *
+ * Description:
+ * P1023 RDS Board Setup
+ *
+ * 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/init.h>
+#include <linux/errno.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/module.h>
+#include <linux/fsl_devices.h>
+#include <linux/of_platform.h>
+#include <linux/of_device.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 <sysdev/fsl_soc.h>
+#include <sysdev/fsl_pci.h>
+
+/* ************************************************************************
+ *
+ * Setup the architecture
+ *
+ */
+#ifdef CONFIG_SMP
+void __init mpc85xx_smp_init(void);
+#endif
+
+static void __init mpc85xx_rds_setup_arch(void)
+{
+        struct device_node *np;
+
+        if (ppc_md.progress)
+                ppc_md.progress("p1023_rds_setup_arch()", 0);
+
+        /* Map BCSR area */
+        np = of_find_node_by_name(NULL, "bcsr");
+        if (np != NULL) {
+                static u8 __iomem *bcsr_regs;
+
+                bcsr_regs = of_iomap(np, 0);
+                of_node_put(np);
+
+                if (!bcsr_regs) {
+                        printk(KERN_ERR
+                               "BCSR: Failed to map bcsr register space\n");
+                        return;
+                } else {
+#define BCSR15_I2C_BUS0_SEG_CLR         0x07
+#define BCSR15_I2C_BUS0_SEG2            0x02
+/*
+ * Note: Accessing exclusively i2c devices.
+ *
+ * The i2c controller selects initially ID EEPROM in the u-boot;
+ * but if menu configuration selects RTC support in the kernel,
+ * the i2c controller switches to select RTC chip in the kernel.
+ */
+#ifdef CONFIG_RTC_CLASS
+                        /* Enable RTC chip on the segment #2 of i2c */
+                        clrbits8(&bcsr_regs[15], BCSR15_I2C_BUS0_SEG_CLR);
+                        setbits8(&bcsr_regs[15], BCSR15_I2C_BUS0_SEG2);
+#endif
+
+                        iounmap(bcsr_regs);
+                }
+        }
+
+#ifdef CONFIG_PCI
+        for_each_compatible_node(np, "pci", "fsl,p1023-pcie")
+                fsl_add_bridge(np, 0);
+#endif
+
+#ifdef CONFIG_SMP
+        mpc85xx_smp_init();
+#endif
+}
+
+static struct of_device_id p1023_ids[] = {
+        { .type = "soc", },
+        { .compatible = "soc", },
+        { .compatible = "simple-bus", },
+        {},
+};
+
+
+static int __init p1023_publish_devices(void)
+{
+        of_platform_bus_probe(NULL, p1023_ids, NULL);
+
+        return 0;
+}
+
+machine_device_initcall(p1023_rds, p1023_publish_devices);
+
+static void __init mpc85xx_rds_pic_init(void)
+{
+        struct mpic *mpic;
+        struct resource r;
+        struct device_node *np = NULL;
+
+        np = of_find_node_by_type(NULL, "open-pic");
+        if (!np) {
+                printk(KERN_ERR "Could not find open-pic node\n");
+                return;
+        }
+
+        if (of_address_to_resource(np, 0, &r)) {
+                printk(KERN_ERR "Failed to map mpic register space\n");
+                of_node_put(np);
+                return;
+        }
+
+        mpic = mpic_alloc(np, r.start,
+                MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |
+                MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU,
+                0, 256, " OpenPIC  ");
+
+        BUG_ON(mpic == NULL);
+        of_node_put(np);
+
+        mpic_init(mpic);
+}
+
+static int __init p1023_rds_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "fsl,P1023RDS");
+
+}
+
+define_machine(p1023_rds) {
+        .name                   = "P1023 RDS",
+        .probe                  = p1023_rds_probe,
+        .setup_arch             = mpc85xx_rds_setup_arch,
+        .init_IRQ               = mpc85xx_rds_pic_init,
+        .get_irq                = mpic_get_irq,
+        .restart                = fsl_rstcr_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+#ifdef CONFIG_PCI
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
+};
+
diff --git a/arch/powerpc/platforms/85xx/p2040_rdb.c b/arch/powerpc/platforms/85xx/p2040_rdb.c
new file mode 100644
index 000000000000..32b56ac73dfb
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/p2040_rdb.c
@@ -0,0 +1,88 @@
+/*
+ * P2040 RDB Setup
+ *
+ * Copyright 2011 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 <asm/ehv_pic.h>
+
+#include "corenet_ds.h"
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init p2040_rdb_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+#ifdef CONFIG_SMP
+        extern struct smp_ops_t smp_85xx_ops;
+#endif
+
+        if (of_flat_dt_is_compatible(root, "fsl,P2040RDB"))
+                return 1;
+
+        /* Check if we're running under the Freescale hypervisor */
+        if (of_flat_dt_is_compatible(root, "fsl,P2040RDB-hv")) {
+                ppc_md.init_IRQ = ehv_pic_init;
+                ppc_md.get_irq = ehv_pic_get_irq;
+                ppc_md.restart = fsl_hv_restart;
+                ppc_md.power_off = fsl_hv_halt;
+                ppc_md.halt = fsl_hv_halt;
+#ifdef CONFIG_SMP
+                /*
+                 * Disable the timebase sync operations because we can't write
+                 * to the timebase registers under the hypervisor.
+                  */
+                smp_85xx_ops.give_timebase = NULL;
+                smp_85xx_ops.take_timebase = NULL;
+#endif
+                return 1;
+        }
+
+        return 0;
+}
+
+define_machine(p2040_rdb) {
+        .name                   = "P2040 RDB",
+        .probe                  = p2040_rdb_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,
+        .power_save             = e500_idle,
+};
+
+machine_device_initcall(p2040_rdb, corenet_ds_publish_devices);
+
+#ifdef CONFIG_SWIOTLB
+machine_arch_initcall(p2040_rdb, swiotlb_setup_bus_notifier);
+#endif
diff --git a/arch/powerpc/platforms/85xx/p3041_ds.c b/arch/powerpc/platforms/85xx/p3041_ds.c
index 0ed52e18298c..96d99a374dcf 100644
--- a/arch/powerpc/platforms/85xx/p3041_ds.c
+++ b/arch/powerpc/platforms/85xx/p3041_ds.c
@@ -30,6 +30,7 @@
 #include <linux/of_platform.h>
 #include <sysdev/fsl_soc.h>
 #include <sysdev/fsl_pci.h>
+#include <asm/ehv_pic.h>
 
 #include "corenet_ds.h"
 
@@ -39,8 +40,32 @@
 static int __init p3041_ds_probe(void)
 {
         unsigned long root = of_get_flat_dt_root();
+#ifdef CONFIG_SMP
+        extern struct smp_ops_t smp_85xx_ops;
+#endif
+
+        if (of_flat_dt_is_compatible(root, "fsl,P3041DS"))
+                return 1;
+
+        /* Check if we're running under the Freescale hypervisor */
+        if (of_flat_dt_is_compatible(root, "fsl,P3041DS-hv")) {
+                ppc_md.init_IRQ = ehv_pic_init;
+                ppc_md.get_irq = ehv_pic_get_irq;
+                ppc_md.restart = fsl_hv_restart;
+                ppc_md.power_off = fsl_hv_halt;
+                ppc_md.halt = fsl_hv_halt;
+#ifdef CONFIG_SMP
+                /*
+                 * Disable the timebase sync operations because we can't write
+                 * to the timebase registers under the hypervisor.
+                  */
+                smp_85xx_ops.give_timebase = NULL;
+                smp_85xx_ops.take_timebase = NULL;
+#endif
+                return 1;
+        }
 
-        return of_flat_dt_is_compatible(root, "fsl,P3041DS");
+        return 0;
 }
 
 define_machine(p3041_ds) {
@@ -55,6 +80,7 @@ define_machine(p3041_ds) {
         .restart                = fsl_rstcr_restart,
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = udbg_progress,
+        .power_save             = e500_idle,
 };
 
 machine_device_initcall(p3041_ds, corenet_ds_publish_devices);
diff --git a/arch/powerpc/platforms/85xx/p4080_ds.c b/arch/powerpc/platforms/85xx/p4080_ds.c
index 84170460497b..d1b21d7663e3 100644
--- a/arch/powerpc/platforms/85xx/p4080_ds.c
+++ b/arch/powerpc/platforms/85xx/p4080_ds.c
@@ -29,31 +29,42 @@
 #include <linux/of_platform.h>
 #include <sysdev/fsl_soc.h>
 #include <sysdev/fsl_pci.h>
+#include <asm/ehv_pic.h>
 
 #include "corenet_ds.h"
 
-#ifdef CONFIG_PCI
-static int primary_phb_addr;
-#endif
-
 /*
  * Called very early, device-tree isn't unflattened
  */
 static int __init p4080_ds_probe(void)
 {
         unsigned long root = of_get_flat_dt_root();
+#ifdef CONFIG_SMP
+        extern struct smp_ops_t smp_85xx_ops;
+#endif
 
-        if (of_flat_dt_is_compatible(root, "fsl,P4080DS")) {
-#ifdef CONFIG_PCI
-                /* treat PCIe1 as primary,
-                 * shouldn't matter as we have no ISA on the board
-                 */
-                primary_phb_addr = 0x0000;
+        if (of_flat_dt_is_compatible(root, "fsl,P4080DS"))
+                return 1;
+
+        /* Check if we're running under the Freescale hypervisor */
+        if (of_flat_dt_is_compatible(root, "fsl,P4080DS-hv")) {
+                ppc_md.init_IRQ = ehv_pic_init;
+                ppc_md.get_irq = ehv_pic_get_irq;
+                ppc_md.restart = fsl_hv_restart;
+                ppc_md.power_off = fsl_hv_halt;
+                ppc_md.halt = fsl_hv_halt;
+#ifdef CONFIG_SMP
+                /*
+                 * Disable the timebase sync operations because we can't write
+                 * to the timebase registers under the hypervisor.
+                  */
+                smp_85xx_ops.give_timebase = NULL;
+                smp_85xx_ops.take_timebase = NULL;
 #endif
                 return 1;
-        } else {
-                return 0;
         }
+
+        return 0;
 }
 
 define_machine(p4080_ds) {
@@ -68,7 +79,10 @@ define_machine(p4080_ds) {
         .restart                = fsl_rstcr_restart,
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = udbg_progress,
+        .power_save             = e500_idle,
 };
 
 machine_device_initcall(p4080_ds, corenet_ds_publish_devices);
+#ifdef CONFIG_SWIOTLB
 machine_arch_initcall(p4080_ds, swiotlb_setup_bus_notifier);
+#endif
diff --git a/arch/powerpc/platforms/85xx/p5020_ds.c b/arch/powerpc/platforms/85xx/p5020_ds.c
index 7467b712ee00..e8cba5004fd8 100644
--- a/arch/powerpc/platforms/85xx/p5020_ds.c
+++ b/arch/powerpc/platforms/85xx/p5020_ds.c
@@ -30,6 +30,7 @@
 #include <linux/of_platform.h>
 #include <sysdev/fsl_soc.h>
 #include <sysdev/fsl_pci.h>
+#include <asm/ehv_pic.h>
 
 #include "corenet_ds.h"
 
@@ -39,8 +40,32 @@
 static int __init p5020_ds_probe(void)
 {
         unsigned long root = of_get_flat_dt_root();
+#ifdef CONFIG_SMP
+        extern struct smp_ops_t smp_85xx_ops;
+#endif
+
+        if (of_flat_dt_is_compatible(root, "fsl,P5020DS"))
+                return 1;
+
+        /* Check if we're running under the Freescale hypervisor */
+        if (of_flat_dt_is_compatible(root, "fsl,P5020DS-hv")) {
+                ppc_md.init_IRQ = ehv_pic_init;
+                ppc_md.get_irq = ehv_pic_get_irq;
+                ppc_md.restart = fsl_hv_restart;
+                ppc_md.power_off = fsl_hv_halt;
+                ppc_md.halt = fsl_hv_halt;
+#ifdef CONFIG_SMP
+                /*
+                 * Disable the timebase sync operations because we can't write
+                 * to the timebase registers under the hypervisor.
+                  */
+                smp_85xx_ops.give_timebase = NULL;
+                smp_85xx_ops.take_timebase = NULL;
+#endif
+                return 1;
+        }
 
-        return of_flat_dt_is_compatible(root, "fsl,P5020DS");
+        return 0;
 }
 
 define_machine(p5020_ds) {
@@ -60,6 +85,11 @@ define_machine(p5020_ds) {
         .restart                = fsl_rstcr_restart,
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = udbg_progress,
+#ifdef CONFIG_PPC64
+        .power_save             = book3e_idle,
+#else
+        .power_save             = e500_idle,
+#endif
 };
 
 machine_device_initcall(p5020_ds, corenet_ds_publish_devices);
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
index d6a93a10c0f5..5b9b901f6443 100644
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
@@ -2,7 +2,7 @@
  * Author: Andy Fleming <afleming@freescale.com>
  *         Kumar Gala <galak@kernel.crashing.org>
  *
- * Copyright 2006-2008 Freescale Semiconductor Inc.
+ * Copyright 2006-2008, 2011 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
@@ -111,14 +111,6 @@ smp_85xx_kick_cpu(int nr)
         return 0;
 }
 
-static void __init
-smp_85xx_setup_cpu(int cpu_nr)
-{
-        mpic_setup_this_cpu();
-        if (cpu_has_feature(CPU_FTR_DBELL))
-                doorbell_setup_this_cpu();
-}
-
 struct smp_ops_t smp_85xx_ops = {
         .kick_cpu = smp_85xx_kick_cpu,
 #ifdef CONFIG_KEXEC
@@ -224,24 +216,36 @@ static void mpc85xx_smp_machine_kexec(struct kimage *image)
 }
 #endif /* CONFIG_KEXEC */
 
+static void __init
+smp_85xx_setup_cpu(int cpu_nr)
+{
+        if (smp_85xx_ops.probe == smp_mpic_probe)
+                mpic_setup_this_cpu();
+
+        if (cpu_has_feature(CPU_FTR_DBELL))
+                doorbell_setup_this_cpu();
+}
+
 void __init mpc85xx_smp_init(void)
 {
         struct device_node *np;
 
+        smp_85xx_ops.setup_cpu = smp_85xx_setup_cpu;
+
         np = of_find_node_by_type(NULL, "open-pic");
         if (np) {
                 smp_85xx_ops.probe = smp_mpic_probe;
-                smp_85xx_ops.setup_cpu = smp_85xx_setup_cpu;
                 smp_85xx_ops.message_pass = smp_mpic_message_pass;
         }
 
         if (cpu_has_feature(CPU_FTR_DBELL)) {
-                smp_85xx_ops.message_pass = smp_muxed_ipi_message_pass;
+                /*
+                 * If left NULL, .message_pass defaults to
+                 * smp_muxed_ipi_message_pass
+                 */
                 smp_85xx_ops.cause_ipi = doorbell_cause_ipi;
         }
 
-        BUG_ON(!smp_85xx_ops.message_pass);
-
         smp_ops = &smp_85xx_ops;
 
 #ifdef CONFIG_KEXEC
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index a896511690c2..74e018ef724b 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -39,12 +39,19 @@
 #include <sysdev/fsl_pci.h>
 #include <sysdev/fsl_soc.h>
 #include <sysdev/simple_gpio.h>
+#include <asm/fsl_guts.h>
 
 #include "mpc86xx.h"
 
 static struct device_node *pixis_node;
 static unsigned char *pixis_bdcfg0, *pixis_arch;
 
+/* 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      0x001F0000
+
 #ifdef CONFIG_SUSPEND
 static irqreturn_t mpc8610_sw9_irq(int irq, void *data)
 {
@@ -205,72 +212,54 @@ void mpc8610hpcd_set_monitor_port(int monitor_port)
                              bdcfg[monitor_port]);
 }
 
+/**
+ * mpc8610hpcd_set_pixel_clock: program the DIU's clock
+ *
+ * @pixclock: the wavelength, in picoseconds, of the clock
+ */
 void mpc8610hpcd_set_pixel_clock(unsigned int pixclock)
 {
-        u32 __iomem *clkdvdr;
-        u32 temp;
-        /* variables for pixel clock calcs */
-        ulong  bestval, bestfreq, speed_ccb, minpixclock, maxpixclock;
-        ulong pixval;
-        long err;
-        int i;
-
-        clkdvdr = ioremap(get_immrbase() + 0xe0800, sizeof(u32));
-        if (!clkdvdr) {
-                printk(KERN_ERR "Err: can't map clock divider register!\n");
+        struct device_node *guts_np = NULL;
+        struct ccsr_guts_86xx __iomem *guts;
+        unsigned long freq;
+        u64 temp;
+        u32 pxclk;
+
+        /* Map the global utilities registers. */
+        guts_np = of_find_compatible_node(NULL, NULL, "fsl,mpc8610-guts");
+        if (!guts_np) {
+                pr_err("mpc8610hpcd: missing global utilties device node\n");
                 return;
         }
 
-        /* Pixel Clock configuration */
-        speed_ccb = fsl_get_sys_freq();
-
-        /* Calculate the pixel clock with the smallest error */
-        /* calculate the following in steps to avoid overflow */
-        pr_debug("DIU pixclock in ps - %d\n", pixclock);
-        temp = 1000000000/pixclock;
-        temp *= 1000;
-        pixclock = temp;
-        pr_debug("DIU pixclock freq - %u\n", pixclock);
-
-        temp = pixclock * 5 / 100;
-        pr_debug("deviation = %d\n", temp);
-        minpixclock = pixclock - temp;
-        maxpixclock = pixclock + temp;
-        pr_debug("DIU minpixclock - %lu\n", minpixclock);
-        pr_debug("DIU maxpixclock - %lu\n", maxpixclock);
-        pixval = speed_ccb/pixclock;
-        pr_debug("DIU pixval = %lu\n", pixval);
-
-        err = 100000000;
-        bestval = pixval;
-        pr_debug("DIU bestval = %lu\n", bestval);
-
-        bestfreq = 0;
-        for (i = -1; i <= 1; i++) {
-                temp = speed_ccb / ((pixval+i) + 1);
-                pr_debug("DIU test pixval i= %d, pixval=%lu, temp freq. = %u\n",
-                                                        i, pixval, temp);
-                if ((temp < minpixclock) || (temp > maxpixclock))
-                        pr_debug("DIU exceeds monitor range (%lu to %lu)\n",
-                                minpixclock, maxpixclock);
-                else if (abs(temp - pixclock) < err) {
-                  pr_debug("Entered the else if block %d\n", i);
-                        err = abs(temp - pixclock);
-                        bestval = pixval+i;
-                        bestfreq = temp;
-                }
+        guts = of_iomap(guts_np, 0);
+        of_node_put(guts_np);
+        if (!guts) {
+                pr_err("mpc8610hpcd: could not map global utilties device\n");
+                return;
         }
 
-        pr_debug("DIU chose = %lx\n", bestval);
-        pr_debug("DIU error = %ld\n NomPixClk ", err);
-        pr_debug("DIU: Best Freq = %lx\n", bestfreq);
-        /* Modify PXCLK in GUTS CLKDVDR */
-        pr_debug("DIU: Current value of CLKDVDR = 0x%08x\n", (*clkdvdr));
-        temp = (*clkdvdr) & 0x2000FFFF;
-        *clkdvdr = temp;                /* turn off clock */
-        *clkdvdr = temp | 0x80000000 | (((bestval) & 0x1F) << 16);
-        pr_debug("DIU: Modified value of CLKDVDR = 0x%08x\n", (*clkdvdr));
-        iounmap(clkdvdr);
+        /* Convert pixclock from a wavelength to a frequency */
+        temp = 1000000000000ULL;
+        do_div(temp, pixclock);
+        freq = temp;
+
+        /*
+         * 'pxclk' is the ratio of the platform clock to the pixel clock.
+         * On the MPC8610, the value programmed into CLKDVDR is the ratio
+         * minus one.  The valid range of values is 2-31.
+         */
+        pxclk = DIV_ROUND_CLOSEST(fsl_get_sys_freq(), freq) - 1;
+        pxclk = clamp_t(u32, pxclk, 2, 31);
+
+        /* 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));
+
+        iounmap(guts);
 }
 
 ssize_t mpc8610hpcd_show_monitor_port(int monitor_port, char *buf)
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index f970ca2b180c..d0af7fb2f344 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -78,6 +78,10 @@ config MPIC
         bool
         default n
 
+config PPC_EPAPR_HV_PIC
+        bool
+        default n
+
 config MPIC_WEIRD
         bool
         default n
@@ -266,7 +270,7 @@ config TAU_AVERAGE
 
 config QUICC_ENGINE
         bool "Freescale QUICC Engine (QE) Support"
-        depends on FSL_SOC
+        depends on FSL_SOC && PPC32
         select PPC_LIB_RHEAP
         select CRC32
         help
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 2165b65876f9..e06e39589a09 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -1,7 +1,6 @@
 config PPC64
         bool "64-bit kernel"
         default n
-        select PPC_HAVE_PMU_SUPPORT
         help
           This option selects whether a 32-bit or a 64-bit kernel
           will be built.
@@ -69,6 +68,7 @@ choice
 config PPC_BOOK3S_64
         bool "Server processors"
         select PPC_FPU
+        select PPC_HAVE_PMU_SUPPORT
 
 config PPC_BOOK3E_64
         bool "Embedded processors"
diff --git a/arch/powerpc/platforms/iseries/smp.c b/arch/powerpc/platforms/iseries/smp.c
index e3265adde5d3..2df48c2287bd 100644
--- a/arch/powerpc/platforms/iseries/smp.c
+++ b/arch/powerpc/platforms/iseries/smp.c
@@ -75,7 +75,7 @@ static void __devinit smp_iSeries_setup_cpu(int nr)
 }
 
 static struct smp_ops_t iSeries_smp_ops = {
-        .message_pass = smp_muxed_ipi_message_pass,
+        .message_pass = NULL,   /* Use smp_muxed_ipi_message_pass */
         .cause_ipi    = smp_iSeries_cause_ipi,
         .probe        = smp_iSeries_probe,
         .kick_cpu     = smp_iSeries_kick_cpu,
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index fe34c3d9bb74..5b3388b9f911 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -338,35 +338,16 @@ define_machine(maple) {
 #ifdef CONFIG_EDAC
 /*
  * Register a platform device for CPC925 memory controller on
- * Motorola ATCA-6101 blade.
+ * all boards with U3H (CPC925) bridge.
  */
-#define MAPLE_CPC925_MODEL      "Motorola,ATCA-6101"
 static int __init maple_cpc925_edac_setup(void)
 {
         struct platform_device *pdev;
         struct device_node *np = NULL;
         struct resource r;
-        const unsigned char *model;
         int ret;
-
-        np = of_find_node_by_path("/");
-        if (!np) {
-                printk(KERN_ERR "%s: Unable to get root node\n", __func__);
-                return -ENODEV;
-        }
-
-        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;
-        }
-
-        ret = strcmp(model, MAPLE_CPC925_MODEL);
-        of_node_put(np);
-
-        if (ret != 0)
-                return 0;
+        volatile void __iomem *mem;
+        u32 rev;
 
         np = of_find_node_by_type(NULL, "memory-controller");
         if (!np) {
@@ -384,6 +365,22 @@ static int __init maple_cpc925_edac_setup(void)
                 return -ENODEV;
         }
 
+        mem = ioremap(r.start, resource_size(&r));
+        if (!mem) {
+                printk(KERN_ERR "%s: Unable to map memory-controller memory\n",
+                                __func__);
+                return -ENOMEM;
+        }
+
+        rev = __raw_readl(mem);
+        iounmap(mem);
+
+        if (rev < 0x34 || rev > 0x3f) { /* U3H */
+                printk(KERN_ERR "%s: Non-CPC925(U3H) bridge revision: %02x\n",
+                        __func__, rev);
+                return 0;
+        }
+
         pdev = platform_device_register_simple("cpc925_edac", 0, &r, 1);
         if (IS_ERR(pdev))
                 return PTR_ERR(pdev);
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index aa45281bd296..a028f08309d6 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -355,9 +355,6 @@ static int initializing = 1;
 static int pmac_late_init(void)
 {
         initializing = 0;
-        /* this is udbg (which is __init) and we can later use it during
-         * cpu hotplug (in smp_core99_kick_cpu) */
-        ppc_md.progress = NULL;
         return 0;
 }
 machine_late_initcall(powermac, pmac_late_init);
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index db092d7c4c5b..d15fca322978 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -447,7 +447,7 @@ void __init smp_psurge_give_timebase(void)
 
 /* PowerSurge-style Macs */
 struct smp_ops_t psurge_smp_ops = {
-        .message_pass   = smp_muxed_ipi_message_pass,
+        .message_pass   = NULL, /* Use smp_muxed_ipi_message_pass */
         .cause_ipi      = smp_psurge_cause_ipi,
         .probe          = smp_psurge_probe,
         .kick_cpu       = smp_psurge_kick_cpu,
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index 57ceb92b2288..e9be25bc571b 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -262,12 +262,11 @@ int dlpar_attach_node(struct device_node *dn)
         if (!dn->parent)
                 return -ENOMEM;
 
-        rc = blocking_notifier_call_chain(&pSeries_reconfig_chain,
-                                          PSERIES_RECONFIG_ADD, dn);
-        if (rc == NOTIFY_BAD) {
+        rc = pSeries_reconfig_notify(PSERIES_RECONFIG_ADD, dn);
+        if (rc) {
                 printk(KERN_ERR "Failed to add device node %s\n",
                        dn->full_name);
-                return -ENOMEM; /* For now, safe to assume kmalloc failure */
+                return rc;
         }
 
         of_attach_node(dn);
@@ -297,8 +296,7 @@ int dlpar_detach_node(struct device_node *dn)
                 remove_proc_entry(dn->pde->name, parent->pde);
 #endif
 
-        blocking_notifier_call_chain(&pSeries_reconfig_chain,
-                            PSERIES_RECONFIG_REMOVE, dn);
+        pSeries_reconfig_notify(PSERIES_RECONFIG_REMOVE, dn);
         of_detach_node(dn);
         of_node_put(dn); /* Must decrement the refcount */
 
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index 46f13a3c5d09..bc0288501f17 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -330,21 +330,17 @@ static void pseries_remove_processor(struct device_node *np)
 static int pseries_smp_notifier(struct notifier_block *nb,
                                 unsigned long action, void *node)
 {
-        int err = NOTIFY_OK;
+        int err = 0;
 
         switch (action) {
         case PSERIES_RECONFIG_ADD:
-                if (pseries_add_processor(node))
-                        err = NOTIFY_BAD;
+                err = pseries_add_processor(node);
                 break;
         case PSERIES_RECONFIG_REMOVE:
                 pseries_remove_processor(node);
                 break;
-        default:
-                err = NOTIFY_DONE;
-                break;
         }
-        return err;
+        return notifier_from_errno(err);
 }
 
 static struct notifier_block pseries_smp_nb = {
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 9d6a8effeda2..11d8e0544ac0 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -205,27 +205,21 @@ static int pseries_drconf_memory(unsigned long *base, unsigned int action)
 static int pseries_memory_notifier(struct notifier_block *nb,
                                 unsigned long action, void *node)
 {
-        int err = NOTIFY_OK;
+        int err = 0;
 
         switch (action) {
         case PSERIES_RECONFIG_ADD:
-                if (pseries_add_memory(node))
-                        err = NOTIFY_BAD;
+                err = pseries_add_memory(node);
                 break;
         case PSERIES_RECONFIG_REMOVE:
-                if (pseries_remove_memory(node))
-                        err = NOTIFY_BAD;
+                err = pseries_remove_memory(node);
                 break;
         case PSERIES_DRCONF_MEM_ADD:
         case PSERIES_DRCONF_MEM_REMOVE:
-                if (pseries_drconf_memory(node, action))
-                        err = NOTIFY_BAD;
-                break;
-        default:
-                err = NOTIFY_DONE;
+                err = pseries_drconf_memory(node, action);
                 break;
         }
-        return err;
+        return notifier_from_errno(err);
 }
 
 static struct notifier_block pseries_mem_nb = {
diff --git a/arch/powerpc/platforms/pseries/hvconsole.c b/arch/powerpc/platforms/pseries/hvconsole.c
index 3f6a89b09816..041e87ca1893 100644
--- a/arch/powerpc/platforms/pseries/hvconsole.c
+++ b/arch/powerpc/platforms/pseries/hvconsole.c
@@ -73,7 +73,7 @@ int hvc_put_chars(uint32_t vtermno, const char *buf, int count)
         if (ret == H_SUCCESS)
                 return count;
         if (ret == H_BUSY)
-                return 0;
+                return -EAGAIN;
         return -EIO;
 }
 
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 39e6e0a7b2fa..f7205d344efd 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -52,197 +52,6 @@ EXPORT_SYMBOL(plpar_hcall_norets);
 
 extern void pSeries_find_serial_port(void);
 
-
-static int vtermno;     /* virtual terminal# for udbg  */
-
-#define __ALIGNED__ __attribute__((__aligned__(sizeof(long))))
-static void udbg_hvsi_putc(char c)
-{
-        /* packet's seqno isn't used anyways */
-        uint8_t packet[] __ALIGNED__ = { 0xff, 5, 0, 0, c };
-        int rc;
-
-        if (c == '\n')
-                udbg_hvsi_putc('\r');
-
-        do {
-                rc = plpar_put_term_char(vtermno, sizeof(packet), packet);
-        } while (rc == H_BUSY);
-}
-
-static long hvsi_udbg_buf_len;
-static uint8_t hvsi_udbg_buf[256];
-
-static int udbg_hvsi_getc_poll(void)
-{
-        unsigned char ch;
-        int rc, i;
-
-        if (hvsi_udbg_buf_len == 0) {
-                rc = plpar_get_term_char(vtermno, &hvsi_udbg_buf_len, hvsi_udbg_buf);
-                if (rc != H_SUCCESS || hvsi_udbg_buf[0] != 0xff) {
-                        /* bad read or non-data packet */
-                        hvsi_udbg_buf_len = 0;
-                } else {
-                        /* remove the packet header */
-                        for (i = 4; i < hvsi_udbg_buf_len; i++)
-                                hvsi_udbg_buf[i-4] = hvsi_udbg_buf[i];
-                        hvsi_udbg_buf_len -= 4;
-                }
-        }
-
-        if (hvsi_udbg_buf_len <= 0 || hvsi_udbg_buf_len > 256) {
-                /* no data ready */
-                hvsi_udbg_buf_len = 0;
-                return -1;
-        }
-
-        ch = hvsi_udbg_buf[0];
-        /* shift remaining data down */
-        for (i = 1; i < hvsi_udbg_buf_len; i++) {
-                hvsi_udbg_buf[i-1] = hvsi_udbg_buf[i];
-        }
-        hvsi_udbg_buf_len--;
-
-        return ch;
-}
-
-static int udbg_hvsi_getc(void)
-{
-        int ch;
-        for (;;) {
-                ch = udbg_hvsi_getc_poll();
-                if (ch == -1) {
-                        /* This shouldn't be needed...but... */
-                        volatile unsigned long delay;
-                        for (delay=0; delay < 2000000; delay++)
-                                ;
-                } else {
-                        return ch;
-                }
-        }
-}
-
-static void udbg_putcLP(char c)
-{
-        char buf[16];
-        unsigned long rc;
-
-        if (c == '\n')
-                udbg_putcLP('\r');
-
-        buf[0] = c;
-        do {
-                rc = plpar_put_term_char(vtermno, 1, buf);
-        } while(rc == H_BUSY);
-}
-
-/* Buffered chars getc */
-static long inbuflen;
-static long inbuf[2];   /* must be 2 longs */
-
-static int udbg_getc_pollLP(void)
-{
-        /* The interface is tricky because it may return up to 16 chars.
-         * We save them statically for future calls to udbg_getc().
-         */
-        char ch, *buf = (char *)inbuf;
-        int i;
-        long rc;
-        if (inbuflen == 0) {
-                /* get some more chars. */
-                inbuflen = 0;
-                rc = plpar_get_term_char(vtermno, &inbuflen, buf);
-                if (rc != H_SUCCESS)
-                        inbuflen = 0;   /* otherwise inbuflen is garbage */
-        }
-        if (inbuflen <= 0 || inbuflen > 16) {
-                /* Catch error case as well as other oddities (corruption) */
-                inbuflen = 0;
-                return -1;
-        }
-        ch = buf[0];
-        for (i = 1; i < inbuflen; i++)  /* shuffle them down. */
-                buf[i-1] = buf[i];
-        inbuflen--;
-        return ch;
-}
-
-static int udbg_getcLP(void)
-{
-        int ch;
-        for (;;) {
-                ch = udbg_getc_pollLP();
-                if (ch == -1) {
-                        /* This shouldn't be needed...but... */
-                        volatile unsigned long delay;
-                        for (delay=0; delay < 2000000; delay++)
-                                ;
-                } else {
-                        return ch;
-                }
-        }
-}
-
-/* call this from early_init() for a working debug console on
- * vterm capable LPAR machines
- */
-void __init udbg_init_debug_lpar(void)
-{
-        vtermno = 0;
-        udbg_putc = udbg_putcLP;
-        udbg_getc = udbg_getcLP;
-        udbg_getc_poll = udbg_getc_pollLP;
-
-        register_early_udbg_console();
-}
-
-/* returns 0 if couldn't find or use /chosen/stdout as console */
-void __init find_udbg_vterm(void)
-{
-        struct device_node *stdout_node;
-        const u32 *termno;
-        const char *name;
-
-        /* find the boot console from /chosen/stdout */
-        if (!of_chosen)
-                return;
-        name = of_get_property(of_chosen, "linux,stdout-path", NULL);
-        if (name == NULL)
-                return;
-        stdout_node = of_find_node_by_path(name);
-        if (!stdout_node)
-                return;
-        name = of_get_property(stdout_node, "name", NULL);
-        if (!name) {
-                printk(KERN_WARNING "stdout node missing 'name' property!\n");
-                goto out;
-        }
-
-        /* Check if it's a virtual terminal */
-        if (strncmp(name, "vty", 3) != 0)
-                goto out;
-        termno = of_get_property(stdout_node, "reg", NULL);
-        if (termno == NULL)
-                goto out;
-        vtermno = termno[0];
-
-        if (of_device_is_compatible(stdout_node, "hvterm1")) {
-                udbg_putc = udbg_putcLP;
-                udbg_getc = udbg_getcLP;
-                udbg_getc_poll = udbg_getc_pollLP;
-                add_preferred_console("hvc", termno[0] & 0xff, NULL);
-        } else if (of_device_is_compatible(stdout_node, "hvterm-protocol")) {
-                vtermno = termno[0];
-                udbg_putc = udbg_hvsi_putc;
-                udbg_getc = udbg_hvsi_getc;
-                udbg_getc_poll = udbg_hvsi_getc_poll;
-                add_preferred_console("hvsi", termno[0] & 0xff, NULL);
-        }
-out:
-        of_node_put(stdout_node);
-}
-
 void vpa_init(int cpu)
 {
         int hwcpu = get_hard_smp_processor_id(cpu);
diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h
index e9f6d2859c3c..24c7162f11d9 100644
--- a/arch/powerpc/platforms/pseries/pseries.h
+++ b/arch/powerpc/platforms/pseries/pseries.h
@@ -47,7 +47,8 @@ extern void pSeries_final_fixup(void);
 /* Poweron flag used for enabling auto ups restart */
 extern unsigned long rtas_poweron_auto;
 
-extern void find_udbg_vterm(void);
+/* Provided by HVC VIO */
+extern void hvc_vio_init_early(void);
 
 /* Dynamic logical Partitioning/Mobility */
 extern void dlpar_free_cc_nodes(struct device_node *);
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index 1de2cbb92303..168651acdd83 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -97,7 +97,7 @@ static struct device_node *derive_parent(const char *path)
         return parent;
 }
 
-BLOCKING_NOTIFIER_HEAD(pSeries_reconfig_chain);
+static BLOCKING_NOTIFIER_HEAD(pSeries_reconfig_chain);
 
 int pSeries_reconfig_notifier_register(struct notifier_block *nb)
 {
@@ -109,6 +109,14 @@ void pSeries_reconfig_notifier_unregister(struct notifier_block *nb)
         blocking_notifier_chain_unregister(&pSeries_reconfig_chain, nb);
 }
 
+int pSeries_reconfig_notify(unsigned long action, void *p)
+{
+        int err = blocking_notifier_call_chain(&pSeries_reconfig_chain,
+                                                action, p);
+
+        return notifier_to_errno(err);
+}
+
 static int pSeries_reconfig_add_node(const char *path, struct property *proplist)
 {
         struct device_node *np;
@@ -132,11 +140,9 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist
                 goto out_err;
         }
 
-        err = blocking_notifier_call_chain(&pSeries_reconfig_chain,
-                                  PSERIES_RECONFIG_ADD, np);
-        if (err == NOTIFY_BAD) {
+        err = pSeries_reconfig_notify(PSERIES_RECONFIG_ADD, np);
+        if (err) {
                 printk(KERN_ERR "Failed to add device node %s\n", path);
-                err = -ENOMEM; /* For now, safe to assume kmalloc failure */
                 goto out_err;
         }
 
@@ -173,8 +179,7 @@ static int pSeries_reconfig_remove_node(struct device_node *np)
 
         remove_node_proc_entries(np);
 
-        blocking_notifier_call_chain(&pSeries_reconfig_chain,
-                            PSERIES_RECONFIG_REMOVE, np);
+        pSeries_reconfig_notify(PSERIES_RECONFIG_REMOVE, np);
         of_detach_node(np);
 
         of_node_put(parent);
@@ -472,11 +477,10 @@ static int do_update_property(char *buf, size_t bufsize)
                 else
                         action = PSERIES_DRCONF_MEM_REMOVE;
 
-                rc = blocking_notifier_call_chain(&pSeries_reconfig_chain,
-                                                  action, value);
-                if (rc == NOTIFY_BAD) {
-                        rc = prom_update_property(np, oldprop, newprop);
-                        return -ENOMEM;
+                rc = pSeries_reconfig_notify(action, value);
+                if (rc) {
+                        prom_update_property(np, oldprop, newprop);
+                        return rc;
                 }
         }
 
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 593acceeff96..d00e52926b71 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -512,9 +512,10 @@ static void __init pSeries_init_early(void)
 {
         pr_debug(" -> pSeries_init_early()\n");
 
+#ifdef CONFIG_HVC_CONSOLE
         if (firmware_has_feature(FW_FEATURE_LPAR))
-                find_udbg_vterm();
-
+                hvc_vio_init_early();
+#endif
         if (firmware_has_feature(FW_FEATURE_DABR))
                 ppc_md.set_dabr = pseries_set_dabr;
         else if (firmware_has_feature(FW_FEATURE_XDABR))
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index cd70be5ff27e..1672db2d1b0e 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -206,7 +206,7 @@ static struct smp_ops_t pSeries_mpic_smp_ops = {
 };
 
 static struct smp_ops_t pSeries_xics_smp_ops = {
-        .message_pass   = smp_muxed_ipi_message_pass,
+        .message_pass   = NULL, /* Use 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,
diff --git a/arch/powerpc/platforms/wsp/smp.c b/arch/powerpc/platforms/wsp/smp.c
index 9d20fa9d3710..71bd105f3863 100644
--- a/arch/powerpc/platforms/wsp/smp.c
+++ b/arch/powerpc/platforms/wsp/smp.c
@@ -75,7 +75,7 @@ static int __init smp_a2_probe(void)
 }
 
 static struct smp_ops_t a2_smp_ops = {
-        .message_pass   = smp_muxed_ipi_message_pass,
+        .message_pass   = NULL, /* Use smp_muxed_ipi_message_pass */
         .cause_ipi      = doorbell_cause_ipi,
         .probe          = smp_a2_probe,
         .kick_cpu       = smp_a2_kick_cpu,