Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Pull powerpc updates from Ben Herrenschmidt:
 "Here is the bulk of the powerpc changes for this merge window.  It got
  a bit delayed in part because I wasn't paying attention, and in part
  because I discovered I had a core PCI change without a PCI maintainer
  ack in it.  Bjorn eventually agreed it was ok to merge it though we'll
  probably improve it later and I didn't want to rebase to add his ack.

  There is going to be a bit more next week, essentially fixes that I
  still want to sort through and test.

  The biggest item this time is the support to build the ppc64 LE kernel
  with our new v2 ABI.  We previously supported v2 userspace but the
  kernel itself was a tougher nut to crack.  This is now sorted mostly
  thanks to Anton and Rusty.

  We also have a fairly big series from Cedric that add support for
  64-bit LE zImage boot wrapper.  This was made harder by the fact that
  traditionally our zImage wrapper was always 32-bit, but our new LE
  toolchains don't really support 32-bit anymore (it's somewhat there
  but not really "supported") so we didn't want to rely on it.  This
  meant more churn that just endian fixes.

  This brings some more LE bits as well, such as the ability to run in
  LE mode without a hypervisor (ie. under OPAL firmware) by doing the
  right OPAL call to reinitialize the CPU to take HV interrupts in the
  right mode and the usual pile of endian fixes.

  There's another series from Gavin adding EEH improvements (one day we
  *will* have a release with less than 20 EEH patches, I promise!).

  Another highlight is the support for the "Split core" functionality on
  P8 by Michael.  This allows a P8 core to be split into "sub cores" of
  4 threads which allows the subcores to run different guests under KVM
  (the HW still doesn't support a partition per thread).

  And then the usual misc bits and fixes ..."

[ Further delayed by gmail deciding that BenH is a dirty spammer.
  Google knows.  ]

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (155 commits)
  powerpc/powernv: Add missing include to LPC code
  selftests/powerpc: Test the THP bug we fixed in the previous commit
  powerpc/mm: Check paca psize is up to date for huge mappings
  powerpc/powernv: Pass buffer size to OPAL validate flash call
  powerpc/pseries: hcall functions are exported to modules, need _GLOBAL_TOC()
  powerpc: Exported functions __clear_user and copy_page use r2 so need _GLOBAL_TOC()
  powerpc/powernv: Set memory_block_size_bytes to 256MB
  powerpc: Allow ppc_md platform hook to override memory_block_size_bytes
  powerpc/powernv: Fix endian issues in memory error handling code
  powerpc/eeh: Skip eeh sysfs when eeh is disabled
  powerpc: 64bit sendfile is capped at 2GB
  powerpc/powernv: Provide debugfs access to the LPC bus via OPAL
  powerpc/serial: Use saner flags when creating legacy ports
  powerpc: Add cpu family documentation
  powerpc/xmon: Fix up xmon format strings
  powerpc/powernv: Add calls to support little endian host
  powerpc: Document sysfs DSCR interface
  powerpc: Fix regression of per-CPU DSCR setting
  powerpc: Split __SYSFS_SPRSETUP macro
  arch: powerpc/fadump: Cleaning up inconsistent NULL checks
  ...

6 files changed, 62 insertions, 22 deletions

diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c
index 8a8f0472d98f..0bec0c02c5e7 100644
--- a/arch/powerpc/platforms/pseries/eeh_pseries.c
+++ b/arch/powerpc/platforms/pseries/eeh_pseries.c
@@ -175,6 +175,36 @@ static int pseries_eeh_find_cap(struct device_node *dn, int cap)
         return 0;
 }
 
+static int pseries_eeh_find_ecap(struct device_node *dn, int cap)
+{
+        struct pci_dn *pdn = PCI_DN(dn);
+        struct eeh_dev *edev = of_node_to_eeh_dev(dn);
+        u32 header;
+        int pos = 256;
+        int ttl = (4096 - 256) / 8;
+
+        if (!edev || !edev->pcie_cap)
+                return 0;
+        if (rtas_read_config(pdn, pos, 4, &header) != PCIBIOS_SUCCESSFUL)
+                return 0;
+        else if (!header)
+                return 0;
+
+        while (ttl-- > 0) {
+                if (PCI_EXT_CAP_ID(header) == cap && pos)
+                        return pos;
+
+                pos = PCI_EXT_CAP_NEXT(header);
+                if (pos < 256)
+                        break;
+
+                if (rtas_read_config(pdn, pos, 4, &header) != PCIBIOS_SUCCESSFUL)
+                        break;
+        }
+
+        return 0;
+}
+
 /**
  * pseries_eeh_of_probe - EEH probe on the given device
  * @dn: OF node
@@ -220,7 +250,9 @@ static void *pseries_eeh_of_probe(struct device_node *dn, void *flag)
          * or PCIe switch downstream port.
          */
         edev->class_code = class_code;
+        edev->pcix_cap = pseries_eeh_find_cap(dn, PCI_CAP_ID_PCIX);
         edev->pcie_cap = pseries_eeh_find_cap(dn, PCI_CAP_ID_EXP);
+        edev->aer_cap = pseries_eeh_find_ecap(dn, PCI_EXT_CAP_ID_ERR);
         edev->mode &= 0xFFFFFF00;
         if ((edev->class_code >> 8) == PCI_CLASS_BRIDGE_PCI) {
                 edev->mode |= EEH_DEV_BRIDGE;
@@ -464,6 +496,7 @@ static int pseries_eeh_get_state(struct eeh_pe *pe, int *state)
                         } else {
                                 result = EEH_STATE_NOT_SUPPORT;
                         }
+                        break;
                 default:
                         result = EEH_STATE_NOT_SUPPORT;
                 }
@@ -499,11 +532,19 @@ static int pseries_eeh_reset(struct eeh_pe *pe, int option)
         /* If fundamental-reset not supported, try hot-reset */
         if (option == EEH_RESET_FUNDAMENTAL &&
             ret == -8) {
+                option = EEH_RESET_HOT;
                 ret = rtas_call(ibm_set_slot_reset, 4, 1, NULL,
                                 config_addr, BUID_HI(pe->phb->buid),
-                                BUID_LO(pe->phb->buid), EEH_RESET_HOT);
+                                BUID_LO(pe->phb->buid), option);
         }
 
+        /* We need reset hold or settlement delay */
+        if (option == EEH_RESET_FUNDAMENTAL ||
+            option == EEH_RESET_HOT)
+                msleep(EEH_PE_RST_HOLD_TIME);
+        else
+                msleep(EEH_PE_RST_SETTLE_TIME);
+
         return ret;
 }
 
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 7f75c94af822..7995135170a3 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -21,7 +21,7 @@
 #include <asm/prom.h>
 #include <asm/sparsemem.h>
 
-static unsigned long get_memblock_size(void)
+unsigned long pseries_memory_block_size(void)
 {
         struct device_node *np;
         unsigned int memblock_size = MIN_MEMORY_BLOCK_SIZE;
@@ -64,17 +64,6 @@ static unsigned long get_memblock_size(void)
         return memblock_size;
 }
 
-/* WARNING: This is going to override the generic definition whenever
- * pseries is built-in regardless of what platform is active at boot
- * time. This is fine for now as this is the only "option" and it
- * should work everywhere. If not, we'll have to turn this into a
- * ppc_md. callback
- */
-unsigned long memory_block_size_bytes(void)
-{
-        return get_memblock_size();
-}
-
 #ifdef CONFIG_MEMORY_HOTREMOVE
 static int pseries_remove_memory(u64 start, u64 size)
 {
@@ -105,7 +94,7 @@ static int pseries_remove_memblock(unsigned long base, unsigned int memblock_siz
         if (!pfn_valid(start_pfn))
                 goto out;
 
-        block_sz = memory_block_size_bytes();
+        block_sz = pseries_memory_block_size();
         sections_per_block = block_sz / MIN_MEMORY_BLOCK_SIZE;
         nid = memory_add_physaddr_to_nid(base);
 
@@ -201,7 +190,7 @@ static int pseries_update_drconf_memory(struct of_prop_reconfig *pr)
         u32 *p;
         int i, rc = -EINVAL;
 
-        memblock_size = get_memblock_size();
+        memblock_size = pseries_memory_block_size();
         if (!memblock_size)
                 return -EINVAL;
 
diff --git a/arch/powerpc/platforms/pseries/hvCall.S b/arch/powerpc/platforms/pseries/hvCall.S
index 444fe7759e55..99ecf0a5a929 100644
--- a/arch/powerpc/platforms/pseries/hvCall.S
+++ b/arch/powerpc/platforms/pseries/hvCall.S
@@ -49,7 +49,7 @@ END_FTR_SECTION(0, 1);						\
         std     r0,16(r1);                                      \
         addi    r4,r1,STK_PARAM(FIRST_REG);                     \
         stdu    r1,-STACK_FRAME_OVERHEAD(r1);                   \
-        bl      .__trace_hcall_entry;                           \
+        bl      __trace_hcall_entry;                            \
         addi    r1,r1,STACK_FRAME_OVERHEAD;                     \
         ld      r0,16(r1);                                      \
         ld      r3,STK_PARAM(R3)(r1);                           \
@@ -83,7 +83,7 @@ END_FTR_SECTION(0, 1);						\
         mr      r3,r6;                                          \
         std     r0,16(r1);                                      \
         stdu    r1,-STACK_FRAME_OVERHEAD(r1);                   \
-        bl      .__trace_hcall_exit;                            \
+        bl      __trace_hcall_exit;                             \
         addi    r1,r1,STACK_FRAME_OVERHEAD;                     \
         ld      r0,16(r1);                                      \
         ld      r3,STK_PARAM(R3)(r1);                           \
@@ -106,7 +106,7 @@ END_FTR_SECTION(0, 1);						\
 
         .text
 
-_GLOBAL(plpar_hcall_norets)
+_GLOBAL_TOC(plpar_hcall_norets)
         HMT_MEDIUM
 
         mfcr    r0
@@ -122,7 +122,7 @@ _GLOBAL(plpar_hcall_norets)
         mtcrf   0xff,r0
         blr                             /* return r3 = status */
 
-_GLOBAL(plpar_hcall)
+_GLOBAL_TOC(plpar_hcall)
         HMT_MEDIUM
 
         mfcr    r0
@@ -188,7 +188,7 @@ _GLOBAL(plpar_hcall_raw)
 
         blr                             /* return r3 = status */
 
-_GLOBAL(plpar_hcall9)
+_GLOBAL_TOC(plpar_hcall9)
         HMT_MEDIUM
 
         mfcr    r0
diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h
index 99219530ea4a..361add62abf1 100644
--- a/arch/powerpc/platforms/pseries/pseries.h
+++ b/arch/powerpc/platforms/pseries/pseries.h
@@ -64,4 +64,6 @@ extern int dlpar_detach_node(struct device_node *);
 struct pci_host_bridge;
 int pseries_root_bridge_prepare(struct pci_host_bridge *bridge);
 
+unsigned long pseries_memory_block_size(void);
+
 #endif /* _PSERIES_PSERIES_H */
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 099d2df976a2..f2f40e64658f 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -510,7 +510,11 @@ static void __init pSeries_setup_arch(void)
 static int __init pSeries_init_panel(void)
 {
         /* Manually leave the kernel version on the panel. */
+#ifdef __BIG_ENDIAN__
         ppc_md.progress("Linux ppc64\n", 0);
+#else
+        ppc_md.progress("Linux ppc64le\n", 0);
+#endif
         ppc_md.progress(init_utsname()->version, 0);
 
         return 0;
@@ -806,4 +810,7 @@ define_machine(pseries) {
 #ifdef CONFIG_KEXEC
         .machine_kexec          = pSeries_machine_kexec,
 #endif
+#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
+        .memory_block_size      = pseries_memory_block_size,
+#endif
 };
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index 24f58cb0a543..a3555b10c1a5 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -44,6 +44,7 @@
 #include <asm/xics.h>
 #include <asm/dbell.h>
 #include <asm/plpar_wrappers.h>
+#include <asm/code-patching.h>
 
 #include "pseries.h"
 #include "offline_states.h"
@@ -96,8 +97,8 @@ int smp_query_cpu_stopped(unsigned int pcpu)
 static inline int smp_startup_cpu(unsigned int lcpu)
 {
         int status;
-        unsigned long start_here = __pa((u32)*((unsigned long *)
-                                               generic_secondary_smp_init));
+        unsigned long start_here =
+                        __pa(ppc_function_entry(generic_secondary_smp_init));
         unsigned int pcpu;
         int start_cpu;