53 files changed, 367 insertions, 279 deletions

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 82f2da28cd27..d2ac1c116454 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -220,7 +220,6 @@ config AKEBONO
         select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD
         select MMC_SDHCI
         select MMC_SDHCI_PLTFM
-        select MMC_SDHCI_OF_476GTR
         select ATA
         select SATA_AHCI_PLATFORM
         help
diff --git a/arch/powerpc/platforms/44x/ppc476.c b/arch/powerpc/platforms/44x/ppc476.c
index 58db9d083969..c11ce6516c8f 100644
--- a/arch/powerpc/platforms/44x/ppc476.c
+++ b/arch/powerpc/platforms/44x/ppc476.c
@@ -94,7 +94,7 @@ static int avr_probe(struct i2c_client *client,
 {
         avr_i2c_client = client;
         ppc_md.restart = avr_reset_system;
-        ppc_md.power_off = avr_power_off_system;
+        pm_power_off = avr_power_off_system;
         return 0;
 }
 
diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c
index e996e007bc44..711f3d352af7 100644
--- a/arch/powerpc/platforms/512x/mpc512x_shared.c
+++ b/arch/powerpc/platforms/512x/mpc512x_shared.c
@@ -18,7 +18,7 @@
 #include <linux/irq.h>
 #include <linux/of_platform.h>
 #include <linux/fsl-diu-fb.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
 #include <sysdev/fsl_soc.h>
 
 #include <asm/cacheflush.h>
@@ -297,14 +297,13 @@ static void __init mpc512x_setup_diu(void)
          * and so negatively affect boot time. Instead we reserve the
          * already configured frame buffer area so that it won't be
          * destroyed. The starting address of the area to reserve and
-         * also it's length is passed to reserve_bootmem(). It will be
+         * also it's length is passed to memblock_reserve(). It will be
          * freed later on first open of fbdev, when splash image is not
          * needed any more.
          */
         if (diu_shared_fb.in_use) {
-                ret = reserve_bootmem(diu_shared_fb.fb_phys,
-                                      diu_shared_fb.fb_len,
-                                      BOOTMEM_EXCLUSIVE);
+                ret = memblock_reserve(diu_shared_fb.fb_phys,
+                                       diu_shared_fb.fb_len);
                 if (ret) {
                         pr_err("%s: reserve bootmem failed\n", __func__);
                         diu_shared_fb.in_use = false;
diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c
index 3feffde9128d..6af651e69129 100644
--- a/arch/powerpc/platforms/52xx/efika.c
+++ b/arch/powerpc/platforms/52xx/efika.c
@@ -212,6 +212,8 @@ static int __init efika_probe(void)
         DMA_MODE_READ = 0x44;
         DMA_MODE_WRITE = 0x48;
 
+        pm_power_off = rtas_power_off;
+
         return 1;
 }
 
@@ -225,7 +227,6 @@ define_machine(efika)
         .init_IRQ               = mpc52xx_init_irq,
         .get_irq                = mpc52xx_get_irq,
         .restart                = rtas_restart,
-        .power_off              = rtas_power_off,
         .halt                   = rtas_halt,
         .set_rtc_time           = rtas_set_rtc_time,
         .get_rtc_time           = rtas_get_rtc_time,
diff --git a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
index 463fa91ee5b6..15e8021ddef9 100644
--- a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
+++ b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
@@ -167,10 +167,10 @@ static int mcu_probe(struct i2c_client *client, const struct i2c_device_id *id)
         if (ret)
                 goto err;
 
-        /* XXX: this is potentially racy, but there is no lock for ppc_md */
-        if (!ppc_md.power_off) {
+        /* XXX: this is potentially racy, but there is no lock for pm_power_off */
+        if (!pm_power_off) {
                 glob_mcu = mcu;
-                ppc_md.power_off = mcu_power_off;
+                pm_power_off = mcu_power_off;
                 dev_info(&client->dev, "will provide power-off service\n");
         }
 
@@ -197,7 +197,7 @@ static int mcu_remove(struct i2c_client *client)
         device_remove_file(&client->dev, &dev_attr_status);
 
         if (glob_mcu == mcu) {
-                ppc_md.power_off = NULL;
+                pm_power_off = NULL;
                 glob_mcu = NULL;
         }
 
diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c
index e56b89a792ed..1f309ccb096e 100644
--- a/arch/powerpc/platforms/85xx/corenet_generic.c
+++ b/arch/powerpc/platforms/85xx/corenet_generic.c
@@ -170,7 +170,7 @@ static int __init corenet_generic_probe(void)
 
                         ppc_md.get_irq = ehv_pic_get_irq;
                         ppc_md.restart = fsl_hv_restart;
-                        ppc_md.power_off = fsl_hv_halt;
+                        pm_power_off = fsl_hv_halt;
                         ppc_md.halt = fsl_hv_halt;
 #ifdef CONFIG_SMP
                         /*
diff --git a/arch/powerpc/platforms/85xx/sgy_cts1000.c b/arch/powerpc/platforms/85xx/sgy_cts1000.c
index 8162b0412117..e149c9ec26ae 100644
--- a/arch/powerpc/platforms/85xx/sgy_cts1000.c
+++ b/arch/powerpc/platforms/85xx/sgy_cts1000.c
@@ -120,7 +120,7 @@ static int gpio_halt_probe(struct platform_device *pdev)
 
         /* Register our halt function */
         ppc_md.halt = gpio_halt_cb;
-        ppc_md.power_off = gpio_halt_cb;
+        pm_power_off = gpio_halt_cb;
 
         printk(KERN_INFO "gpio-halt: registered GPIO %d (%d trigger, %d"
                " irq).\n", gpio, trigger, irq);
@@ -137,7 +137,7 @@ static int gpio_halt_remove(struct platform_device *pdev)
                 free_irq(irq, halt_node);
 
                 ppc_md.halt = NULL;
-                ppc_md.power_off = NULL;
+                pm_power_off = NULL;
 
                 gpio_free(gpio);
 
diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig
index bd6f1a1cf922..157250426b56 100644
--- a/arch/powerpc/platforms/8xx/Kconfig
+++ b/arch/powerpc/platforms/8xx/Kconfig
@@ -1,6 +1,3 @@
-config FADS
-        bool
-
 config CPM1
         bool
         select CPM
@@ -13,7 +10,6 @@ choice
 
 config MPC8XXFADS
         bool "FADS"
-        select FADS
 
 config MPC86XADS
         bool "MPC86XADS"
diff --git a/arch/powerpc/platforms/cell/beat_htab.c b/arch/powerpc/platforms/cell/beat_htab.c
index d4d245c0d787..bee9232fe619 100644
--- a/arch/powerpc/platforms/cell/beat_htab.c
+++ b/arch/powerpc/platforms/cell/beat_htab.c
@@ -186,7 +186,7 @@ static long beat_lpar_hpte_updatepp(unsigned long slot,
                                     unsigned long newpp,
                                     unsigned long vpn,
                                     int psize, int apsize,
-                                    int ssize, int local)
+                                    int ssize, unsigned long flags)
 {
         unsigned long lpar_rc;
         u64 dummy0, dummy1;
@@ -369,7 +369,7 @@ static long beat_lpar_hpte_updatepp_v3(unsigned long slot,
                                        unsigned long newpp,
                                        unsigned long vpn,
                                        int psize, int apsize,
-                                       int ssize, int local)
+                                       int ssize, unsigned long flags)
 {
         unsigned long lpar_rc;
         unsigned long want_v;
diff --git a/arch/powerpc/platforms/cell/celleb_pci.c b/arch/powerpc/platforms/cell/celleb_pci.c
index 2b98a36ef8fb..3ce70ded2d6a 100644
--- a/arch/powerpc/platforms/cell/celleb_pci.c
+++ b/arch/powerpc/platforms/cell/celleb_pci.c
@@ -29,7 +29,7 @@
 #include <linux/pci.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
 #include <linux/pci_regs.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
@@ -401,11 +401,11 @@ error:
         } else {
                 if (config && *config) {
                         size = 256;
-                        free_bootmem(__pa(*config), size);
+                        memblock_free(__pa(*config), size);
                 }
                 if (res && *res) {
                         size = sizeof(struct celleb_pci_resource);
-                        free_bootmem(__pa(*res), size);
+                        memblock_free(__pa(*res), size);
                 }
         }
 
diff --git a/arch/powerpc/platforms/cell/celleb_scc_epci.c b/arch/powerpc/platforms/cell/celleb_scc_epci.c
index 844c0facb4f7..9438bbed402f 100644
--- a/arch/powerpc/platforms/cell/celleb_scc_epci.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_epci.c
@@ -25,7 +25,6 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/pci_regs.h>
-#include <linux/bootmem.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
index 4278acfa2ede..f22387598040 100644
--- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
@@ -25,7 +25,6 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-#include <linux/bootmem.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 
diff --git a/arch/powerpc/platforms/cell/celleb_setup.c b/arch/powerpc/platforms/cell/celleb_setup.c
index 34e8ce2976aa..90be8ec51686 100644
--- a/arch/powerpc/platforms/cell/celleb_setup.c
+++ b/arch/powerpc/platforms/cell/celleb_setup.c
@@ -142,6 +142,7 @@ static int __init celleb_probe_beat(void)
         powerpc_firmware_features |= FW_FEATURE_CELLEB_ALWAYS
                 | FW_FEATURE_BEAT | FW_FEATURE_LPAR;
         hpte_init_beat_v3();
+        pm_power_off = beat_power_off;
 
         return 1;
 }
@@ -190,6 +191,7 @@ static int __init celleb_probe_native(void)
 
         powerpc_firmware_features |= FW_FEATURE_CELLEB_ALWAYS;
         hpte_init_native();
+        pm_power_off = rtas_power_off;
 
         return 1;
 }
@@ -204,7 +206,6 @@ define_machine(celleb_beat) {
         .setup_arch             = celleb_setup_arch_beat,
         .show_cpuinfo           = celleb_show_cpuinfo,
         .restart                = beat_restart,
-        .power_off              = beat_power_off,
         .halt                   = beat_halt,
         .get_rtc_time           = beat_get_rtc_time,
         .set_rtc_time           = beat_set_rtc_time,
@@ -230,7 +231,6 @@ define_machine(celleb_native) {
         .setup_arch             = celleb_setup_arch_native,
         .show_cpuinfo           = celleb_show_cpuinfo,
         .restart                = rtas_restart,
-        .power_off              = rtas_power_off,
         .halt                   = rtas_halt,
         .get_boot_time          = rtas_get_boot_time,
         .get_rtc_time           = rtas_get_rtc_time,
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index 8a106b4172e0..4c11421847be 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -82,7 +82,7 @@ static void iic_unmask(struct irq_data *d)
 
 static void iic_eoi(struct irq_data *d)
 {
-        struct iic *iic = &__get_cpu_var(cpu_iic);
+        struct iic *iic = this_cpu_ptr(&cpu_iic);
         out_be64(&iic->regs->prio, iic->eoi_stack[--iic->eoi_ptr]);
         BUG_ON(iic->eoi_ptr < 0);
 }
@@ -148,7 +148,7 @@ static unsigned int iic_get_irq(void)
         struct iic *iic;
         unsigned int virq;
 
-        iic = &__get_cpu_var(cpu_iic);
+        iic = this_cpu_ptr(&cpu_iic);
         *(unsigned long *) &pending =
                 in_be64((u64 __iomem *) &iic->regs->pending_destr);
         if (!(pending.flags & CBE_IIC_IRQ_VALID))
@@ -163,7 +163,7 @@ static unsigned int iic_get_irq(void)
 
 void iic_setup_cpu(void)
 {
-        out_be64(&__get_cpu_var(cpu_iic).regs->prio, 0xff);
+        out_be64(this_cpu_ptr(&cpu_iic.regs->prio), 0xff);
 }
 
 u8 iic_get_target_id(int cpu)
diff --git a/arch/powerpc/platforms/cell/qpace_setup.c b/arch/powerpc/platforms/cell/qpace_setup.c
index 6e3409d590ac..d328140dc6f5 100644
--- a/arch/powerpc/platforms/cell/qpace_setup.c
+++ b/arch/powerpc/platforms/cell/qpace_setup.c
@@ -127,6 +127,7 @@ static int __init qpace_probe(void)
                 return 0;
 
         hpte_init_native();
+        pm_power_off = rtas_power_off;
 
         return 1;
 }
@@ -137,7 +138,6 @@ define_machine(qpace) {
         .setup_arch             = qpace_setup_arch,
         .show_cpuinfo           = qpace_show_cpuinfo,
         .restart                = rtas_restart,
-        .power_off              = rtas_power_off,
         .halt                   = rtas_halt,
         .get_boot_time          = rtas_get_boot_time,
         .get_rtc_time           = rtas_get_rtc_time,
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index 6ae25fb62015..d62aa982d530 100644
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -259,6 +259,7 @@ static int __init cell_probe(void)
                 return 0;
 
         hpte_init_native();
+        pm_power_off = rtas_power_off;
 
         return 1;
 }
@@ -269,7 +270,6 @@ define_machine(cell) {
         .setup_arch             = cell_setup_arch,
         .show_cpuinfo           = cell_show_cpuinfo,
         .restart                = rtas_restart,
-        .power_off              = rtas_power_off,
         .halt                   = rtas_halt,
         .get_boot_time          = rtas_get_boot_time,
         .get_rtc_time           = rtas_get_rtc_time,
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index ffcbd242e669..f7af74f83693 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -181,7 +181,8 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea)
         return 0;
 }
 
-extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); //XXX
+extern int hash_page(unsigned long ea, unsigned long access,
+                     unsigned long trap, unsigned long dsisr); //XXX
 static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr)
 {
         int ret;
@@ -196,7 +197,7 @@ static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr)
             (REGION_ID(ea) != USER_REGION_ID)) {
 
                 spin_unlock(&spu->register_lock);
-                ret = hash_page(ea, _PAGE_PRESENT, 0x300);
+                ret = hash_page(ea, _PAGE_PRESENT, 0x300, dsisr);
                 spin_lock(&spu->register_lock);
 
                 if (!ret) {
diff --git a/arch/powerpc/platforms/cell/spufs/fault.c b/arch/powerpc/platforms/cell/spufs/fault.c
index e45894a08118..d98f845ac777 100644
--- a/arch/powerpc/platforms/cell/spufs/fault.c
+++ b/arch/powerpc/platforms/cell/spufs/fault.c
@@ -144,7 +144,7 @@ int spufs_handle_class1(struct spu_context *ctx)
         access = (_PAGE_PRESENT | _PAGE_USER);
         access |= (dsisr & MFC_DSISR_ACCESS_PUT) ? _PAGE_RW : 0UL;
         local_irq_save(flags);
-        ret = hash_page(ea, access, 0x300);
+        ret = hash_page(ea, access, 0x300, dsisr);
         local_irq_restore(flags);
 
         /* hashing failed, so try the actual fault handler */
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 5b77b1919fd2..860a59eb8ea2 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -585,6 +585,8 @@ static int __init chrp_probe(void)
         DMA_MODE_READ = 0x44;
         DMA_MODE_WRITE = 0x48;
 
+        pm_power_off = rtas_power_off;
+
         return 1;
 }
 
@@ -597,7 +599,6 @@ define_machine(chrp) {
         .show_cpuinfo           = chrp_show_cpuinfo,
         .init_IRQ               = chrp_init_IRQ,
         .restart                = rtas_restart,
-        .power_off              = rtas_power_off,
         .halt                   = rtas_halt,
         .time_init              = chrp_time_init,
         .set_rtc_time           = chrp_set_rtc_time,
diff --git a/arch/powerpc/platforms/embedded6xx/gamecube.c b/arch/powerpc/platforms/embedded6xx/gamecube.c
index bd4ba5d7d568..fe0ed6ee285e 100644
--- a/arch/powerpc/platforms/embedded6xx/gamecube.c
+++ b/arch/powerpc/platforms/embedded6xx/gamecube.c
@@ -67,6 +67,8 @@ static int __init gamecube_probe(void)
         if (!of_flat_dt_is_compatible(dt_root, "nintendo,gamecube"))
                 return 0;
 
+        pm_power_off = gamecube_power_off;
+
         return 1;
 }
 
@@ -80,7 +82,6 @@ define_machine(gamecube) {
         .probe                  = gamecube_probe,
         .init_early             = gamecube_init_early,
         .restart                = gamecube_restart,
-        .power_off              = gamecube_power_off,
         .halt                   = gamecube_halt,
         .init_IRQ               = flipper_pic_probe,
         .get_irq                = flipper_pic_get_irq,
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
index 168e1d80b2e5..540eeb58d3f0 100644
--- a/arch/powerpc/platforms/embedded6xx/linkstation.c
+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c
@@ -147,6 +147,9 @@ static int __init linkstation_probe(void)
 
         if (!of_flat_dt_is_compatible(root, "linkstation"))
                 return 0;
+
+        pm_power_off = linkstation_power_off;
+
         return 1;
 }
 
@@ -158,7 +161,6 @@ define_machine(linkstation){
         .show_cpuinfo           = linkstation_show_cpuinfo,
         .get_irq                = mpic_get_irq,
         .restart                = linkstation_restart,
-        .power_off              = linkstation_power_off,
         .halt                   = linkstation_halt,
         .calibrate_decr         = generic_calibrate_decr,
 };
diff --git a/arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c b/arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c
index 20a8ed91962e..7feb325b636b 100644
--- a/arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c
+++ b/arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c
@@ -247,7 +247,7 @@ void __init ug_udbg_init(void)
         np = of_find_compatible_node(NULL, NULL, "nintendo,flipper-exi");
         if (!np) {
                 udbg_printf("%s: EXI node not found\n", __func__);
-                goto done;
+                goto out;
         }
 
         exi_io_base = ug_udbg_setup_exi_io_base(np);
@@ -267,8 +267,8 @@ void __init ug_udbg_init(void)
         }
 
 done:
-        if (np)
-                of_node_put(np);
+        of_node_put(np);
+out:
         return;
 }
 
diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c
index 388e29bab8f6..352592d3e44e 100644
--- a/arch/powerpc/platforms/embedded6xx/wii.c
+++ b/arch/powerpc/platforms/embedded6xx/wii.c
@@ -211,6 +211,8 @@ static int __init wii_probe(void)
         if (!of_flat_dt_is_compatible(dt_root, "nintendo,wii"))
                 return 0;
 
+        pm_power_off = wii_power_off;
+
         return 1;
 }
 
