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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (152 commits)
  powerpc: Fix hard CPU IDs detection
  powerpc/pmac: Update via-pmu to new syscore_ops
  powerpc/kvm: Fix the build for 32-bit Book 3S (classic) processors
  powerpc/kvm: Fix kvmppc_core_pending_dec
  powerpc: Remove last piece of GEMINI
  powerpc: Fix for Pegasos keyboard and mouse
  powerpc: Make early memory scan more resilient to out of order nodes
  powerpc/pseries/iommu: Cleanup ddw naming
  powerpc/pseries/iommu: Find windows after kexec during boot
  powerpc/pseries/iommu: Remove ddw property when destroying window
  powerpc/pseries/iommu: Add additional checks when changing iommu mask
  powerpc/pseries/iommu: Use correct return type in dupe_ddw_if_already_created
  powerpc: Remove unused/obsolete CONFIG_XICS
  misc: Add CARMA DATA-FPGA Programmer support
  misc: Add CARMA DATA-FPGA Access Driver
  powerpc: Make IRQ_NOREQUEST last to clear, first to set
  powerpc: Integrated Flash controller device tree bindings
  powerpc/85xx: Create dts of each core in CAMP mode for P1020RDB
  powerpc/85xx: Fix PCIe IDSEL for Px020RDB
  powerpc/85xx: P2020 DTS: re-organize dts files
  ...

4 files changed, 34 insertions, 48 deletions

diff --git a/arch/powerpc/lib/alloc.c b/arch/powerpc/lib/alloc.c
index f53e09c7dac7..13b676c20d12 100644
--- a/arch/powerpc/lib/alloc.c
+++ b/arch/powerpc/lib/alloc.c
@@ -6,14 +6,6 @@
 
 #include <asm/system.h>
 
-void * __init_refok alloc_maybe_bootmem(size_t size, gfp_t mask)
-{
-        if (mem_init_done)
-                return kmalloc(size, mask);
-        else
-                return alloc_bootmem(size);
-}
-
 void * __init_refok zalloc_maybe_bootmem(size_t size, gfp_t mask)
 {
         void *p;
diff --git a/arch/powerpc/lib/copypage_64.S b/arch/powerpc/lib/copypage_64.S
index 4d4eeb900486..53dcb6b1b708 100644
--- a/arch/powerpc/lib/copypage_64.S
+++ b/arch/powerpc/lib/copypage_64.S
@@ -6,6 +6,7 @@
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
  */
+#include <asm/page.h>
 #include <asm/processor.h>
 #include <asm/ppc_asm.h>
 #include <asm/asm-offsets.h>
@@ -15,9 +16,9 @@ PPC64_CACHES:
         .tc             ppc64_caches[TC],ppc64_caches
         .section        ".text"
 
-
-_GLOBAL(copy_4K_page)
-        li      r5,4096         /* 4K page size */
+_GLOBAL(copy_page)
+        lis     r5,PAGE_SIZE@h
+        ori     r5,r5,PAGE_SIZE@l
 BEGIN_FTR_SECTION
         ld      r10,PPC64_CACHES@toc(r2)
         lwz     r11,DCACHEL1LOGLINESIZE(r10)    /* log2 of cache line size */
diff --git a/arch/powerpc/lib/devres.c b/arch/powerpc/lib/devres.c
index deac4d30daf4..e91615abae66 100644
--- a/arch/powerpc/lib/devres.c
+++ b/arch/powerpc/lib/devres.c
@@ -9,11 +9,11 @@
 
 #include <linux/device.h>       /* devres_*(), devm_ioremap_release() */
 #include <linux/gfp.h>
-#include <linux/io.h>           /* ioremap_flags() */
+#include <linux/io.h>           /* ioremap_prot() */
 #include <linux/module.h>       /* EXPORT_SYMBOL() */
 
 /**
- * devm_ioremap_prot - Managed ioremap_flags()
+ * devm_ioremap_prot - Managed ioremap_prot()
  * @dev: Generic device to remap IO address for
  * @offset: BUS offset to map
  * @size: Size of map
@@ -31,7 +31,7 @@ void __iomem *devm_ioremap_prot(struct device *dev, resource_size_t offset,
         if (!ptr)
                 return NULL;
 
-        addr = ioremap_flags(offset, size, flags);
+        addr = ioremap_prot(offset, size, flags);
         if (addr) {
                 *ptr = addr;
                 devres_add(dev, ptr);
diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c
index f73daa6f3970..9a52349874ee 100644
--- a/arch/powerpc/lib/sstep.c
+++ b/arch/powerpc/lib/sstep.c
@@ -46,6 +46,18 @@ extern int do_stxvd2x(int rn, unsigned long ea);
 #endif
 
 /*
+ * Emulate the truncation of 64 bit values in 32-bit mode.
+ */
+static unsigned long truncate_if_32bit(unsigned long msr, unsigned long val)
+{
+#ifdef __powerpc64__
+        if ((msr & MSR_64BIT) == 0)
+                val &= 0xffffffffUL;
+#endif
+        return val;
+}
+
+/*
  * Determine whether a conditional branch instruction would branch.
  */
 static int __kprobes branch_taken(unsigned int instr, struct pt_regs *regs)
@@ -91,11 +103,8 @@ static unsigned long __kprobes dform_ea(unsigned int instr, struct pt_regs *regs
                 if (instr & 0x04000000)         /* update forms */
                         regs->gpr[ra] = ea;
         }
-#ifdef __powerpc64__
-        if (!(regs->msr & MSR_SF))
-                ea &= 0xffffffffUL;
-#endif
-        return ea;
+
+        return truncate_if_32bit(regs->msr, ea);
 }
 
 #ifdef __powerpc64__
@@ -114,9 +123,8 @@ static unsigned long __kprobes dsform_ea(unsigned int instr, struct pt_regs *reg
                 if ((instr & 3) == 1)           /* update forms */
                         regs->gpr[ra] = ea;
         }
-        if (!(regs->msr & MSR_SF))
-                ea &= 0xffffffffUL;
-        return ea;
+
+        return truncate_if_32bit(regs->msr, ea);
 }
 #endif /* __powerpc64 */
 
@@ -137,11 +145,8 @@ static unsigned long __kprobes xform_ea(unsigned int instr, struct pt_regs *regs
                 if (do_update)          /* update forms */
                         regs->gpr[ra] = ea;
         }
-#ifdef __powerpc64__
-        if (!(regs->msr & MSR_SF))
-                ea &= 0xffffffffUL;
-#endif
-        return ea;
+
+        return truncate_if_32bit(regs->msr, ea);
 }
 
 /*
@@ -467,7 +472,7 @@ static void __kprobes set_cr0(struct pt_regs *regs, int rd)
 
         regs->ccr = (regs->ccr & 0x0fffffff) | ((regs->xer >> 3) & 0x10000000);
 #ifdef __powerpc64__
-        if (!(regs->msr & MSR_SF))
+        if (!(regs->msr & MSR_64BIT))
                 val = (int) val;
 #endif
         if (val < 0)
@@ -488,7 +493,7 @@ static void __kprobes add_with_carry(struct pt_regs *regs, int rd,
                 ++val;
         regs->gpr[rd] = val;
 #ifdef __powerpc64__
-        if (!(regs->msr & MSR_SF)) {
+        if (!(regs->msr & MSR_64BIT)) {
                 val = (unsigned int) val;
                 val1 = (unsigned int) val1;
         }
@@ -571,8 +576,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
                 if ((instr & 2) == 0)
                         imm += regs->nip;
                 regs->nip += 4;
-                if ((regs->msr & MSR_SF) == 0)
-                        regs->nip &= 0xffffffffUL;
+                regs->nip = truncate_if_32bit(regs->msr, regs->nip);
                 if (instr & 1)
                         regs->link = regs->nip;
                 if (branch_taken(instr, regs))
@@ -605,13 +609,9 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
                         imm -= 0x04000000;
                 if ((instr & 2) == 0)
                         imm += regs->nip;
-                if (instr & 1) {
-                        regs->link = regs->nip + 4;
-                        if ((regs->msr & MSR_SF) == 0)
-                                regs->link &= 0xffffffffUL;
-                }
-                if ((regs->msr & MSR_SF) == 0)
-                        imm &= 0xffffffffUL;
+                if (instr & 1)
+                        regs->link = truncate_if_32bit(regs->msr, regs->nip + 4);
+                imm = truncate_if_32bit(regs->msr, imm);
                 regs->nip = imm;
                 return 1;
         case 19:
@@ -619,11 +619,8 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
                 case 16:        /* bclr */
                 case 528:       /* bcctr */
                         imm = (instr & 0x400)? regs->ctr: regs->link;
-                        regs->nip += 4;
-                        if ((regs->msr & MSR_SF) == 0) {
-                                regs->nip &= 0xffffffffUL;
-                                imm &= 0xffffffffUL;
-                        }
+                        regs->nip = truncate_if_32bit(regs->msr, regs->nip + 4);
+                        imm = truncate_if_32bit(regs->msr, imm);
                         if (instr & 1)
                                 regs->link = regs->nip;
                         if (branch_taken(instr, regs))
@@ -1617,11 +1614,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
                 return 0;       /* invoke DSI if -EFAULT? */
         }
  instr_done:
-        regs->nip += 4;
-#ifdef __powerpc64__
-        if ((regs->msr & MSR_SF) == 0)
-                regs->nip &= 0xffffffffUL;
-#endif
+        regs->nip = truncate_if_32bit(regs->msr, regs->nip + 4);
         return 1;
 
  logical_done: