7 files changed, 35 insertions, 15 deletions

diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
index 0b9af015bedc..bfb18c7290b7 100644
--- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S
+++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
@@ -75,7 +75,7 @@ _GLOBAL(__setup_cpu_e500v2)
         bl      __e500_icache_setup
         bl      __e500_dcache_setup
         bl      __setup_e500_ivors
-#ifdef CONFIG_FSL_RIO
+#if defined(CONFIG_FSL_RIO) || defined(CONFIG_FSL_PCI)
         /* Ensure that RFXE is set */
         mfspr   r3,SPRN_HID1
         oris    r3,r3,HID1_RFXE@h
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 22973a74df73..597d954e5860 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -2105,7 +2105,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                         MMU_FTR_USE_TLBILX,
                 .icache_bsize           = 64,
                 .dcache_bsize           = 64,
-                .num_pmcs               = 4,
+                .num_pmcs               = 6,
                 .oprofile_cpu_type      = "ppc/e6500",
                 .oprofile_type          = PPC_OPROFILE_FSL_EMB,
                 .cpu_setup              = __setup_cpu_e6500,
diff --git a/arch/powerpc/kernel/epapr_paravirt.c b/arch/powerpc/kernel/epapr_paravirt.c
index d44a571e45a7..6300c13bbde4 100644
--- a/arch/powerpc/kernel/epapr_paravirt.c
+++ b/arch/powerpc/kernel/epapr_paravirt.c
@@ -30,22 +30,20 @@ extern u32 epapr_ev_idle_start[];
 
 bool epapr_paravirt_enabled;
 
-static int __init epapr_paravirt_init(void)
+static int __init early_init_dt_scan_epapr(unsigned long node,
+                                           const char *uname,
+                                           int depth, void *data)
 {
-        struct device_node *hyper_node;
         const u32 *insts;
-        int len, i;
+        unsigned long len;
+        int i;
 
-        hyper_node = of_find_node_by_path("/hypervisor");
-        if (!hyper_node)
-                return -ENODEV;
-
-        insts = of_get_property(hyper_node, "hcall-instructions", &len);
+        insts = of_get_flat_dt_prop(node, "hcall-instructions", &len);
         if (!insts)
-                return -ENODEV;
+                return 0;
 
         if (len % 4 || len > (4 * 4))
-                return -ENODEV;
+                return -1;
 
         for (i = 0; i < (len / 4); i++) {
                 patch_instruction(epapr_hypercall_start + i, insts[i]);
@@ -55,13 +53,19 @@ static int __init epapr_paravirt_init(void)
         }
 
 #if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
-        if (of_get_property(hyper_node, "has-idle", NULL))
+        if (of_get_flat_dt_prop(node, "has-idle", NULL))
                 ppc_md.power_save = epapr_ev_idle;
 #endif
 
         epapr_paravirt_enabled = true;
 
+        return 1;
+}
+
+int __init epapr_paravirt_early_init(void)
+{
+        of_scan_flat_dt(early_init_dt_scan_epapr, NULL);
+
         return 0;
 }
 
-early_initcall(epapr_paravirt_init);
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index a8f54ecb091f..a4bbcae72578 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -38,6 +38,7 @@
 #include <asm/serial.h>
 #include <asm/udbg.h>
 #include <asm/mmu_context.h>
+#include <asm/epapr_hcalls.h>
 
 #include "setup.h"
 
@@ -128,6 +129,8 @@ notrace void __init machine_init(u64 dt_ptr)
         /* Do some early initialization based on the flat device tree */
         early_init_devtree(__va(dt_ptr));
 
+        epapr_paravirt_early_init();
+
         early_init_mmu();
 
         probe_machine();
@@ -326,5 +329,4 @@ void __init setup_arch(char **cmdline_p)
 
         /* Initialize the MMU context management stuff */
         mmu_context_init();
-
 }
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 389fb8077cc9..f03770e0fc8d 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -66,6 +66,7 @@
 #include <asm/code-patching.h>
 #include <asm/kvm_ppc.h>
 #include <asm/hugetlb.h>
+#include <asm/epapr_hcalls.h>
 
 #include "setup.h"
 
@@ -215,6 +216,8 @@ void __init early_setup(unsigned long dt_ptr)
          */
         early_init_devtree(__va(dt_ptr));
 
+        epapr_paravirt_early_init();
+
         /* Now we know the logical id of our boot cpu, setup the paca. */
         setup_paca(&paca[boot_cpuid]);
         fixup_boot_paca();
diff --git a/arch/powerpc/kernel/swsusp_booke.S b/arch/powerpc/kernel/swsusp_booke.S
index 11a39307dd71..0f204053e5b5 100644
--- a/arch/powerpc/kernel/swsusp_booke.S
+++ b/arch/powerpc/kernel/swsusp_booke.S
@@ -141,6 +141,14 @@ _GLOBAL(swsusp_arch_resume)
         lis     r11,swsusp_save_area@h
         ori     r11,r11,swsusp_save_area@l
 
+        /*
+         * Mappings from virtual addresses to physical addresses may be
+         * different than they were prior to restoring hibernation state. 
+         * Invalidate the TLB so that the boot CPU is using the new
+         * mappings.
+         */
+        bl      _tlbil_all
+
         lwz     r4,SL_SPRG0(r11)
         mtsprg  0,r4
         lwz     r4,SL_SPRG1(r11)
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index bf33c22e38a4..f58eaf23e8f1 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -62,6 +62,7 @@
 #include <asm/switch_to.h>
 #include <asm/tm.h>
 #include <asm/debug.h>
+#include <sysdev/fsl_pci.h>
 
 #if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
 int (*__debugger)(struct pt_regs *regs) __read_mostly;
@@ -567,6 +568,8 @@ int machine_check_e500(struct pt_regs *regs)
         if (reason & MCSR_BUS_RBERR) {
                 if (fsl_rio_mcheck_exception(regs))
                         return 1;
+                if (fsl_pci_mcheck_exception(regs))
+                        return 1;
         }
 
         printk("Machine check in kernel mode.\n");