@@ -226,7 +228,6 @@ define_machine(wii) {
         .init_early             = wii_init_early,
         .setup_arch             = wii_setup_arch,
         .restart                = wii_restart,
-        .power_off              = wii_power_off,
         .halt                   = wii_halt,
         .init_IRQ               = wii_pic_probe,
         .get_irq                = flipper_pic_get_irq,
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index f7136aae8bbf..d3a13067ec42 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -15,7 +15,6 @@
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/bootmem.h>
 #include <linux/irq.h>
 
 #include <asm/sections.h>
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index cb1b0b35a0c6..56b85cd61aaf 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -169,7 +169,7 @@ static void __init maple_use_rtas_reboot_and_halt_if_present(void)
         if (rtas_service_present("system-reboot") &&
             rtas_service_present("power-off")) {
                 ppc_md.restart = rtas_restart;
-                ppc_md.power_off = rtas_power_off;
+                pm_power_off = rtas_power_off;
                 ppc_md.halt = rtas_halt;
         }
 }
@@ -312,6 +312,7 @@ static int __init maple_probe(void)
         alloc_dart_table();
 
         hpte_init_native();
+        pm_power_off = maple_power_off;
 
         return 1;
 }
@@ -325,7 +326,6 @@ define_machine(maple) {
         .pci_irq_fixup          = maple_pci_irq_fixup,
         .pci_get_legacy_ide_irq = maple_pci_get_legacy_ide_irq,
         .restart                = maple_restart,
-        .power_off              = maple_power_off,
         .halt                   = maple_halt,
         .get_boot_time          = maple_get_boot_time,
         .set_rtc_time           = maple_set_rtc_time,
diff --git a/arch/powerpc/platforms/powermac/nvram.c b/arch/powerpc/platforms/powermac/nvram.c
index 014d06e6d46b..60b03a1703d1 100644
--- a/arch/powerpc/platforms/powermac/nvram.c
+++ b/arch/powerpc/platforms/powermac/nvram.c
@@ -513,11 +513,7 @@ static int __init core99_nvram_setup(struct device_node *dp, unsigned long addr)
                 printk(KERN_ERR "nvram: no address\n");
                 return -EINVAL;
         }
-        nvram_image = alloc_bootmem(NVRAM_SIZE);
-        if (nvram_image == NULL) {
-                printk(KERN_ERR "nvram: can't allocate ram image\n");
-                return -ENOMEM;
-        }
+        nvram_image = memblock_virt_alloc(NVRAM_SIZE, 0);
         nvram_data = ioremap(addr, NVRAM_SIZE*2);
         nvram_naddrs = 1; /* Make sure we get the correct case */
 
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 7e868ccf3b0d..04702db35d45 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -15,7 +15,6 @@
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/bootmem.h>
 #include <linux/irq.h>
 #include <linux/of_pci.h>
 
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index b127a29ac526..713d36d45d1d 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -632,6 +632,8 @@ static int __init pmac_probe(void)
         smu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL);
 #endif /* CONFIG_PMAC_SMU */
 
+        pm_power_off = pmac_power_off;
+
         return 1;
 }
 
@@ -663,7 +665,6 @@ define_machine(powermac) {
         .get_irq                = NULL, /* changed later */
         .pci_irq_fixup          = pmac_pci_irq_fixup,
         .restart                = pmac_restart,
-        .power_off              = pmac_power_off,
         .halt                   = pmac_halt,
         .time_init              = pmac_time_init,
         .get_boot_time          = pmac_get_boot_time,
diff --git a/arch/powerpc/platforms/powernv/eeh-ioda.c b/arch/powerpc/platforms/powernv/eeh-ioda.c
index eba9cb10619c..2809c9895288 100644
--- a/arch/powerpc/platforms/powernv/eeh-ioda.c
+++ b/arch/powerpc/platforms/powernv/eeh-ioda.c
@@ -11,7 +11,6 @@
  * (at your option) any later version.
  */
 
-#include <linux/bootmem.h>
 #include <linux/debugfs.h>
 #include <linux/delay.h>
 #include <linux/io.h>
@@ -354,6 +353,9 @@ static int ioda_eeh_get_phb_state(struct eeh_pe *pe)
         } else if (!(pe->state & EEH_PE_ISOLATED)) {
                 eeh_pe_state_mark(pe, EEH_PE_ISOLATED);
                 ioda_eeh_phb_diag(pe);
+
+                if (eeh_has_flag(EEH_EARLY_DUMP_LOG))
+                        pnv_pci_dump_phb_diag_data(pe->phb, pe->data);
         }
 
         return result;
@@ -373,7 +375,7 @@ static int ioda_eeh_get_pe_state(struct eeh_pe *pe)
          * moving forward, we have to return operational
          * state during PE reset.
          */
