8 files changed, 47 insertions, 39 deletions

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index d0af7fb2f344..b9ba86191aed 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -24,7 +24,7 @@ source "arch/powerpc/platforms/wsp/Kconfig"
 
 config KVM_GUEST
         bool "KVM Guest support"
-        default y
+        default n
         ---help---
           This option enables various optimizations for running under the KVM
           hypervisor. Overhead for the kernel when not running inside KVM should
diff --git a/arch/powerpc/platforms/pseries/dtl.c b/arch/powerpc/platforms/pseries/dtl.c
index e9190073bb97..0e8656370063 100644
--- a/arch/powerpc/platforms/pseries/dtl.c
+++ b/arch/powerpc/platforms/pseries/dtl.c
@@ -181,7 +181,7 @@ static void dtl_stop(struct dtl *dtl)
 
         lppaca_of(dtl->cpu).dtl_enable_mask = 0x0;
 
-        unregister_dtl(hwcpu, __pa(dtl->buf));
+        unregister_dtl(hwcpu);
 }
 
 static u64 dtl_current_index(struct dtl *dtl)
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index bc0288501f17..83a3ca2fd282 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -135,7 +135,7 @@ static void pseries_mach_cpu_die(void)
                 get_lppaca()->idle = 0;
 
                 if (get_preferred_offline_state(cpu) == CPU_STATE_ONLINE) {
-                        unregister_slb_shadow(hwcpu, __pa(get_slb_shadow()));
+                        unregister_slb_shadow(hwcpu);
 
                         /*
                          * Call to start_secondary_resume() will not return.
@@ -150,7 +150,7 @@ static void pseries_mach_cpu_die(void)
         WARN_ON(get_preferred_offline_state(cpu) != CPU_STATE_OFFLINE);
 
         set_cpu_current_state(cpu, CPU_STATE_OFFLINE);
-        unregister_slb_shadow(hwcpu, __pa(get_slb_shadow()));
+        unregister_slb_shadow(hwcpu);
         rtas_stop_self();
 
         /* Should never get here... */
diff --git a/arch/powerpc/platforms/pseries/io_event_irq.c b/arch/powerpc/platforms/pseries/io_event_irq.c
index c829e6067d54..2c4dd1fb8333 100644
--- a/arch/powerpc/platforms/pseries/io_event_irq.c
+++ b/arch/powerpc/platforms/pseries/io_event_irq.c
@@ -212,17 +212,15 @@ static int __init ioei_init(void)
         struct device_node *np;
 
         ioei_check_exception_token = rtas_token("check-exception");
-        if (ioei_check_exception_token == RTAS_UNKNOWN_SERVICE) {
-                pr_warning("IO Event IRQ not supported on this system !\n");
+        if (ioei_check_exception_token == RTAS_UNKNOWN_SERVICE)
                 return -ENODEV;
-        }
+
         np = of_find_node_by_path("/event-sources/ibm,io-events");
         if (np) {
                 request_event_sources_irqs(np, ioei_interrupt, "IO_EVENT");
+                pr_info("IBM I/O event interrupts enabled\n");
                 of_node_put(np);
         } else {
-                pr_err("io_event_irq: No ibm,io-events on system! "
-                       "IO Event interrupt disabled.\n");
                 return -ENODEV;
         }
         return 0;
diff --git a/arch/powerpc/platforms/pseries/kexec.c b/arch/powerpc/platforms/pseries/kexec.c
index 54cf3a4aa16b..7d94bdc63d50 100644
--- a/arch/powerpc/platforms/pseries/kexec.c
+++ b/arch/powerpc/platforms/pseries/kexec.c
@@ -25,20 +25,30 @@ static void pseries_kexec_cpu_down(int crash_shutdown, int secondary)
 {
         /* Don't risk a hypervisor call if we're crashing */
         if (firmware_has_feature(FW_FEATURE_SPLPAR) && !crash_shutdown) {
-                unsigned long addr;
+                int ret;
+                int cpu = smp_processor_id();
+                int hwcpu = hard_smp_processor_id();
 
-                addr = __pa(get_slb_shadow());
-                if (unregister_slb_shadow(hard_smp_processor_id(), addr))
-                        printk("SLB shadow buffer deregistration of "
-                               "cpu %u (hw_cpu_id %d) failed\n",
-                               smp_processor_id(),
-                               hard_smp_processor_id());
+                if (get_lppaca()->dtl_enable_mask) {
+                        ret = unregister_dtl(hwcpu);
+                        if (ret) {
+                                pr_err("WARNING: DTL deregistration for cpu "
+                                       "%d (hw %d) failed with %d\n",
+                                       cpu, hwcpu, ret);
+                        }
+                }
+
+                ret = unregister_slb_shadow(hwcpu);
+                if (ret) {
+                        pr_err("WARNING: SLB shadow buffer deregistration "
+                               "for cpu %d (hw %d) failed with %d\n",
+                               cpu, hwcpu, ret);
+                }
 
-                addr = __pa(get_lppaca());
-                if (unregister_vpa(hard_smp_processor_id(), addr)) {
-                        printk("VPA deregistration of cpu %u (hw_cpu_id %d) "
-                                        "failed\n", smp_processor_id(),
-                                        hard_smp_processor_id());
+                ret = unregister_vpa(hwcpu);
+                if (ret) {
+                        pr_err("WARNING: VPA deregistration for cpu %d "
+                               "(hw %d) failed with %d\n", cpu, hwcpu, ret);
                 }
         }
 }
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index f7205d344efd..c9a29dae8c05 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -67,9 +67,8 @@ void vpa_init(int cpu)
         ret = register_vpa(hwcpu, addr);
 
         if (ret) {
-                printk(KERN_ERR "WARNING: vpa_init: VPA registration for "
-                                "cpu %d (hw %d) of area %lx returns %ld\n",
-                                cpu, hwcpu, addr, ret);
+                pr_err("WARNING: VPA registration for cpu %d (hw %d) of area "
+                       "%lx failed with %ld\n", cpu, hwcpu, addr, ret);
                 return;
         }
         /*
@@ -80,10 +79,9 @@ void vpa_init(int cpu)
         if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
                 ret = register_slb_shadow(hwcpu, addr);
                 if (ret)
-                        printk(KERN_ERR
-                               "WARNING: vpa_init: SLB shadow buffer "
-                               "registration for cpu %d (hw %d) of area %lx "
-                               "returns %ld\n", cpu, hwcpu, addr, ret);
+                        pr_err("WARNING: SLB shadow buffer registration for "
+                               "cpu %d (hw %d) of area %lx failed with %ld\n",
+                               cpu, hwcpu, addr, ret);
         }
 
         /*
@@ -100,8 +98,9 @@ void vpa_init(int cpu)
                 dtl->enqueue_to_dispatch_time = DISPATCH_LOG_BYTES;
                 ret = register_dtl(hwcpu, __pa(dtl));
                 if (ret)
-                        pr_warn("DTL registration failed for cpu %d (%ld)\n",
-                                cpu, ret);
+                        pr_err("WARNING: DTL registration of cpu %d (hw %d) "
+                               "failed with %ld\n", smp_processor_id(),
+                               hwcpu, ret);
                 lppaca_of(cpu).dtl_enable_mask = 2;
         }
 }
@@ -204,7 +203,7 @@ static void pSeries_lpar_hptab_clear(void)
                 unsigned long ptel;
         } ptes[4];
         long lpar_rc;
-        int i, j;
+        unsigned long i, j;
 
         /* Read in batches of 4,
          * invalidate only valid entries not in the VRMA
diff --git a/arch/powerpc/platforms/pseries/plpar_wrappers.h b/arch/powerpc/platforms/pseries/plpar_wrappers.h
index 4bf21207d7d3..41c24c146d6a 100644
--- a/arch/powerpc/platforms/pseries/plpar_wrappers.h
+++ b/arch/powerpc/platforms/pseries/plpar_wrappers.h
@@ -53,9 +53,9 @@ static inline long vpa_call(unsigned long flags, unsigned long cpu,
         return plpar_hcall_norets(H_REGISTER_VPA, flags, cpu, vpa);
 }
 
-static inline long unregister_vpa(unsigned long cpu, unsigned long vpa)
+static inline long unregister_vpa(unsigned long cpu)
 {
-        return vpa_call(0x5, cpu, vpa);
+        return vpa_call(0x5, cpu, 0);
 }
 
 static inline long register_vpa(unsigned long cpu, unsigned long vpa)
@@ -63,9 +63,9 @@ static inline long register_vpa(unsigned long cpu, unsigned long vpa)
         return vpa_call(0x1, cpu, vpa);
 }
 
-static inline long unregister_slb_shadow(unsigned long cpu, unsigned long vpa)
+static inline long unregister_slb_shadow(unsigned long cpu)
 {
-        return vpa_call(0x7, cpu, vpa);
+        return vpa_call(0x7, cpu, 0);
 }
 
 static inline long register_slb_shadow(unsigned long cpu, unsigned long vpa)
@@ -73,9 +73,9 @@ static inline long register_slb_shadow(unsigned long cpu, unsigned long vpa)
         return vpa_call(0x3, cpu, vpa);
 }
 
-static inline long unregister_dtl(unsigned long cpu, unsigned long vpa)
+static inline long unregister_dtl(unsigned long cpu)
 {
-        return vpa_call(0x6, cpu, vpa);
+        return vpa_call(0x6, cpu, 0);
 }
 
 static inline long register_dtl(unsigned long cpu, unsigned long vpa)
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index d00e52926b71..0969fd98c4fa 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -324,8 +324,9 @@ static int alloc_dispatch_logs(void)
         dtl->enqueue_to_dispatch_time = DISPATCH_LOG_BYTES;
         ret = register_dtl(hard_smp_processor_id(), __pa(dtl));
         if (ret)
-                pr_warn("DTL registration failed for boot cpu %d (%d)\n",
-                        smp_processor_id(), ret);
+                pr_err("WARNING: DTL registration of cpu %d (hw %d) failed "
+                       "with %d\n", smp_processor_id(),
+                       hard_smp_processor_id(), ret);
         get_paca()->lppaca_ptr->dtl_enable_mask = 2;
 
         return 0;