Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:
 "Here's a first pull request for powerpc updates for 3.18.

  The bulk of the additions are for the "cxl" driver, for IBM's Coherent
  Accelerator Processor Interface (CAPI).  Most of it's in drivers/misc,
  which Greg & Arnd maintain, Greg said he was happy for us to take it
  through our tree.

  There's the usual minor cleanups and fixes, including a bit of noise
  in drivers from some of those.  A bunch of updates to our EEH code,
  which has been getting more testing.  Several nice speedups from
  Anton, including 20% in clear_page().

  And a bunch of updates for freescale from Scott"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (130 commits)
  cxl: Fix afu_read() not doing finish_wait() on signal or non-blocking
  cxl: Add documentation for userspace APIs
  cxl: Add driver to Kbuild and Makefiles
  cxl: Add userspace header file
  cxl: Driver code for powernv PCIe based cards for userspace access
  cxl: Add base builtin support
  powerpc/mm: Add hooks for cxl
  powerpc/opal: Add PHB to cxl mode call
  powerpc/mm: Add new hash_page_mm()
  powerpc/powerpc: Add new PCIe functions for allocating cxl interrupts
  cxl: Add new header for call backs and structs
  powerpc/powernv: Split out set MSI IRQ chip code
  powerpc/mm: Export mmu_kernel_ssize and mmu_linear_psize
  powerpc/msi: Improve IRQ bitmap allocator
  powerpc/cell: Make spu_flush_all_slbs() generic
  powerpc/cell: Move data segment faulting code out of cell platform
  powerpc/cell: Move spu_handle_mm_fault() out of cell platform
  powerpc/pseries: Use new defines when calling H_SET_MODE
  powerpc: Update contact info in Documentation files
  powerpc/perf/hv-24x7: Simplify catalog_read()
  ...

11 files changed, 77 insertions, 76 deletions

diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c
index 2d8bf15879fd..fc44ad0475f8 100644
--- a/arch/powerpc/platforms/pseries/cmm.c
+++ b/arch/powerpc/platforms/pseries/cmm.c
@@ -555,7 +555,6 @@ static int cmm_mem_going_offline(void *arg)
                                 pa_last = pa_last->next;
                                 free_page((unsigned long)cmm_page_list);
                                 cmm_page_list = pa_last;
-                                continue;
                         }
                 }
                 pa_curr = pa_curr->next;
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index a2450b8a50a5..fdf01b660d59 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -17,6 +17,7 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 #include "offline_states.h"
+#include "pseries.h"
 
 #include <asm/prom.h>
 #include <asm/machdep.h>
@@ -363,7 +364,8 @@ static int dlpar_online_cpu(struct device_node *dn)
         int rc = 0;
         unsigned int cpu;
         int len, nthreads, i;
-        const u32 *intserv;
+        const __be32 *intserv;
+        u32 thread;
 
         intserv = of_get_property(dn, "ibm,ppc-interrupt-server#s", &len);
         if (!intserv)
@@ -373,8 +375,9 @@ static int dlpar_online_cpu(struct device_node *dn)
 
         cpu_maps_update_begin();
         for (i = 0; i < nthreads; i++) {
+                thread = be32_to_cpu(intserv[i]);
                 for_each_present_cpu(cpu) {
-                        if (get_hard_smp_processor_id(cpu) != intserv[i])
+                        if (get_hard_smp_processor_id(cpu) != thread)
                                 continue;
                         BUG_ON(get_cpu_current_state(cpu)
                                         != CPU_STATE_OFFLINE);
@@ -388,7 +391,7 @@ static int dlpar_online_cpu(struct device_node *dn)
                 }
                 if (cpu == num_possible_cpus())
                         printk(KERN_WARNING "Could not find cpu to online "
-                               "with physical id 0x%x\n", intserv[i]);
+                               "with physical id 0x%x\n", thread);
         }
         cpu_maps_update_done();
 
@@ -442,7 +445,8 @@ static int dlpar_offline_cpu(struct device_node *dn)
         int rc = 0;
         unsigned int cpu;
         int len, nthreads, i;
-        const u32 *intserv;
+        const __be32 *intserv;
+        u32 thread;
 
         intserv = of_get_property(dn, "ibm,ppc-interrupt-server#s", &len);
         if (!intserv)
@@ -452,8 +456,9 @@ static int dlpar_offline_cpu(struct device_node *dn)
 
         cpu_maps_update_begin();
         for (i = 0; i < nthreads; i++) {
+                thread = be32_to_cpu(intserv[i]);
                 for_each_present_cpu(cpu) {
-                        if (get_hard_smp_processor_id(cpu) != intserv[i])
+                        if (get_hard_smp_processor_id(cpu) != thread)
                                 continue;
 
                         if (get_cpu_current_state(cpu) == CPU_STATE_OFFLINE)
@@ -475,14 +480,14 @@ static int dlpar_offline_cpu(struct device_node *dn)
                          * Upgrade it's state to CPU_STATE_OFFLINE.
                          */
                         set_preferred_offline_state(cpu, CPU_STATE_OFFLINE);
-                        BUG_ON(plpar_hcall_norets(H_PROD, intserv[i])
+                        BUG_ON(plpar_hcall_norets(H_PROD, thread)
                                                                 != H_SUCCESS);
                         __cpu_die(cpu);
                         break;
                 }
                 if (cpu == num_possible_cpus())
                         printk(KERN_WARNING "Could not find cpu to offline "
-                               "with physical id 0x%x\n", intserv[i]);
+                               "with physical id 0x%x\n", thread);
         }
         cpu_maps_update_done();
 
@@ -494,15 +499,15 @@ out:
 static ssize_t dlpar_cpu_release(const char *buf, size_t count)
 {
         struct device_node *dn;
-        const u32 *drc_index;
+        u32 drc_index;
         int rc;
 
         dn = of_find_node_by_path(buf);
         if (!dn)
                 return -EINVAL;
 
-        drc_index = of_get_property(dn, "ibm,my-drc-index", NULL);
-        if (!drc_index) {
+        rc = of_property_read_u32(dn, "ibm,my-drc-index", &drc_index);
+        if (rc) {
                 of_node_put(dn);
                 return -EINVAL;
         }
@@ -513,7 +518,7 @@ static ssize_t dlpar_cpu_release(const char *buf, size_t count)
                 return -EINVAL;
         }
 
-        rc = dlpar_release_drc(*drc_index);
+        rc = dlpar_release_drc(drc_index);
         if (rc) {
                 of_node_put(dn);
                 return rc;
@@ -521,7 +526,7 @@ static ssize_t dlpar_cpu_release(const char *buf, size_t count)
 
         rc = dlpar_detach_node(dn);
         if (rc) {
-                dlpar_acquire_drc(*drc_index);
+                dlpar_acquire_drc(drc_index);
                 return rc;
         }
 
diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c
index b08053819d99..a6c7e19f5eb3 100644
--- a/arch/powerpc/platforms/pseries/eeh_pseries.c
+++ b/arch/powerpc/platforms/pseries/eeh_pseries.c
@@ -88,29 +88,14 @@ static int pseries_eeh_init(void)
          * and its variant since the old firmware probably support address
          * of domain/bus/slot/function for EEH RTAS operations.
          */
-        if (ibm_set_eeh_option == RTAS_UNKNOWN_SERVICE) {
-                pr_warn("%s: RTAS service <ibm,set-eeh-option> invalid\n",
-                        __func__);
-                return -EINVAL;
-        } else if (ibm_set_slot_reset == RTAS_UNKNOWN_SERVICE) {
-                pr_warn("%s: RTAS service <ibm,set-slot-reset> invalid\n",
-                        __func__);
-                return -EINVAL;
-        } else if (ibm_read_slot_reset_state2 == RTAS_UNKNOWN_SERVICE &&
-                   ibm_read_slot_reset_state == RTAS_UNKNOWN_SERVICE) {
-                pr_warn("%s: RTAS service <ibm,read-slot-reset-state2> and "
-                        "<ibm,read-slot-reset-state> invalid\n",
-                        __func__);
-                return -EINVAL;
-        } else if (ibm_slot_error_detail == RTAS_UNKNOWN_SERVICE) {
-                pr_warn("%s: RTAS service <ibm,slot-error-detail> invalid\n",
-                        __func__);
-                return -EINVAL;
-        } else if (ibm_configure_pe == RTAS_UNKNOWN_SERVICE &&
-                   ibm_configure_bridge == RTAS_UNKNOWN_SERVICE) {
-                pr_warn("%s: RTAS service <ibm,configure-pe> and "
-                        "<ibm,configure-bridge> invalid\n",
-                        __func__);
+        if (ibm_set_eeh_option == RTAS_UNKNOWN_SERVICE          ||
+            ibm_set_slot_reset == RTAS_UNKNOWN_SERVICE          ||
+            (ibm_read_slot_reset_state2 == RTAS_UNKNOWN_SERVICE &&
+             ibm_read_slot_reset_state == RTAS_UNKNOWN_SERVICE) ||
+            ibm_slot_error_detail == RTAS_UNKNOWN_SERVICE       ||
+            (ibm_configure_pe == RTAS_UNKNOWN_SERVICE           &&
+             ibm_configure_bridge == RTAS_UNKNOWN_SERVICE)) {
+                pr_info("EEH functionality not supported\n");
                 return -EINVAL;
         }
 
@@ -118,11 +103,11 @@ static int pseries_eeh_init(void)
         spin_lock_init(&slot_errbuf_lock);
         eeh_error_buf_size = rtas_token("rtas-error-log-max");
         if (eeh_error_buf_size == RTAS_UNKNOWN_SERVICE) {
-                pr_warn("%s: unknown EEH error log size\n",
+                pr_info("%s: unknown EEH error log size\n",
                         __func__);
                 eeh_error_buf_size = 1024;
         } else if (eeh_error_buf_size > RTAS_ERROR_LOG_MAX) {
-                pr_warn("%s: EEH error log size %d exceeds the maximal %d\n",
+                pr_info("%s: EEH error log size %d exceeds the maximal %d\n",
                         __func__, eeh_error_buf_size, RTAS_ERROR_LOG_MAX);
                 eeh_error_buf_size = RTAS_ERROR_LOG_MAX;
         }
@@ -349,7 +334,9 @@ static int pseries_eeh_set_option(struct eeh_pe *pe, int option)
                 if (pe->addr)
                         config_addr = pe->addr;
                 break;
-
+        case EEH_OPT_FREEZE_PE:
+                /* Not support */
+                return 0;
         default:
                 pr_err("%s: Invalid option %d\n",
                         __func__, option);
@@ -729,6 +716,7 @@ static struct eeh_ops pseries_eeh_ops = {
         .wait_state             = pseries_eeh_wait_state,
         .get_log                = pseries_eeh_get_log,
         .configure_bridge       = pseries_eeh_configure_bridge,
+        .err_inject             = NULL,
         .read_config            = pseries_eeh_read_config,
         .write_config           = pseries_eeh_write_config,
         .next_error             = NULL,
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index 20d62975856f..b174fa751d26 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -90,7 +90,7 @@ static void rtas_stop_self(void)
 {
         static struct rtas_args args = {
                 .nargs = 0,
-                .nret = 1,
+                .nret = cpu_to_be32(1),
                 .rets = &args.args[0],
         };
 
@@ -312,7 +312,8 @@ static void pseries_remove_processor(struct device_node *np)
 {
         unsigned int cpu;
         int len, nthreads, i;
-        const u32 *intserv;
+        const __be32 *intserv;
+        u32 thread;
 
         intserv = of_get_property(np, "ibm,ppc-interrupt-server#s", &len);
         if (!intserv)
@@ -322,8 +323,9 @@ static void pseries_remove_processor(struct device_node *np)
 
         cpu_maps_update_begin();
         for (i = 0; i < nthreads; i++) {
+                thread = be32_to_cpu(intserv[i]);
                 for_each_present_cpu(cpu) {
-                        if (get_hard_smp_processor_id(cpu) != intserv[i])
+                        if (get_hard_smp_processor_id(cpu) != thread)
                                 continue;
                         BUG_ON(cpu_online(cpu));
                         set_cpu_present(cpu, false);
@@ -332,7 +334,7 @@ static void pseries_remove_processor(struct device_node *np)
                 }
                 if (cpu >= nr_cpu_ids)
                         printk(KERN_WARNING "Could not find cpu to remove "
-                               "with physical id 0x%x\n", intserv[i]);
+                               "with physical id 0x%x\n", thread);
         }
         cpu_maps_update_done();
 }
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 34064f50945e..3c4c0dcd90d3 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -20,6 +20,7 @@
 #include <asm/machdep.h>
 #include <asm/prom.h>
 #include <asm/sparsemem.h>
+#include "pseries.h"
 
 unsigned long pseries_memory_block_size(void)
 {
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 4642d6a4d356..de1ec54a2a57 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -329,16 +329,16 @@ struct direct_window {
 
 /* Dynamic DMA Window support */
 struct ddw_query_response {
-        __be32 windows_available;
-        __be32 largest_available_block;
-        __be32 page_size;
-        __be32 migration_capable;
+        u32 windows_available;
+        u32 largest_available_block;
+        u32 page_size;
+        u32 migration_capable;
 };
 
 struct ddw_create_response {
-        __be32 liobn;
-        __be32 addr_hi;
-        __be32 addr_lo;
+        u32 liobn;
+        u32 addr_hi;
+        u32 addr_lo;
 };
 
 static LIST_HEAD(direct_window_list);
@@ -725,16 +725,18 @@ static void remove_ddw(struct device_node *np, bool remove_prop)
 {
         struct dynamic_dma_window_prop *dwp;
         struct property *win64;
-        const u32 *ddw_avail;
+        u32 ddw_avail[3];
         u64 liobn;
-        int len, ret = 0;
+        int ret = 0;
+
+        ret = of_property_read_u32_array(np, "ibm,ddw-applicable",
+                                         &ddw_avail[0], 3);
 
-        ddw_avail = of_get_property(np, "ibm,ddw-applicable", &len);
         win64 = of_find_property(np, DIRECT64_PROPNAME, NULL);
         if (!win64)
                 return;
 
-        if (!ddw_avail || len < 3 * sizeof(u32) || win64->length < sizeof(*dwp))
+        if (ret || win64->length < sizeof(*dwp))
                 goto delprop;
 
         dwp = win64->value;
@@ -872,8 +874,9 @@ static int create_ddw(struct pci_dev *dev, const u32 *ddw_avail,
 
         do {
                 /* extra outputs are LIOBN and dma-addr (hi, lo) */
-                ret = rtas_call(ddw_avail[1], 5, 4, (u32 *)create, cfg_addr,
-                                BUID_HI(buid), BUID_LO(buid), page_shift, window_shift);
+                ret = rtas_call(ddw_avail[1], 5, 4, (u32 *)create,
+                                cfg_addr, BUID_HI(buid), BUID_LO(buid),
+                                page_shift, window_shift);
         } while (rtas_busy_delay(ret));
         dev_info(&dev->dev,
                 "ibm,create-pe-dma-window(%x) %x %x %x %x %x returned %d "
@@ -910,7 +913,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)
         int page_shift;
         u64 dma_addr, max_addr;
         struct device_node *dn;
-        const u32 *uninitialized_var(ddw_avail);
+        u32 ddw_avail[3];
         struct direct_window *window;
         struct property *win64;
         struct dynamic_dma_window_prop *ddwprop;
@@ -942,8 +945,9 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)
          * for the given node in that order.
          * the property is actually in the parent, not the PE
          */
-        ddw_avail = of_get_property(pdn, "ibm,ddw-applicable", &len);
-        if (!ddw_avail || len < 3 * sizeof(u32))
+        ret = of_property_read_u32_array(pdn, "ibm,ddw-applicable",
+                                         &ddw_avail[0], 3);
+        if (ret)
                 goto out_failed;
 
        /*
@@ -966,11 +970,11 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)
                 dev_dbg(&dev->dev, "no free dynamic windows");
                 goto out_failed;
         }
-        if (be32_to_cpu(query.page_size) & 4) {
+        if (query.page_size & 4) {
                 page_shift = 24; /* 16MB */
-        } else if (be32_to_cpu(query.page_size) & 2) {
+        } else if (query.page_size & 2) {
                 page_shift = 16; /* 64kB */
-        } else if (be32_to_cpu(query.page_size) & 1) {
+        } else if (query.page_size & 1) {
                 page_shift = 12; /* 4kB */
         } else {
                 dev_dbg(&dev->dev, "no supported direct page size in mask %x",
@@ -980,7 +984,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)
         /* verify the window * number of ptes will map the partition */
         /* check largest block * page size > max memory hotplug addr */
         max_addr = memory_hotplug_max();
-        if (be32_to_cpu(query.largest_available_block) < (max_addr >> page_shift)) {
+        if (query.largest_available_block < (max_addr >> page_shift)) {
                 dev_dbg(&dev->dev, "can't map partiton max 0x%llx with %u "
                           "%llu-sized pages\n", max_addr,  query.largest_available_block,
                           1ULL << page_shift);
@@ -1006,8 +1010,9 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)
         if (ret != 0)
                 goto out_free_prop;
 
-        ddwprop->liobn = create.liobn;
-        ddwprop->dma_base = cpu_to_be64(of_read_number(&create.addr_hi, 2));
+        ddwprop->liobn = cpu_to_be32(create.liobn);
+        ddwprop->dma_base = cpu_to_be64(((u64)create.addr_hi << 32) |
+                        create.addr_lo);
         ddwprop->tce_shift = cpu_to_be32(page_shift);
         ddwprop->window_shift = cpu_to_be32(len);
 
@@ -1039,7 +1044,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)
         list_add(&window->list, &direct_window_list);
         spin_unlock(&direct_window_list_lock);
 
-        dma_addr = of_read_number(&create.addr_hi, 2);
+        dma_addr = be64_to_cpu(ddwprop->dma_base);
         goto out_unlock;
 
 out_free_window:
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 34e64237fff9..8c509d5397c6 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -59,8 +59,6 @@ EXPORT_SYMBOL(plpar_hcall);
 EXPORT_SYMBOL(plpar_hcall9);
 EXPORT_SYMBOL(plpar_hcall_norets);
 
-extern void pSeries_find_serial_port(void);
-
 void vpa_init(int cpu)
 {
         int hwcpu = get_hard_smp_processor_id(cpu);
@@ -642,7 +640,7 @@ EXPORT_SYMBOL(arch_free_page);
 #endif
 
 #ifdef CONFIG_TRACEPOINTS
-#ifdef CONFIG_JUMP_LABEL
+#ifdef HAVE_JUMP_LABEL
 struct static_key hcall_tracepoint_key = STATIC_KEY_INIT;
 
 void hcall_tracepoint_regfunc(void)
diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c
index 0cc240b7f694..11a3b617ef5d 100644
--- a/arch/powerpc/platforms/pseries/nvram.c
+++ b/arch/powerpc/platforms/pseries/nvram.c
@@ -276,8 +276,10 @@ static ssize_t pSeries_nvram_get_size(void)
  * sequence #: The unique sequence # for each event. (until it wraps)
  * error log: The error log from event_scan
  */
-int nvram_write_os_partition(struct nvram_os_partition *part, char * buff,
-                int length, unsigned int err_type, unsigned int error_log_cnt)
+static int nvram_write_os_partition(struct nvram_os_partition *part,
+                                    char *buff, int length,
+                                    unsigned int err_type,
+                                    unsigned int error_log_cnt)
 {
         int rc;
         loff_t tmp_index;
@@ -330,9 +332,9 @@ int nvram_write_error_log(char * buff, int length,
  *
  * Reads nvram partition for at most 'length'
  */
-int nvram_read_partition(struct nvram_os_partition *part, char *buff,
-                        int length, unsigned int *err_type,
-                        unsigned int *error_log_cnt)
+static int nvram_read_partition(struct nvram_os_partition *part, char *buff,
+                                int length, unsigned int *err_type,
+                                unsigned int *error_log_cnt)
 {
         int rc;
         loff_t tmp_index;
diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c
index c413ec158ff5..67e48594040c 100644
--- a/arch/powerpc/platforms/pseries/pci.c
+++ b/arch/powerpc/platforms/pseries/pci.c
@@ -29,6 +29,7 @@
 #include <asm/pci-bridge.h>
 #include <asm/prom.h>
 #include <asm/ppc-pci.h>
+#include "pseries.h"
 
 #if 0
 void pcibios_name_device(struct pci_dev *dev)
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index dff05b9eb946..5a4d0fc03b03 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -126,7 +126,7 @@ struct epow_errorlog {
 #define EPOW_MAIN_ENCLOSURE             5
 #define EPOW_POWER_OFF                  7
 
-void rtas_parse_epow_errlog(struct rtas_error_log *log)
+static void rtas_parse_epow_errlog(struct rtas_error_log *log)
 {
         struct pseries_errorlog *pseries_log;
         struct epow_errorlog *epow_log;
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index e724d3186e73..125c589eeef5 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -561,7 +561,7 @@ void pSeries_coalesce_init(void)
  * fw_cmo_feature_init - FW_FEATURE_CMO is not stored in ibm,hypertas-functions,
  * handle that here. (Stolen from parse_system_parameter_string)
  */
-void pSeries_cmo_feature_init(void)
+static void pSeries_cmo_feature_init(void)
 {
         char *ptr, *key, *value, *end;
         int call_status;