-        if (pe->state & EEH_PE_CFG_BLOCKED) {
+        if (pe->state & EEH_PE_RESET) {
                 result = (EEH_STATE_MMIO_ACTIVE  |
                           EEH_STATE_DMA_ACTIVE   |
                           EEH_STATE_MMIO_ENABLED |
@@ -452,6 +454,9 @@ static int ioda_eeh_get_pe_state(struct eeh_pe *pe)
 
                 eeh_pe_state_mark(pe, EEH_PE_ISOLATED);
                 ioda_eeh_phb_diag(pe);
+
+                if (eeh_has_flag(EEH_EARLY_DUMP_LOG))
+                        pnv_pci_dump_phb_diag_data(pe->phb, pe->data);
         }
 
         return result;
@@ -731,7 +736,8 @@ static int ioda_eeh_reset(struct eeh_pe *pe, int option)
 static int ioda_eeh_get_log(struct eeh_pe *pe, int severity,
                             char *drv_log, unsigned long len)
 {
-        pnv_pci_dump_phb_diag_data(pe->phb, pe->data);
+        if (!eeh_has_flag(EEH_EARLY_DUMP_LOG))
+                pnv_pci_dump_phb_diag_data(pe->phb, pe->data);
 
         return 0;
 }
@@ -1087,6 +1093,10 @@ static int ioda_eeh_next_error(struct eeh_pe **pe)
                     !((*pe)->state & EEH_PE_ISOLATED)) {
                         eeh_pe_state_mark(*pe, EEH_PE_ISOLATED);
                         ioda_eeh_phb_diag(*pe);
+
+                        if (eeh_has_flag(EEH_EARLY_DUMP_LOG))
+                                pnv_pci_dump_phb_diag_data((*pe)->phb,
+                                                           (*pe)->data);
                 }
 
                 /*
diff --git a/arch/powerpc/platforms/powernv/opal-async.c b/arch/powerpc/platforms/powernv/opal-async.c
index e462ab947d16..693b6cdac691 100644
--- a/arch/powerpc/platforms/powernv/opal-async.c
+++ b/arch/powerpc/platforms/powernv/opal-async.c
@@ -71,6 +71,7 @@ int opal_async_get_token_interruptible(void)
 
         return token;
 }
+EXPORT_SYMBOL_GPL(opal_async_get_token_interruptible);
 
 int __opal_async_release_token(int token)
 {
@@ -102,6 +103,7 @@ int opal_async_release_token(int token)
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(opal_async_release_token);
 
 int opal_async_wait_response(uint64_t token, struct opal_msg *msg)
 {
@@ -120,6 +122,7 @@ int opal_async_wait_response(uint64_t token, struct opal_msg *msg)
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(opal_async_wait_response);
 
 static int opal_async_comp_event(struct notifier_block *nb,
                 unsigned long msg_type, void *msg)
diff --git a/arch/powerpc/platforms/powernv/opal-rtc.c b/arch/powerpc/platforms/powernv/opal-rtc.c
index 499707ddaa9c..37dbee15769f 100644
--- a/arch/powerpc/platforms/powernv/opal-rtc.c
+++ b/arch/powerpc/platforms/powernv/opal-rtc.c
@@ -15,6 +15,8 @@
 #include <linux/bcd.h>
 #include <linux/rtc.h>
 #include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/of_platform.h>
 
 #include <asm/opal.h>
 #include <asm/firmware.h>
@@ -43,7 +45,7 @@ unsigned long __init opal_get_boot_time(void)
         long rc = OPAL_BUSY;
 
         if (!opal_check_token(OPAL_RTC_READ))
-                goto out;
+                return 0;
 
         while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) {
                 rc = opal_rtc_read(&__y_m_d, &__h_m_s_ms);
@@ -53,62 +55,33 @@ unsigned long __init opal_get_boot_time(void)
                         mdelay(10);
         }
         if (rc != OPAL_SUCCESS)
-                goto out;
+                return 0;
 
         y_m_d = be32_to_cpu(__y_m_d);
         h_m_s_ms = be64_to_cpu(__h_m_s_ms);
         opal_to_tm(y_m_d, h_m_s_ms, &tm);
         return mktime(tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
                       tm.tm_hour, tm.tm_min, tm.tm_sec);
-out:
-        ppc_md.get_rtc_time = NULL;
-        ppc_md.set_rtc_time = NULL;
-        return 0;
 }
 
-void opal_get_rtc_time(struct rtc_time *tm)
+static __init int opal_time_init(void)
 {
-        long rc = OPAL_BUSY;
-        u32 y_m_d;
-        u64 h_m_s_ms;
-        __be32 __y_m_d;
-        __be64 __h_m_s_ms;
+        struct platform_device *pdev;
+        struct device_node *rtc;
 
-        while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) {
-                rc = opal_rtc_read(&__y_m_d, &__h_m_s_ms);
-                if (rc == OPAL_BUSY_EVENT)
-                        opal_poll_events(NULL);
+        rtc = of_find_node_by_path("/ibm,opal/rtc");
+        if (rtc) {
+                pdev = of_platform_device_create(rtc, "opal-rtc", NULL);
+                of_node_put(rtc);
+        } else {
+                if (opal_check_token(OPAL_RTC_READ) ||
+                    opal_check_token(OPAL_READ_TPO))
+                        pdev = platform_device_register_simple("opal-rtc", -1,
+                                                               NULL, 0);
                 else
-                        mdelay(10);
+                        return -ENODEV;
         }
-        if (rc != OPAL_SUCCESS)
-                return;
-        y_m_d = be32_to_cpu(__y_m_d);
-        h_m_s_ms = be64_to_cpu(__h_m_s_ms);
-        opal_to_tm(y_m_d, h_m_s_ms, tm);
-}
-
-int opal_set_rtc_time(struct rtc_time *tm)
-{
-        long rc = OPAL_BUSY;
-        u32 y_m_d = 0;
-        u64 h_m_s_ms = 0;
-
-        y_m_d |= ((u32)bin2bcd((tm->tm_year + 1900) / 100)) << 24;
-        y_m_d |= ((u32)bin2bcd((tm->tm_year + 1900) % 100)) << 16;
-        y_m_d |= ((u32)bin2bcd((tm->tm_mon + 1))) << 8;
-        y_m_d |= ((u32)bin2bcd(tm->tm_mday));
-
-        h_m_s_ms |= ((u64)bin2bcd(tm->tm_hour)) << 56;
-        h_m_s_ms |= ((u64)bin2bcd(tm->tm_min)) << 48;
-        h_m_s_ms |= ((u64)bin2bcd(tm->tm_sec)) << 40;
 
-        while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) {
-                rc = opal_rtc_write(y_m_d, h_m_s_ms);
-                if (rc == OPAL_BUSY_EVENT)
-                        opal_poll_events(NULL);
-                else
-                        mdelay(10);
-        }
-        return rc == OPAL_SUCCESS ? 0 : -EIO;
+        return PTR_ERR_OR_ZERO(pdev);
 }
+machine_subsys_initcall(powernv, opal_time_init);
diff --git a/arch/powerpc/platforms/powernv/opal-tracepoints.c b/arch/powerpc/platforms/powernv/opal-tracepoints.c
index ae14c40b4b1c..e11273b2386d 100644
--- a/arch/powerpc/platforms/powernv/opal-tracepoints.c
+++ b/arch/powerpc/platforms/powernv/opal-tracepoints.c
@@ -48,7 +48,7 @@ void __trace_opal_entry(unsigned long opcode, unsigned long *args)
 
         local_irq_save(flags);
 
-        depth = &__get_cpu_var(opal_trace_depth);
+        depth = this_cpu_ptr(&opal_trace_depth);
 
         if (*depth)
                 goto out;
@@ -69,7 +69,7 @@ void __trace_opal_exit(long opcode, unsigned long retval)
 
         local_irq_save(flags);
 
-        depth = &__get_cpu_var(opal_trace_depth);
+        depth = this_cpu_ptr(&opal_trace_depth);
 
         if (*depth)
                 goto out;
diff --git a/arch/powerpc/platforms/powernv/opal-wrappers.S b/arch/powerpc/platforms/powernv/opal-wrappers.S
index feb549aa3eea..0a299be588af 100644
--- a/arch/powerpc/platforms/powernv/opal-wrappers.S
+++ b/arch/powerpc/platforms/powernv/opal-wrappers.S
@@ -18,7 +18,7 @@
         .section        ".text"
 
 #ifdef CONFIG_TRACEPOINTS
-#ifdef CONFIG_JUMP_LABEL
+#ifdef HAVE_JUMP_LABEL
 #define OPAL_BRANCH(LABEL)                                      \
         ARCH_STATIC_BRANCH(LABEL, opal_tracepoint_key)
 #else
@@ -250,3 +250,7 @@ OPAL_CALL(opal_handle_hmi,			OPAL_HANDLE_HMI);
 OPAL_CALL(opal_register_dump_region,            OPAL_REGISTER_DUMP_REGION);
 OPAL_CALL(opal_unregister_dump_region,          OPAL_UNREGISTER_DUMP_REGION);
 OPAL_CALL(opal_pci_set_phb_cxl_mode,            OPAL_PCI_SET_PHB_CXL_MODE);
+OPAL_CALL(opal_tpo_write,                       OPAL_WRITE_TPO);
+OPAL_CALL(opal_tpo_read,                        OPAL_READ_TPO);
+OPAL_CALL(opal_ipmi_send,                       OPAL_IPMI_SEND);
+OPAL_CALL(opal_ipmi_recv,                       OPAL_IPMI_RECV);
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index d019b081df9d..cb0b6de79cd4 100644
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -50,7 +50,6 @@ static int mc_recoverable_range_len;
 
 struct device_node *opal_node;
 static DEFINE_SPINLOCK(opal_write_lock);
-extern u64 opal_mc_secondary_handler[];
 static unsigned int *opal_irqs;
 static unsigned int opal_irq_count;
 static ATOMIC_NOTIFIER_HEAD(opal_notifier_head);
@@ -644,6 +643,16 @@ static void __init opal_dump_region_init(void)
                 pr_warn("DUMP: Failed to register kernel log buffer. "
                         "rc = %d\n", rc);
 }
+
+static void opal_ipmi_init(struct device_node *opal_node)
+{
+        struct device_node *np;
+
+        for_each_child_of_node(opal_node, np)
+                if (of_device_is_compatible(np, "ibm,opal-ipmi"))
+                        of_platform_device_create(np, NULL, NULL);
+}
+
 static int __init opal_init(void)
 {
         struct device_node *np, *consoles;
@@ -707,6 +716,8 @@ static int __init opal_init(void)
                 opal_msglog_init();
         }
 
+        opal_ipmi_init(opal_node);
+
         return 0;
 }
 machine_subsys_initcall(powernv, opal_init);
@@ -742,6 +753,8 @@ void opal_shutdown(void)
 
 /* Export this so that test modules can use it */
 EXPORT_SYMBOL_GPL(opal_invalid_call);
+EXPORT_SYMBOL_GPL(opal_ipmi_send);
+EXPORT_SYMBOL_GPL(opal_ipmi_recv);
 
 /* Convert a region of vmalloc memory to an opal sg list */
 struct opal_sg_list *opal_vmalloc_to_sg_list(void *vmalloc_addr,
@@ -805,3 +818,9 @@ void opal_free_sg_list(struct opal_sg_list *sg)
                         sg = NULL;
         }
 }
+
+EXPORT_SYMBOL_GPL(opal_poll_events);
+EXPORT_SYMBOL_GPL(opal_rtc_read);
+EXPORT_SYMBOL_GPL(opal_rtc_write);
+EXPORT_SYMBOL_GPL(opal_tpo_read);
+EXPORT_SYMBOL_GPL(opal_tpo_write);
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 3ba435ec3dcd..fac88ed8a915 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -91,6 +91,24 @@ static inline bool pnv_pci_is_mem_pref_64(unsigned long flags)
                 (IORESOURCE_MEM_64 | IORESOURCE_PREFETCH));
 }
 
+static void pnv_ioda_reserve_pe(struct pnv_phb *phb, int pe_no)
+{
+        if (!(pe_no >= 0 && pe_no < phb->ioda.total_pe)) {
+                pr_warn("%s: Invalid PE %d on PHB#%x\n",
+                        __func__, pe_no, phb->hose->global_number);
+                return;
+        }
+
+        if (test_and_set_bit(pe_no, phb->ioda.pe_alloc)) {
+                pr_warn("%s: PE %d was assigned on PHB#%x\n",
+                        __func__, pe_no, phb->hose->global_number);
+                return;
+        }
+
+        phb->ioda.pe_array[pe_no].phb = phb;
+        phb->ioda.pe_array[pe_no].pe_number = pe_no;
+}
+
 static int pnv_ioda_alloc_pe(struct pnv_phb *phb)
 {
         unsigned long pe;
@@ -172,7 +190,7 @@ fail:
         return -EIO;
 }
 
-static void pnv_ioda2_alloc_m64_pe(struct pnv_phb *phb)
+static void pnv_ioda2_reserve_m64_pe(struct pnv_phb *phb)
 {
         resource_size_t sgsz = phb->ioda.m64_segsize;
         struct pci_dev *pdev;
@@ -185,16 +203,15 @@ static void pnv_ioda2_alloc_m64_pe(struct pnv_phb *phb)
          * instead of root bus.
          */
         list_for_each_entry(pdev, &phb->hose->bus->devices, bus_list) {
-                for (i = PCI_BRIDGE_RESOURCES;
-                     i <= PCI_BRIDGE_RESOURCE_END; i++) {
-                        r = &pdev->resource[i];
+                for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; i++) {
+                        r = &pdev->resource[PCI_BRIDGE_RESOURCES + i];
                         if (!r->parent ||
                             !pnv_pci_is_mem_pref_64(r->flags))
                                 continue;
 
                         base = (r->start - phb->ioda.m64_base) / sgsz;
                         for (step = 0; step < resource_size(r) / sgsz; step++)
-                                set_bit(base + step, phb->ioda.pe_alloc);
+                                pnv_ioda_reserve_pe(phb, base + step);
                 }
         }
 }
@@ -287,8 +304,6 @@ done:
         while ((i = find_next_bit(pe_alloc, phb->ioda.total_pe, i + 1)) <
                 phb->ioda.total_pe) {
                 pe = &phb->ioda.pe_array[i];
-                pe->phb = phb;
-                pe->pe_number = i;
 
                 if (!master_pe) {
                         pe->flags |= PNV_IODA_PE_MASTER;
@@ -313,6 +328,12 @@ static void __init pnv_ioda_parse_m64_window(struct pnv_phb *phb)
         const u32 *r;
         u64 pci_addr;
 
+        /* FIXME: Support M64 for P7IOC */
+        if (phb->type != PNV_PHB_IODA2) {
+                pr_info("  Not support M64 window\n");
+                return;
+        }
+
         if (!firmware_has_feature(FW_FEATURE_OPALv3)) {
                 pr_info("  Firmware too old to support M64 window\n");
                 return;
@@ -325,12 +346,6 @@ static void __init pnv_ioda_parse_m64_window(struct pnv_phb *phb)
                 return;
         }
 
-        /* FIXME: Support M64 for P7IOC */
-        if (phb->type != PNV_PHB_IODA2) {
-                pr_info("  Not support M64 window\n");
-                return;
-        }
-
         res = &hose->mem_resources[1];
         res->start = of_translate_address(dn, r + 2);
         res->end = res->start + of_read_number(r + 4, 2) - 1;
@@ -345,7 +360,7 @@ static void __init pnv_ioda_parse_m64_window(struct pnv_phb *phb)
         /* Use last M64 BAR to cover M64 window */
         phb->ioda.m64_bar_idx = 15;
         phb->init_m64 = pnv_ioda2_init_m64;
-        phb->alloc_m64_pe = pnv_ioda2_alloc_m64_pe;
+        phb->reserve_m64_pe = pnv_ioda2_reserve_m64_pe;
         phb->pick_m64_pe = pnv_ioda2_pick_m64_pe;
 }
 
@@ -358,7 +373,9 @@ static void pnv_ioda_freeze_pe(struct pnv_phb *phb, int pe_no)
         /* Fetch master PE */
         if (pe->flags & PNV_IODA_PE_SLAVE) {
                 pe = pe->master;
-                WARN_ON(!pe || !(pe->flags & PNV_IODA_PE_MASTER));
+                if (WARN_ON(!pe || !(pe->flags & PNV_IODA_PE_MASTER)))
+                        return;
+
                 pe_no = pe->pe_number;
         }
 
@@ -507,6 +524,106 @@ static struct pnv_ioda_pe *pnv_ioda_get_pe(struct pci_dev *dev)
 }
 #endif /* CONFIG_PCI_MSI */
 
+static int pnv_ioda_set_one_peltv(struct pnv_phb *phb,
+                                  struct pnv_ioda_pe *parent,
+                                  struct pnv_ioda_pe *child,
+                                  bool is_add)
+{
+        const char *desc = is_add ? "adding" : "removing";
+        uint8_t op = is_add ? OPAL_ADD_PE_TO_DOMAIN :
+                              OPAL_REMOVE_PE_FROM_DOMAIN;
+        struct pnv_ioda_pe *slave;
+        long rc;
+
+        /* Parent PE affects child PE */
+        rc = opal_pci_set_peltv(phb->opal_id, parent->pe_number,
+                                child->pe_number, op);
+        if (rc != OPAL_SUCCESS) {
+                pe_warn(child, "OPAL error %ld %s to parent PELTV\n",
+                        rc, desc);
+                return -ENXIO;
+        }
+
+        if (!(child->flags & PNV_IODA_PE_MASTER))
+                return 0;
+
+        /* Compound case: parent PE affects slave PEs */
+        list_for_each_entry(slave, &child->slaves, list) {
+                rc = opal_pci_set_peltv(phb->opal_id, parent->pe_number,
+                                        slave->pe_number, op);
+                if (rc != OPAL_SUCCESS) {
+                        pe_warn(slave, "OPAL error %ld %s to parent PELTV\n",
+                                rc, desc);
+                        return -ENXIO;
+                }
+        }
+
+        return 0;
+}
+
+static int pnv_ioda_set_peltv(struct pnv_phb *phb,
+                              struct pnv_ioda_pe *pe,
+                              bool is_add)
+{
+        struct pnv_ioda_pe *slave;
+        struct pci_dev *pdev;
+        int ret;
+
+        /*
+         * Clear PE frozen state. If it's master PE, we need
+         * clear slave PE frozen state as well.
+         */
+        if (is_add) {
+                opal_pci_eeh_freeze_clear(phb->opal_id, pe->pe_number,
+                                          OPAL_EEH_ACTION_CLEAR_FREEZE_ALL);
+                if (pe->flags & PNV_IODA_PE_MASTER) {
+                        list_for_each_entry(slave, &pe->slaves, list)
+                                opal_pci_eeh_freeze_clear(phb->opal_id,
+                                                          slave->pe_number,
+                                                          OPAL_EEH_ACTION_CLEAR_FREEZE_ALL);
+                }
+        }
+
+        /*
+         * Associate PE in PELT. We need add the PE into the
+         * corresponding PELT-V as well. Otherwise, the error
+         * originated from the PE might contribute to other
+         * PEs.
+         */
+        ret = pnv_ioda_set_one_peltv(phb, pe, pe, is_add);
+        if (ret)
+                return ret;
+
+        /* For compound PEs, any one affects all of them */
+        if (pe->flags & PNV_IODA_PE_MASTER) {
+                list_for_each_entry(slave, &pe->slaves, list) {
+                        ret = pnv_ioda_set_one_peltv(phb, slave, pe, is_add);
+                        if (ret)
+                                return ret;
+                }
+        }
+
+        if (pe->flags & (PNV_IODA_PE_BUS_ALL | PNV_IODA_PE_BUS))
+                pdev = pe->pbus->self;
+        else
+                pdev = pe->pdev->bus->self;
+        while (pdev) {
+                struct pci_dn *pdn = pci_get_pdn(pdev);
+                struct pnv_ioda_pe *parent;
+
+                if (pdn && pdn->pe_number != IODA_INVALID_PE) {
+                        parent = &phb->ioda.pe_array[pdn->pe_number];
+                        ret = pnv_ioda_set_one_peltv(phb, parent, pe, is_add);
+                        if (ret)
+                                return ret;
+                }
+
+                pdev = pdev->bus->self;
+        }
+
+        return 0;
+}
+
 static int pnv_ioda_configure_pe(struct pnv_phb *phb, struct pnv_ioda_pe *pe)
 {
         struct pci_dev *parent;
@@ -561,48 +678,36 @@ static int pnv_ioda_configure_pe(struct pnv_phb *phb, struct pnv_ioda_pe *pe)
                 return -ENXIO;
         }
 
-        rc = opal_pci_set_peltv(phb->opal_id, pe->pe_number,
-                                pe->pe_number, OPAL_ADD_PE_TO_DOMAIN);
-        if (rc)
-                pe_warn(pe, "OPAL error %d adding self to PELTV\n", rc);
-        opal_pci_eeh_freeze_clear(phb->opal_id, pe->pe_number,
-                                  OPAL_EEH_ACTION_CLEAR_FREEZE_ALL);
+        /* Configure PELTV */
+        pnv_ioda_set_peltv(phb, pe, true);
 
-        /* Add to all parents PELT-V */
-        while (parent) {
-                struct pci_dn *pdn = pci_get_pdn(parent);
-                if (pdn && pdn->pe_number != IODA_INVALID_PE) {
-                        rc = opal_pci_set_peltv(phb->opal_id, pdn->pe_number,
-                                                pe->pe_number, OPAL_ADD_PE_TO_DOMAIN);
-                        /* XXX What to do in case of error ? */
-                }
-                parent = parent->bus->self;
-        }
         /* Setup reverse map */
         for (rid = pe->rid; rid < rid_end; rid++)
                 phb->ioda.pe_rmap[rid] = pe->pe_number;
 
         /* Setup one MVTs on IODA1 */
-        if (phb->type == PNV_PHB_IODA1) {
-                pe->mve_number = pe->pe_number;
-                rc = opal_pci_set_mve(phb->opal_id, pe->mve_number,
-                                      pe->pe_number);
+        if (phb->type != PNV_PHB_IODA1) {
+                pe->mve_number = 0;
+                goto out;
+        }
+
+        pe->mve_number = pe->pe_number;
+        rc = opal_pci_set_mve(phb->opal_id, pe->mve_number, pe->pe_number);
+        if (rc != OPAL_SUCCESS) {
+                pe_err(pe, "OPAL error %ld setting up MVE %d\n",
+                       rc, pe->mve_number);
+                pe->mve_number = -1;
+        } else {
+                rc = opal_pci_set_mve_enable(phb->opal_id,
+                                             pe->mve_number, OPAL_ENABLE_MVE);
                 if (rc) {
-                        pe_err(pe, "OPAL error %ld setting up MVE %d\n",
+                        pe_err(pe, "OPAL error %ld enabling MVE %d\n",
                                rc, pe->mve_number);
                         pe->mve_number = -1;
-                } else {
-                        rc = opal_pci_set_mve_enable(phb->opal_id,
-                                                     pe->mve_number, OPAL_ENABLE_MVE);
-                        if (rc) {
-                                pe_err(pe, "OPAL error %ld enabling MVE %d\n",
-                                       rc, pe->mve_number);
-                                pe->mve_number = -1;
-                        }
                 }
-        } else if (phb->type == PNV_PHB_IODA2)
-                pe->mve_number = 0;
+        }
 
+out:
         return 0;
 }
 
@@ -837,8 +942,8 @@ static void pnv_pci_ioda_setup_PEs(void)
                 phb = hose->private_data;
 
                 /* M64 layout might affect PE allocation */
-                if (phb->alloc_m64_pe)
-                        phb->alloc_m64_pe(phb);
+                if (phb->reserve_m64_pe)
+                        phb->reserve_m64_pe(phb);
 
                 pnv_ioda_setup_PEs(hose->bus);
         }
@@ -1834,19 +1939,14 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,
         phb_id = be64_to_cpup(prop64);
         pr_debug("  PHB-ID  : 0x%016llx\n", phb_id);
 
-        phb = alloc_bootmem(sizeof(struct pnv_phb));
-        if (!phb) {
-                pr_err("  Out of memory !\n");
-                return;
-        }
+        phb = memblock_virt_alloc(sizeof(struct pnv_phb), 0);
 
         /* Allocate PCI controller */
-        memset(phb, 0, sizeof(struct pnv_phb));
         phb->hose = hose = pcibios_alloc_controller(np);
         if (!phb->hose) {
                 pr_err("  Can't allocate PCI controller for %s\n",
                        np->full_name);
-                free_bootmem((unsigned long)phb, sizeof(struct pnv_phb));
+                memblock_free(__pa(phb), sizeof(struct pnv_phb));
                 return;
         }
 
@@ -1913,8 +2013,7 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,
         }
         pemap_off = size;
         size += phb->ioda.total_pe * sizeof(struct pnv_ioda_pe);
-        aux = alloc_bootmem(size);
-        memset(aux, 0, size);
+        aux = memblock_virt_alloc(size, 0);
         phb->ioda.pe_alloc = aux;
         phb->ioda.m32_segmap = aux + m32map_off;
         if (phb->type == PNV_PHB_IODA1)
@@ -1999,8 +2098,8 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,
                 ioda_eeh_phb_reset(hose, EEH_RESET_DEACTIVATE);
         }
 
-        /* Configure M64 window */
-        if (phb->init_m64 && phb->init_m64(phb))
+        /* Remove M64 resource if we can't configure it successfully */
+        if (!phb->init_m64 || phb->init_m64(phb))
                 hose->mem_resources[1].flags = 0;
 }
 
diff --git a/arch/powerpc/platforms/powernv/pci-p5ioc2.c b/arch/powerpc/platforms/powernv/pci-p5ioc2.c
index 94ce3481490b..6ef6d4d8e7e2 100644
--- a/arch/powerpc/platforms/powernv/pci-p5ioc2.c
+++ b/arch/powerpc/platforms/powernv/pci-p5ioc2.c
@@ -122,12 +122,9 @@ static void __init pnv_pci_init_p5ioc2_phb(struct device_node *np, u64 hub_id,
                 return;
         }
 
-        phb = alloc_bootmem(sizeof(struct pnv_phb));
-        if (phb) {
-                memset(phb, 0, sizeof(struct pnv_phb));
-                phb->hose = pcibios_alloc_controller(np);
-        }
-        if (!phb || !phb->hose) {
+        phb = memblock_virt_alloc(sizeof(struct pnv_phb), 0);
+        phb->hose = pcibios_alloc_controller(np);
+        if (!phb->hose) {
                 pr_err("  Failed to allocate PCI controller\n");
                 return;
         }
@@ -196,16 +193,27 @@ void __init pnv_pci_init_p5ioc2_hub(struct device_node *np)
         hub_id = be64_to_cpup(prop64);
         pr_info(" HUB-ID : 0x%016llx\n", hub_id);
 
+        /* Count child PHBs and calculate TCE space per PHB */
+        for_each_child_of_node(np, phbn) {
+                if (of_device_is_compatible(phbn, "ibm,p5ioc2-pcix") ||
+                    of_device_is_compatible(phbn, "ibm,p5ioc2-pciex"))
+                        phb_count++;
+        }
+
+        if (phb_count <= 0) {
+                pr_info(" No PHBs for Hub %s\n", np->full_name);
+                return;
+        }
+
+        tce_per_phb = __rounddown_pow_of_two(P5IOC2_TCE_MEMORY / phb_count);
+        pr_info(" Allocating %lld MB of TCE memory per PHB\n",
+                tce_per_phb >> 20);
+
         /* Currently allocate 16M of TCE memory for every Hub
          *
          * XXX TODO: Make it chip local if possible
          */
-        tce_mem = __alloc_bootmem(P5IOC2_TCE_MEMORY, P5IOC2_TCE_MEMORY,
-                                  __pa(MAX_DMA_ADDRESS));
-        if (!tce_mem) {
-                pr_err(" Failed to allocate TCE Memory !\n");
-                return;
-        }
+        tce_mem = memblock_virt_alloc(P5IOC2_TCE_MEMORY, P5IOC2_TCE_MEMORY);
         pr_debug(" TCE    : 0x%016lx..0x%016lx\n",
                 __pa(tce_mem), __pa(tce_mem) + P5IOC2_TCE_MEMORY - 1);
         rc = opal_pci_set_hub_tce_memory(hub_id, __pa(tce_mem),
@@ -215,18 +223,6 @@ void __init pnv_pci_init_p5ioc2_hub(struct device_node *np)
                 return;
         }
 
-        /* Count child PHBs */
-        for_each_child_of_node(np, phbn) {
-                if (of_device_is_compatible(phbn, "ibm,p5ioc2-pcix") ||
-                    of_device_is_compatible(phbn, "ibm,p5ioc2-pciex"))
-                        phb_count++;
-        }
-
-        /* Calculate how much TCE space we can give per PHB */
-        tce_per_phb = __rounddown_pow_of_two(P5IOC2_TCE_MEMORY / phb_count);
-        pr_info(" Allocating %lld MB of TCE memory per PHB\n",
-                tce_per_phb >> 20);
-
         /* Initialize PHBs */
         for_each_child_of_node(np, phbn) {
                 if (of_device_is_compatible(phbn, "ibm,p5ioc2-pcix") ||
diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c
index 540fc6dd56b3..4945e87f12dc 100644
--- a/arch/powerpc/platforms/powernv/pci.c
+++ b/arch/powerpc/platforms/powernv/pci.c
@@ -16,7 +16,6 @@
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/bootmem.h>
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/msi.h>
diff --git a/arch/powerpc/platforms/powernv/pci.h b/arch/powerpc/platforms/powernv/pci.h
index 34d29eb2a4de..6c02ff8dd69f 100644
--- a/arch/powerpc/platforms/powernv/pci.h
+++ b/arch/powerpc/platforms/powernv/pci.h
@@ -130,7 +130,7 @@ struct pnv_phb {
         u32 (*bdfn_to_pe)(struct pnv_phb *phb, struct pci_bus *bus, u32 devfn);
         void (*shutdown)(struct pnv_phb *phb);
         int (*init_m64)(struct pnv_phb *phb);
-        void (*alloc_m64_pe)(struct pnv_phb *phb);
+        void (*reserve_m64_pe)(struct pnv_phb *phb);
         int (*pick_m64_pe)(struct pnv_phb *phb, struct pci_bus *bus, int all);
         int (*get_pe_state)(struct pnv_phb *phb, int pe_no);
         void (*freeze_pe)(struct pnv_phb *phb, int pe_no);
diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index 3f9546d8a51f..30b1c3e298a6 100644
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -265,10 +265,8 @@ static unsigned long pnv_memory_block_size(void)
 static void __init pnv_setup_machdep_opal(void)
 {
         ppc_md.get_boot_time = opal_get_boot_time;
-        ppc_md.get_rtc_time = opal_get_rtc_time;
-        ppc_md.set_rtc_time = opal_set_rtc_time;
         ppc_md.restart = pnv_restart;
-        ppc_md.power_off = pnv_power_off;
+        pm_power_off = pnv_power_off;
         ppc_md.halt = pnv_halt;
         ppc_md.machine_check_exception = opal_machine_check;
         ppc_md.mce_check_early_recovery = opal_mce_check_early_recovery;
@@ -285,7 +283,7 @@ static void __init pnv_setup_machdep_rtas(void)
                 ppc_md.set_rtc_time = rtas_set_rtc_time;
         }
         ppc_md.restart = rtas_restart;
-        ppc_md.power_off = rtas_power_off;
+        pm_power_off = rtas_power_off;
         ppc_md.halt = rtas_halt;
 }
 #endif /* CONFIG_PPC_POWERNV_RTAS */
diff --git a/arch/powerpc/platforms/powernv/smp.c b/arch/powerpc/platforms/powernv/smp.c
index 4753958cd509..b716f666e48a 100644
--- a/arch/powerpc/platforms/powernv/smp.c
+++ b/arch/powerpc/platforms/powernv/smp.c
@@ -149,6 +149,7 @@ static int pnv_smp_cpu_disable(void)
 static void pnv_smp_cpu_kill_self(void)
 {
         unsigned int cpu;
+        unsigned long srr1;
 
         /* Standard hot unplug procedure */
         local_irq_disable();
@@ -165,13 +166,25 @@ static void pnv_smp_cpu_kill_self(void)
         mtspr(SPRN_LPCR, mfspr(SPRN_LPCR) & ~(u64)LPCR_PECE1);
         while (!generic_check_cpu_restart(cpu)) {
                 ppc64_runlatch_off();
-                power7_nap(1);
+                srr1 = power7_nap(1);
                 ppc64_runlatch_on();
 
-                /* Clear the IPI that woke us up */
-                icp_native_flush_interrupt();
-                local_paca->irq_happened &= PACA_IRQ_HARD_DIS;
-                mb();
+                /*
+                 * If the SRR1 value indicates that we woke up due to
+                 * an external interrupt, then clear the interrupt.
+                 * We clear the interrupt before checking for the
+                 * reason, so as to avoid a race where we wake up for
+                 * some other reason, find nothing and clear the interrupt
+                 * just as some other cpu is sending us an interrupt.
+                 * If we returned from power7_nap as a result of
+                 * having finished executing in a KVM guest, then srr1
+                 * contains 0.
+                 */
+                if ((srr1 & SRR1_WAKEMASK) == SRR1_WAKEEE) {
+                        icp_native_flush_interrupt();
+                        local_paca->irq_happened &= PACA_IRQ_HARD_DIS;
+                        smp_mb();
+                }
 
                 if (cpu_core_split_required())
                         continue;
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c
index 3e270e3412ae..2f95d33cf34a 100644
--- a/arch/powerpc/platforms/ps3/htab.c
+++ b/arch/powerpc/platforms/ps3/htab.c
@@ -110,7 +110,7 @@ static long ps3_hpte_remove(unsigned long hpte_group)
 
 static long ps3_hpte_updatepp(unsigned long slot, unsigned long newpp,
                               unsigned long vpn, int psize, int apsize,
-                              int ssize, int local)
+                              int ssize, unsigned long inv_flags)
 {
         int result;
         u64 hpte_v, want_v, hpte_rs;
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c
index 5f3b23220b8e..a6c42f34303a 100644
--- a/arch/powerpc/platforms/ps3/interrupt.c
+++ b/arch/powerpc/platforms/ps3/interrupt.c
@@ -711,7 +711,7 @@ void __init ps3_register_ipi_irq(unsigned int cpu, unsigned int virq)
 
 static unsigned int ps3_get_irq(void)
 {
-        struct ps3_private *pd = &__get_cpu_var(ps3_private);
+        struct ps3_private *pd = this_cpu_ptr(&ps3_private);
         u64 x = (pd->bmp.status & pd->bmp.mask);
         unsigned int plug;
 
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 3f509f86432c..799c8580ab09 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -125,12 +125,7 @@ static void __init prealloc(struct ps3_prealloc *p)
         if (!p->size)
                 return;
 
-        p->address = __alloc_bootmem(p->size, p->align, __pa(MAX_DMA_ADDRESS));
-        if (!p->address) {
-                printk(KERN_ERR "%s: Cannot allocate %s\n", __func__,
-                       p->name);
-                return;
-        }
+        p->address = memblock_virt_alloc(p->size, p->align);
 
         printk(KERN_INFO "%s: %lu bytes at %p\n", p->name, p->size,
                p->address);
@@ -248,6 +243,7 @@ static int __init ps3_probe(void)
         ps3_mm_init();
         ps3_mm_vas_create(&htab_size);
         ps3_hpte_init(htab_size);
+        pm_power_off = ps3_power_off;
 
         DBG(" <- %s:%d\n", __func__, __LINE__);
         return 1;
@@ -278,7 +274,6 @@ define_machine(ps3) {
         .calibrate_decr                 = ps3_calibrate_decr,
         .progress                       = ps3_progress,
         .restart                        = ps3_restart,
-        .power_off                      = ps3_power_off,
         .halt                           = ps3_halt,
 #if defined(CONFIG_KEXEC)
         .kexec_cpu_down                 = ps3_kexec_cpu_down,
diff --git a/arch/powerpc/platforms/pseries/dtl.c b/arch/powerpc/platforms/pseries/dtl.c
index 1062f71f5a85..39049e4884fb 100644
--- a/arch/powerpc/platforms/pseries/dtl.c
+++ b/arch/powerpc/platforms/pseries/dtl.c
@@ -75,7 +75,7 @@ static atomic_t dtl_count;
  */
 static void consume_dtle(struct dtl_entry *dtle, u64 index)
 {
-        struct dtl_ring *dtlr = &__get_cpu_var(dtl_rings);
+        struct dtl_ring *dtlr = this_cpu_ptr(&dtl_rings);
         struct dtl_entry *wp = dtlr->write_ptr;
         struct lppaca *vpa = local_paca->lppaca_ptr;
 
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 1bbb78fab530..fa41f0da5b6f 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -12,7 +12,6 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/memblock.h>
-#include <linux/vmalloc.h>
 #include <linux/memory.h>
 #include <linux/memory_hotplug.h>
 
@@ -66,22 +65,6 @@ unsigned long pseries_memory_block_size(void)
 }
 
 #ifdef CONFIG_MEMORY_HOTREMOVE
-static int pseries_remove_memory(u64 start, u64 size)
-{
-        int ret;
-
-        /* Remove htab bolted mappings for this section of memory */
-        start = (unsigned long)__va(start);
-        ret = remove_section_mapping(start, start + size);
-
-        /* Ensure all vmalloc mappings are flushed in case they also
-         * hit that section of memory
-         */
-        vm_unmap_aliases();
-
-        return ret;
-}
-
 static int pseries_remove_memblock(unsigned long base, unsigned int memblock_size)
 {
         unsigned long block_sz, start_pfn;
@@ -261,10 +244,6 @@ static int __init pseries_memory_hotplug_init(void)
         if (firmware_has_feature(FW_FEATURE_LPAR))
                 of_reconfig_notifier_register(&pseries_mem_nb);
 
-#ifdef CONFIG_MEMORY_HOTREMOVE
-        ppc_md.remove_memory = pseries_remove_memory;
-#endif
-
         return 0;
 }
 machine_device_initcall(pseries, pseries_memory_hotplug_init);
diff --git a/arch/powerpc/platforms/pseries/hvCall.S b/arch/powerpc/platforms/pseries/hvCall.S
index 3fda3f17b84e..ccd53f91e8aa 100644
--- a/arch/powerpc/platforms/pseries/hvCall.S
+++ b/arch/powerpc/platforms/pseries/hvCall.S
@@ -18,7 +18,7 @@
         
 #ifdef CONFIG_TRACEPOINTS
 
-#ifndef CONFIG_JUMP_LABEL
+#ifndef HAVE_JUMP_LABEL
         .section        ".toc","aw"
 
         .globl hcall_tracepoint_refcount
@@ -78,7 +78,7 @@ hcall_tracepoint_refcount:
         mr      r5,BUFREG;                                      \
         __HCALL_INST_POSTCALL
 
-#ifdef CONFIG_JUMP_LABEL
+#ifdef HAVE_JUMP_LABEL
 #define HCALL_BRANCH(LABEL)                                     \
         ARCH_STATIC_BRANCH(LABEL, hcall_tracepoint_key)
 #else
diff --git a/arch/powerpc/platforms/pseries/hvCall_inst.c b/arch/powerpc/platforms/pseries/hvCall_inst.c
index 4575f0c9e521..f02ec3ab428c 100644
--- a/arch/powerpc/platforms/pseries/hvCall_inst.c
+++ b/arch/powerpc/platforms/pseries/hvCall_inst.c
@@ -110,7 +110,7 @@ static void probe_hcall_entry(void *ignored, unsigned long opcode, unsigned long
         if (opcode > MAX_HCALL_OPCODE)
                 return;
 
-        h = &__get_cpu_var(hcall_stats)[opcode / 4];
+        h = this_cpu_ptr(&hcall_stats[opcode / 4]);
         h->tb_start = mftb();
         h->purr_start = mfspr(SPRN_PURR);
 }
@@ -123,7 +123,7 @@ static void probe_hcall_exit(void *ignored, unsigned long opcode, unsigned long
         if (opcode > MAX_HCALL_OPCODE)
                 return;
 
-        h = &__get_cpu_var(hcall_stats)[opcode / 4];
+        h = this_cpu_ptr(&hcall_stats[opcode / 4]);
         h->num_calls++;
         h->tb_total += mftb() - h->tb_start;
         h->purr_total += mfspr(SPRN_PURR) - h->purr_start;
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 3e5bfdafee63..1d3d52dc3ff3 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -199,7 +199,7 @@ static int tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
 
         local_irq_save(flags);  /* to protect tcep and the page behind it */
 
-        tcep = __get_cpu_var(tce_page);
+        tcep = __this_cpu_read(tce_page);
 
         /* This is safe to do since interrupts are off when we're called
          * from iommu_alloc{,_sg}()
@@ -212,7 +212,7 @@ static int tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
                         return tce_build_pSeriesLP(tbl, tcenum, npages, uaddr,
                                             direction, attrs);
                 }
-                __get_cpu_var(tce_page) = tcep;
+                __this_cpu_write(tce_page, tcep);
         }
 
         rpn = __pa(uaddr) >> TCE_SHIFT;
@@ -398,7 +398,7 @@ static int tce_setrange_multi_pSeriesLP(unsigned long start_pfn,
         long l, limit;
 
         local_irq_disable();    /* to protect tcep and the page behind it */
-        tcep = __get_cpu_var(tce_page);
+        tcep = __this_cpu_read(tce_page);
 
         if (!tcep) {
                 tcep = (__be64 *)__get_free_page(GFP_ATOMIC);
@@ -406,7 +406,7 @@ static int tce_setrange_multi_pSeriesLP(unsigned long start_pfn,
                         local_irq_enable();
                         return -ENOMEM;
                 }
-                __get_cpu_var(tce_page) = tcep;
+                __this_cpu_write(tce_page, tcep);
         }
 
         proto_tce = TCE_PCI_READ | TCE_PCI_WRITE;
@@ -574,8 +574,7 @@ static void pci_dma_bus_setup_pSeries(struct pci_bus *bus)
         while (isa_dn && isa_dn != dn)
                 isa_dn = isa_dn->parent;
 
-        if (isa_dn_orig)
-                of_node_put(isa_dn_orig);
+        of_node_put(isa_dn_orig);
 
         /* Count number of direct PCI children of the PHB. */
         for (children = 0, tmp = dn->child; tmp; tmp = tmp->sibling)
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index f6880d2a40fb..469751d92004 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -284,7 +284,7 @@ static long pSeries_lpar_hpte_updatepp(unsigned long slot,
                                        unsigned long newpp,
                                        unsigned long vpn,
                                        int psize, int apsize,
-                                       int ssize, int local)
+                                       int ssize, unsigned long inv_flags)
 {
         unsigned long lpar_rc;
         unsigned long flags = (newpp & 7) | H_AVPN;
@@ -442,7 +442,7 @@ static void __pSeries_lpar_hugepage_invalidate(unsigned long *slot,
 static void pSeries_lpar_hugepage_invalidate(unsigned long vsid,
                                              unsigned long addr,
                                              unsigned char *hpte_slot_array,
-                                             int psize, int ssize)
+                                             int psize, int ssize, int local)
 {
         int i, index = 0;
         unsigned long s_addr = addr;
@@ -515,7 +515,7 @@ static void pSeries_lpar_flush_hash_range(unsigned long number, int local)
         unsigned long vpn;
         unsigned long i, pix, rc;
         unsigned long flags = 0;
-        struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
+        struct ppc64_tlb_batch *batch = this_cpu_ptr(&ppc64_tlb_batch);
         int lock_tlbie = !mmu_has_feature(MMU_FTR_LOCKLESS_TLBIE);
         unsigned long param[9];
         unsigned long hash, index, shift, hidx, slot;
@@ -705,7 +705,7 @@ void __trace_hcall_entry(unsigned long opcode, unsigned long *args)
 
         local_irq_save(flags);
 
-        depth = &__get_cpu_var(hcall_trace_depth);
+        depth = this_cpu_ptr(&hcall_trace_depth);
 
         if (*depth)
                 goto out;
@@ -730,7 +730,7 @@ void __trace_hcall_exit(long opcode, unsigned long retval,
 
         local_irq_save(flags);
 
-        depth = &__get_cpu_var(hcall_trace_depth);
+        depth = this_cpu_ptr(&hcall_trace_depth);
 
         if (*depth)
                 goto out;
diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c
index 11a3b617ef5d..054a0ed5c7ee 100644
--- a/arch/powerpc/platforms/pseries/nvram.c
+++ b/arch/powerpc/platforms/pseries/nvram.c
@@ -715,6 +715,8 @@ static int nvram_pstore_init(void)
         nvram_pstore_info.buf = oops_data;
         nvram_pstore_info.bufsize = oops_data_sz;
 
+        spin_lock_init(&nvram_pstore_info.buf_lock);
+
         rc = pstore_register(&nvram_pstore_info);
         if (rc != 0)
                 pr_err("nvram: pstore_register() failed, defaults to "
diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c
index 67e48594040c..fe16a50700de 100644
--- a/arch/powerpc/platforms/pseries/pci.c
+++ b/arch/powerpc/platforms/pseries/pci.c
@@ -134,7 +134,7 @@ int pseries_root_bridge_prepare(struct pci_host_bridge *bridge)
         of_node_put(pdn);
 
         if (rc) {
-                pr_err("no ibm,pcie-link-speed-stats property\n");
+                pr_debug("no ibm,pcie-link-speed-stats property\n");
                 return 0;
         }
 
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index 5a4d0fc03b03..c3b2a7e81ddb 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -302,8 +302,8 @@ static struct rtas_error_log *fwnmi_get_errinfo(struct pt_regs *regs)
         /* If it isn't an extended log we can use the per cpu 64bit buffer */
         h = (struct rtas_error_log *)&savep[1];
         if (!rtas_error_extended(h)) {
-                memcpy(&__get_cpu_var(mce_data_buf), h, sizeof(__u64));
-                errhdr = (struct rtas_error_log *)&__get_cpu_var(mce_data_buf);
+                memcpy(this_cpu_ptr(&mce_data_buf), h, sizeof(__u64));
+                errhdr = (struct rtas_error_log *)this_cpu_ptr(&mce_data_buf);
         } else {
                 int len, error_log_length;
 
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index ed8a90022a3d..e445b6701f50 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -500,7 +500,11 @@ static void __init pSeries_setup_arch(void)
 
         if (firmware_has_feature(FW_FEATURE_SET_MODE)) {
                 long rc;
-                if ((rc = pSeries_enable_reloc_on_exc()) != H_SUCCESS) {
+
+                rc = pSeries_enable_reloc_on_exc();
+                if (rc == H_P2) {
+                        pr_info("Relocation on exceptions not supported\n");
+                } else if (rc != H_SUCCESS) {
                         pr_warn("Unable to enable relocation on exceptions: "
                                 "%ld\n", rc);
                 }
@@ -660,6 +664,34 @@ static void __init pSeries_init_early(void)
         pr_debug(" <- pSeries_init_early()\n");
 }
 
+/**
+ * pseries_power_off - tell firmware about how to power off the system.
+ *
+ * This function calls either the power-off rtas token in normal cases
+ * or the ibm,power-off-ups token (if present & requested) in case of
+ * a power failure. If power-off token is used, power on will only be
+ * possible with power button press. If ibm,power-off-ups token is used
+ * it will allow auto poweron after power is restored.
+ */
+static void pseries_power_off(void)
+{
+        int rc;
+        int rtas_poweroff_ups_token = rtas_token("ibm,power-off-ups");
+
+        if (rtas_flash_term_hook)
+                rtas_flash_term_hook(SYS_POWER_OFF);
+
+        if (rtas_poweron_auto == 0 ||
+                rtas_poweroff_ups_token == RTAS_UNKNOWN_SERVICE) {
+                rc = rtas_call(rtas_token("power-off"), 2, 1, NULL, -1, -1);
+                printk(KERN_INFO "RTAS power-off returned %d\n", rc);
+        } else {
+                rc = rtas_call(rtas_poweroff_ups_token, 0, 1, NULL);
+                printk(KERN_INFO "RTAS ibm,power-off-ups returned %d\n", rc);
+        }
+        for (;;);
+}
+
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
  */
@@ -742,6 +774,8 @@ static int __init pSeries_probe(void)
         else
                 hpte_init_native();
 
+        pm_power_off = pseries_power_off;
+
         pr_debug("Machine is%s LPAR !\n",
                  (powerpc_firmware_features & FW_FEATURE_LPAR) ? "" : " not");
 
@@ -755,34 +789,6 @@ static int pSeries_pci_probe_mode(struct pci_bus *bus)
         return PCI_PROBE_NORMAL;
 }
 
-/**
- * pSeries_power_off - tell firmware about how to power off the system.
- *
- * This function calls either the power-off rtas token in normal cases
- * or the ibm,power-off-ups token (if present & requested) in case of
- * a power failure. If power-off token is used, power on will only be
- * possible with power button press. If ibm,power-off-ups token is used
- * it will allow auto poweron after power is restored.
- */
-static void pSeries_power_off(void)
-{
-        int rc;
-        int rtas_poweroff_ups_token = rtas_token("ibm,power-off-ups");
-
-        if (rtas_flash_term_hook)
-                rtas_flash_term_hook(SYS_POWER_OFF);
-
-        if (rtas_poweron_auto == 0 ||
-                rtas_poweroff_ups_token == RTAS_UNKNOWN_SERVICE) {
-                rc = rtas_call(rtas_token("power-off"), 2, 1, NULL, -1, -1);
-                printk(KERN_INFO "RTAS power-off returned %d\n", rc);
-        } else {
-                rc = rtas_call(rtas_poweroff_ups_token, 0, 1, NULL);
-                printk(KERN_INFO "RTAS ibm,power-off-ups returned %d\n", rc);
-        }
-        for (;;);
-}
-
 #ifndef CONFIG_PCI
 void pSeries_final_fixup(void) { }
 #endif
@@ -797,7 +803,6 @@ define_machine(pseries) {
         .pcibios_fixup          = pSeries_final_fixup,
         .pci_probe_mode         = pSeries_pci_probe_mode,
         .restart                = rtas_restart,
-        .power_off              = pSeries_power_off,
         .halt                   = rtas_halt,
         .panic                  = rtas_os_term,
         .get_boot_time          = rtas_get_boot_time,