Merge tag 'powerpc-3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

 - Update of all defconfigs

 - Addition of a bunch of config options to modernise our defconfigs

 - Some PS3 updates from Geoff

 - Optimised memcmp for 64 bit from Anton

 - Fix for kprobes that allows 'perf probe' to work from Naveen

 - Several cxl updates from Ian & Ryan

 - Expanded support for the '24x7' PMU from Cody & Sukadev

 - Freescale updates from Scott:
    "Highlights include 8xx optimizations, some more work on datapath
     device tree content, e300 machine check support, t1040 corenet
     error reporting, and various cleanups and fixes"

* tag 'powerpc-3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (102 commits)
  cxl: Add missing return statement after handling AFU errror
  cxl: Fail AFU initialisation if an invalid configuration record is found
  cxl: Export optional AFU configuration record in sysfs
  powerpc/mm: Warn on flushing tlb page in kernel context
  powerpc/powernv: Add OPAL soft-poweroff routine
  powerpc/perf/hv-24x7: Document sysfs event description entries
  powerpc/perf/hv-gpci: add the remaining gpci requests
  powerpc/perf/{hv-gpci, hv-common}: generate requests with counters annotated
  powerpc/perf/hv-24x7: parse catalog and populate sysfs with events
  perf: define EVENT_DEFINE_RANGE_FORMAT_LITE helper
  perf: add PMU_EVENT_ATTR_STRING() helper
  perf: provide sysfs_show for struct perf_pmu_events_attr
  powerpc/kernel: Avoid initializing device-tree pointer twice
  powerpc: Remove old compile time disabled syscall tracing code
  powerpc/kernel: Make syscall_exit a local label
  cxl: Fix device_node reference counting
  powerpc/mm: bail out early when flushing TLB page
  powerpc: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
  perf/powerpc: reset event hw state when adding it to the PMU
  powerpc/qe: Use strlcpy()
  ...

4 files changed, 19 insertions, 27 deletions

diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index 756b482f819a..a758a9c3bbba 100644
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -34,6 +34,16 @@ config PPC_SPLPAR
           processors, that is, which share physical processors between
           two or more partitions.
 
+config DTL
+        bool "Dispatch Trace Log"
+        depends on PPC_SPLPAR && DEBUG_FS
+        help
+          SPLPAR machines can log hypervisor preempt & dispatch events to a
+          kernel buffer. Saying Y here will enable logging these events,
+          which are accessible through a debugfs file.
+
+          Say N if you are unsure.
+
 config PSERIES_MSI
        bool
        depends on PCI_MSI && PPC_PSERIES && EEH
@@ -123,13 +133,3 @@ config HV_PERF_CTRS
           systems. 24x7 is available on Power 8 systems.
 
           If unsure, select Y.
-
-config DTL
-        bool "Dispatch Trace Log"
-        depends on PPC_SPLPAR && DEBUG_FS
-        help
-          SPLPAR machines can log hypervisor preempt & dispatch events to a
-          kernel buffer. Saying Y here will enable logging these events,
-          which are accessible through a debugfs file.
-
-          Say N if you are unsure.
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index f30cf4d136a4..62475440fd45 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -272,7 +272,7 @@ static int pseries_add_processor(struct device_node *np)
                  */
                 printk(KERN_ERR "Cannot add cpu %s; this system configuration"
                        " supports %d logical cpus.\n", np->full_name,
-                       cpumask_weight(cpu_possible_mask));
+                       num_possible_cpus());
                 goto out_unlock;
         }
 
diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c
index e7cb6d4a871a..90cf3dcbd9f2 100644
--- a/arch/powerpc/platforms/pseries/mobility.c
+++ b/arch/powerpc/platforms/pseries/mobility.c
@@ -316,34 +316,24 @@ void post_mobility_fixup(void)
 static ssize_t migrate_store(struct class *class, struct class_attribute *attr,
                              const char *buf, size_t count)
 {
-        struct rtas_args args;
         u64 streamid;
         int rc;
+        int vasi_rc = 0;
 
         rc = kstrtou64(buf, 0, &streamid);
         if (rc)
                 return rc;
 
-        memset(&args, 0, sizeof(args));
-        args.token = rtas_token("ibm,suspend-me");
-        args.nargs = 2;
-        args.nret = 1;
-
-        args.args[0] = streamid >> 32 ;
-        args.args[1] = streamid & 0xffffffff;
-        args.rets = &args.args[args.nargs];
-
         do {
-                args.rets[0] = 0;
-                rc = rtas_ibm_suspend_me(&args);
-                if (!rc && args.rets[0] == RTAS_NOT_SUSPENDABLE)
+                rc = rtas_ibm_suspend_me(streamid, &vasi_rc);
+                if (!rc && vasi_rc == RTAS_NOT_SUSPENDABLE)
                         ssleep(1);
-        } while (!rc && args.rets[0] == RTAS_NOT_SUSPENDABLE);
+        } while (!rc && vasi_rc == RTAS_NOT_SUSPENDABLE);
 
         if (rc)
                 return rc;
-        else if (args.rets[0])
-                return args.rets[0];
+        if (vasi_rc)
+                return vasi_rc;
 
         post_mobility_fixup();
         return count;
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index c3b2a7e81ddb..02e4a1745516 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -89,6 +89,8 @@ static void handle_system_shutdown(char event_modifier)
         case EPOW_SHUTDOWN_ON_UPS:
                 pr_emerg("Loss of power reported by firmware, system is "
                         "running on UPS/battery");
+                pr_emerg("Check RTAS error log for details");
+                orderly_poweroff(true);
                 break;
 
         case EPOW_SHUTDOWN_LOSS_OF_CRITICAL_FUNCTIONS: