6 files changed, 55 insertions, 33 deletions

diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index 894662a5d4d5..243ce69ad685 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -284,7 +284,7 @@ do_kvm_##n:								\
         subi    r1,r1,INT_FRAME_SIZE;   /* alloc frame on kernel stack  */ \
         beq-    1f;                                                        \
         ld      r1,PACAKSAVE(r13);      /* kernel stack to use          */ \
-1:      cmpdi   cr1,r1,0;               /* check if r1 is in userspace  */ \
+1:      cmpdi   cr1,r1,-INT_FRAME_SIZE; /* check if r1 is in userspace  */ \
         blt+    cr1,3f;                 /* abort if it is               */ \
         li      r1,(n);                 /* will be reloaded later       */ \
         sth     r1,PACA_TRAP_SAVE(r13);                                    \
diff --git a/arch/powerpc/include/asm/unaligned.h b/arch/powerpc/include/asm/unaligned.h
index 5f1b1e3c2137..8296381ae432 100644
--- a/arch/powerpc/include/asm/unaligned.h
+++ b/arch/powerpc/include/asm/unaligned.h
@@ -4,13 +4,18 @@
 #ifdef __KERNEL__
 
 /*
- * The PowerPC can do unaligned accesses itself in big endian mode.
+ * The PowerPC can do unaligned accesses itself based on its endian mode.
  */
 #include <linux/unaligned/access_ok.h>
 #include <linux/unaligned/generic.h>
 
+#ifdef __LITTLE_ENDIAN__
+#define get_unaligned   __get_unaligned_le
+#define put_unaligned   __put_unaligned_le
+#else
 #define get_unaligned   __get_unaligned_be
 #define put_unaligned   __put_unaligned_be
+#endif
 
 #endif  /* __KERNEL__ */
 #endif  /* _ASM_POWERPC_UNALIGNED_H */
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 2ae41aba4053..4f0946de2d5c 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -80,6 +80,7 @@ END_FTR_SECTION(0, 1)
          * of the function that the cpu should jump to to continue
          * initialization.
          */
+        .balign 8
         .globl  __secondary_hold_spinloop
 __secondary_hold_spinloop:
         .llong  0x0
@@ -470,6 +471,7 @@ _STATIC(__after_prom_start)
         mtctr   r8
         bctr
 
+.balign 8
 p_end:  .llong  _end - _stext
 
 4:      /* Now copy the rest of the kernel up to _end */
diff --git a/arch/powerpc/lib/copyuser_64.S b/arch/powerpc/lib/copyuser_64.S
index d73a59014900..596a285c0755 100644
--- a/arch/powerpc/lib/copyuser_64.S
+++ b/arch/powerpc/lib/copyuser_64.S
@@ -9,6 +9,14 @@
 #include <asm/processor.h>
 #include <asm/ppc_asm.h>
 
+#ifdef __BIG_ENDIAN__
+#define sLd sld         /* Shift towards low-numbered address. */
+#define sHd srd         /* Shift towards high-numbered address. */
+#else
+#define sLd srd         /* Shift towards low-numbered address. */
+#define sHd sld         /* Shift towards high-numbered address. */
+#endif
+
         .align  7
 _GLOBAL(__copy_tofrom_user)
 BEGIN_FTR_SECTION
@@ -118,10 +126,10 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
 
 24:     ld      r9,0(r4)        /* 3+2n loads, 2+2n stores */
 25:     ld      r0,8(r4)
-        sld     r6,r9,r10
+        sLd     r6,r9,r10
 26:     ldu     r9,16(r4)
-        srd     r7,r0,r11
-        sld     r8,r0,r10
+        sHd     r7,r0,r11
+        sLd     r8,r0,r10
         or      r7,r7,r6
         blt     cr6,79f
 27:     ld      r0,8(r4)
@@ -129,35 +137,35 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
 
 28:     ld      r0,0(r4)        /* 4+2n loads, 3+2n stores */
 29:     ldu     r9,8(r4)
-        sld     r8,r0,r10
+        sLd     r8,r0,r10
         addi    r3,r3,-8
         blt     cr6,5f
 30:     ld      r0,8(r4)
-        srd     r12,r9,r11
-        sld     r6,r9,r10
+        sHd     r12,r9,r11
+        sLd     r6,r9,r10
 31:     ldu     r9,16(r4)
         or      r12,r8,r12
-        srd     r7,r0,r11
-        sld     r8,r0,r10
+        sHd     r7,r0,r11
+        sLd     r8,r0,r10
         addi    r3,r3,16
         beq     cr6,78f
 
 1:      or      r7,r7,r6
 32:     ld      r0,8(r4)
 76:     std     r12,8(r3)
-2:      srd     r12,r9,r11
-        sld     r6,r9,r10
+2:      sHd     r12,r9,r11
+        sLd     r6,r9,r10
 33:     ldu     r9,16(r4)
         or      r12,r8,r12
 77:     stdu    r7,16(r3)
-        srd     r7,r0,r11
-        sld     r8,r0,r10
+        sHd     r7,r0,r11
+        sLd     r8,r0,r10
         bdnz    1b
 
 78:     std     r12,8(r3)
         or      r7,r7,r6
 79:     std     r7,16(r3)
-5:      srd     r12,r9,r11
+5:      sHd     r12,r9,r11
         or      r12,r8,r12
 80:     std     r12,24(r3)
         bne     6f
@@ -165,23 +173,38 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
         blr
 6:      cmpwi   cr1,r5,8
         addi    r3,r3,32
-        sld     r9,r9,r10
+        sLd     r9,r9,r10
         ble     cr1,7f
 34:     ld      r0,8(r4)
-        srd     r7,r0,r11
+        sHd     r7,r0,r11
         or      r9,r7,r9
 7:
         bf      cr7*4+1,1f
+#ifdef __BIG_ENDIAN__
         rotldi  r9,r9,32
+#endif
 94:     stw     r9,0(r3)
+#ifdef __LITTLE_ENDIAN__
+        rotrdi  r9,r9,32
+#endif
         addi    r3,r3,4
 1:      bf      cr7*4+2,2f
+#ifdef __BIG_ENDIAN__
         rotldi  r9,r9,16
+#endif
 95:     sth     r9,0(r3)
+#ifdef __LITTLE_ENDIAN__
+        rotrdi  r9,r9,16
+#endif
         addi    r3,r3,2
 2:      bf      cr7*4+3,3f
+#ifdef __BIG_ENDIAN__
         rotldi  r9,r9,8
+#endif
 96:     stb     r9,0(r3)
+#ifdef __LITTLE_ENDIAN__
+        rotrdi  r9,r9,8
+#endif
 3:      li      r3,0
         blr
 
diff --git a/arch/powerpc/platforms/powernv/eeh-ioda.c b/arch/powerpc/platforms/powernv/eeh-ioda.c
index 02245cee7818..d7ddcee7feb8 100644
--- a/arch/powerpc/platforms/powernv/eeh-ioda.c
+++ b/arch/powerpc/platforms/powernv/eeh-ioda.c
@@ -36,7 +36,6 @@
 #include "powernv.h"
 #include "pci.h"
 
-static char *hub_diag = NULL;
 static int ioda_eeh_nb_init = 0;
 
 static int ioda_eeh_event(struct notifier_block *nb,
@@ -140,15 +139,6 @@ static int ioda_eeh_post_init(struct pci_controller *hose)
                 ioda_eeh_nb_init = 1;
         }
 
-        /* We needn't HUB diag-data on PHB3 */
-        if (phb->type == PNV_PHB_IODA1 && !hub_diag) {
-                hub_diag = (char *)__get_free_page(GFP_KERNEL | __GFP_ZERO);
-                if (!hub_diag) {
-                        pr_err("%s: Out of memory !\n", __func__);
-                        return -ENOMEM;
-                }
-        }
-
 #ifdef CONFIG_DEBUG_FS
         if (phb->dbgfs) {
                 debugfs_create_file("err_injct_outbound", 0600,
@@ -633,11 +623,10 @@ static void ioda_eeh_hub_diag_common(struct OpalIoP7IOCErrorData *data)
 static void ioda_eeh_hub_diag(struct pci_controller *hose)
 {
         struct pnv_phb *phb = hose->private_data;
-        struct OpalIoP7IOCErrorData *data;
+        struct OpalIoP7IOCErrorData *data = &phb->diag.hub_diag;
         long rc;
 
-        data = (struct OpalIoP7IOCErrorData *)ioda_eeh_hub_diag;
-        rc = opal_pci_get_hub_diag_data(phb->hub_id, data, PAGE_SIZE);
+        rc = opal_pci_get_hub_diag_data(phb->hub_id, data, sizeof(*data));
         if (rc != OPAL_SUCCESS) {
                 pr_warning("%s: Failed to get HUB#%llx diag-data (%ld)\n",
                            __func__, phb->hub_id, rc);
@@ -820,14 +809,15 @@ static void ioda_eeh_phb_diag(struct pci_controller *hose)
         struct OpalIoPhbErrorCommon *common;
         long rc;
 
-        common = (struct OpalIoPhbErrorCommon *)phb->diag.blob;
-        rc = opal_pci_get_phb_diag_data2(phb->opal_id, common, PAGE_SIZE);
+        rc = opal_pci_get_phb_diag_data2(phb->opal_id, phb->diag.blob,
+                                         PNV_PCI_DIAG_BUF_SIZE);
         if (rc != OPAL_SUCCESS) {
                 pr_warning("%s: Failed to get diag-data for PHB#%x (%ld)\n",
                             __func__, hose->global_number, rc);
                 return;
         }
 
+        common = (struct OpalIoPhbErrorCommon *)phb->diag.blob;
         switch (common->ioType) {
         case OPAL_PHB_ERROR_DATA_TYPE_P7IOC:
                 ioda_eeh_p7ioc_phb_diag(hose, common);
diff --git a/arch/powerpc/platforms/powernv/pci.h b/arch/powerpc/platforms/powernv/pci.h
index 911c24ef033e..1ed8d5f40f5a 100644
--- a/arch/powerpc/platforms/powernv/pci.h
+++ b/arch/powerpc/platforms/powernv/pci.h
@@ -172,11 +172,13 @@ struct pnv_phb {
                 } ioda;
         };
 
-        /* PHB status structure */
+        /* PHB and hub status structure */
         union {
                 unsigned char                   blob[PNV_PCI_DIAG_BUF_SIZE];
                 struct OpalIoP7IOCPhbErrorData  p7ioc;
+                struct OpalIoP7IOCErrorData     hub_diag;
         } diag;
+
 };
 
 extern struct pci_ops pnv_pci_ops;