Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix CPU hotplug when using the SLB shadow buffer
  [POWERPC] efika: add phy-handle property for fec_mpc52xx

4 files changed, 50 insertions, 0 deletions

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 1add6efdb315..5d89a21dd0d6 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -2216,6 +2216,45 @@ static void __init fixup_device_tree_efika(void)
                         prom_printf("fixup_device_tree_efika: ",
                                 "skipped entry %x - setprop error\n", i);
         }
+
+        /* Make sure ethernet mdio bus node exists */
+        node = call_prom("finddevice", 1, 1, ADDR("/builtin/mdio"));
+        if (!PHANDLE_VALID(node)) {
+                prom_printf("Adding Ethernet MDIO node\n");
+                call_prom("interpret", 1, 1,
+                        " s\" /builtin\" find-device"
+                        " new-device"
+                                " 1 encode-int s\" #address-cells\" property"
+                                " 0 encode-int s\" #size-cells\" property"
+                                " s\" mdio\" 2dup device-name device-type"
+                                " s\" mpc5200b-fec-phy\" encode-string"
+                                " s\" compatible\" property"
+                                " 0xf0003000 0x400 reg"
+                                " 0x2 encode-int"
+                                " 0x5 encode-int encode+"
+                                " 0x3 encode-int encode+"
+                                " s\" interrupts\" property"
+                        " finish-device");
+        };
+
+        /* Make sure ethernet phy device node exist */
+        node = call_prom("finddevice", 1, 1, ADDR("/builtin/mdio/ethernet-phy"));
+        if (!PHANDLE_VALID(node)) {
+                prom_printf("Adding Ethernet PHY node\n");
+                call_prom("interpret", 1, 1,
+                        " s\" /builtin/mdio\" find-device"
+                        " new-device"
+                                " s\" ethernet-phy\" device-name"
+                                " 0x10 encode-int s\" reg\" property"
+                                " my-self"
+                                " ihandle>phandle"
+                        " finish-device"
+                        " s\" /builtin/ethernet\" find-device"
+                                " encode-int"
+                                " s\" phy-handle\" property"
+                        " device-end");
+        }
+
 }
 #else
 #define fixup_device_tree_efika()
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c
index 27922dff8b94..a282bc212e80 100644
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
@@ -82,6 +82,14 @@ static inline void slb_shadow_clear(unsigned long entry)
         get_slb_shadow()->save_area[entry].esid = 0;
 }
 
+void slb_shadow_clear_all(void)
+{
+        int i;
+
+        for (i = 0; i < SLB_NUM_BOLTED; i++)
+                slb_shadow_clear(i);
+}
+
 static inline void create_shadowed_slbe(unsigned long ea, int ssize,
                                         unsigned long flags,
                                         unsigned long entry)
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index fc48b96c81bf..412e6b42986f 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -29,6 +29,7 @@
 #include <asm/vdso_datapage.h>
 #include <asm/pSeries_reconfig.h>
 #include "xics.h"
+#include "plpar_wrappers.h"
 
 /* This version can't take the spinlock, because it never returns */
 static struct rtas_args rtas_stop_self_args = {
@@ -58,6 +59,7 @@ static void pseries_mach_cpu_die(void)
         local_irq_disable();
         idle_task_exit();
         xics_teardown_cpu(0);
+        unregister_slb_shadow(hard_smp_processor_id(), __pa(get_slb_shadow()));
         rtas_stop_self();
         /* Should never get here... */
         BUG();
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 9a455d46379d..34317aa148a8 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -272,6 +272,7 @@ void vpa_init(int cpu)
          */
         addr = __pa(&slb_shadow[cpu]);
         if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
+                slb_shadow_clear_all();
                 ret = register_slb_shadow(hwcpu, addr);
                 if (ret)
                         printk(KERN_ERR