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:
  arch/powerpc: use printk_ratelimited instead of printk_ratelimit
  powerpc/rtas-rtc: remove sideeffects of printk_ratelimit
  powerpc/pseries: remove duplicate SCSI_BNX2_ISCSI in pseries_defconfig
  powerpc/e500: fix breakage with fsl_rio_mcheck_exception
  powerpc/p1022ds: fix audio-related properties in the device tree
  powerpc/85xx: fix NAND_CMD_READID read bytes number

10 files changed, 105 insertions, 94 deletions

diff --git a/arch/powerpc/boot/dts/p1022ds.dts b/arch/powerpc/boot/dts/p1022ds.dts
index 4f685a779f4c..98d9426d4b85 100644
--- a/arch/powerpc/boot/dts/p1022ds.dts
+++ b/arch/powerpc/boot/dts/p1022ds.dts
@@ -209,8 +209,10 @@
                         wm8776:codec@1a {
                                 compatible = "wlf,wm8776";
                                 reg = <0x1a>;
-                                /* MCLK source is a stand-alone oscillator */
-                                clock-frequency = <12288000>;
+                                /*
+                                 * clock-frequency will be set by U-Boot if
+                                 * the clock is enabled.
+                                 */
                         };
                 };
 
@@ -280,7 +282,8 @@
                         codec-handle = <&wm8776>;
                         fsl,playback-dma = <&dma00>;
                         fsl,capture-dma = <&dma01>;
-                        fsl,fifo-depth = <16>;
+                        fsl,fifo-depth = <15>;
+                        fsl,ssi-asynchronous;
                 };
 
                 dma@c300 {
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index c9f212b5f3de..80bc5de7ee1d 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -148,7 +148,6 @@ CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_CXGB3_ISCSI=m
 CONFIG_SCSI_CXGB4_ISCSI=m
 CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
 CONFIG_BE2ISCSI=m
 CONFIG_SCSI_IBMVSCSI=y
 CONFIG_SCSI_IBMVFC=m
diff --git a/arch/powerpc/kernel/rtas-rtc.c b/arch/powerpc/kernel/rtas-rtc.c
index 77578c093dda..c57c19358a26 100644
--- a/arch/powerpc/kernel/rtas-rtc.c
+++ b/arch/powerpc/kernel/rtas-rtc.c
@@ -4,6 +4,7 @@
 #include <linux/init.h>
 #include <linux/rtc.h>
 #include <linux/delay.h>
+#include <linux/ratelimit.h>
 #include <asm/prom.h>
 #include <asm/rtas.h>
 #include <asm/time.h>
@@ -29,9 +30,10 @@ unsigned long __init rtas_get_boot_time(void)
                 }
         } while (wait_time && (get_tb() < max_wait_tb));
 
-        if (error != 0 && printk_ratelimit()) {
-                printk(KERN_WARNING "error: reading the clock failed (%d)\n",
-                        error);
+        if (error != 0) {
+                printk_ratelimited(KERN_WARNING
+                                   "error: reading the clock failed (%d)\n",
+                                   error);
                 return 0;
         }
 
@@ -55,19 +57,21 @@ void rtas_get_rtc_time(struct rtc_time *rtc_tm)
 
                 wait_time = rtas_busy_delay_time(error);
                 if (wait_time) {
-                        if (in_interrupt() && printk_ratelimit()) {
+                        if (in_interrupt()) {
                                 memset(rtc_tm, 0, sizeof(struct rtc_time));
-                                printk(KERN_WARNING "error: reading clock"
-                                       " would delay interrupt\n");
+                                printk_ratelimited(KERN_WARNING
+                                                   "error: reading clock "
+                                                   "would delay interrupt\n");
                                 return; /* delay not allowed */
                         }
                         msleep(wait_time);
                 }
         } while (wait_time && (get_tb() < max_wait_tb));
 
-        if (error != 0 && printk_ratelimit()) {
-                printk(KERN_WARNING "error: reading the clock failed (%d)\n",
-                       error);
+        if (error != 0) {
+                printk_ratelimited(KERN_WARNING
+                                   "error: reading the clock failed (%d)\n",
+                                   error);
                 return;
         }
 
@@ -99,9 +103,10 @@ int rtas_set_rtc_time(struct rtc_time *tm)
                 }
         } while (wait_time && (get_tb() < max_wait_tb));
 
-        if (error != 0 && printk_ratelimit())
-                printk(KERN_WARNING "error: setting the clock failed (%d)\n",
-                       error);
+        if (error != 0)
+                printk_ratelimited(KERN_WARNING
+                                   "error: setting the clock failed (%d)\n",
+                                   error);
 
         return 0;
 }
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index b96a3a010c26..78b76dc54dfb 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -25,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/elf.h>
 #include <linux/ptrace.h>
+#include <linux/ratelimit.h>
 #ifdef CONFIG_PPC64
 #include <linux/syscalls.h>
 #include <linux/compat.h>
@@ -892,11 +893,12 @@ badframe:
         printk("badframe in handle_rt_signal, regs=%p frame=%p newsp=%lx\n",
                regs, frame, newsp);
 #endif
-        if (show_unhandled_signals && printk_ratelimit())
-                printk(KERN_INFO "%s[%d]: bad frame in handle_rt_signal32: "
-                        "%p nip %08lx lr %08lx\n",
-                        current->comm, current->pid,
-                        addr, regs->nip, regs->link);
+        if (show_unhandled_signals)
+                printk_ratelimited(KERN_INFO
+                                   "%s[%d]: bad frame in handle_rt_signal32: "
+                                   "%p nip %08lx lr %08lx\n",
+                                   current->comm, current->pid,
+                                   addr, regs->nip, regs->link);
 
         force_sigsegv(sig, current);
         return 0;
@@ -1058,11 +1060,12 @@ long sys_rt_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
         return 0;
 
  bad:
-        if (show_unhandled_signals && printk_ratelimit())
-                printk(KERN_INFO "%s[%d]: bad frame in sys_rt_sigreturn: "
-                        "%p nip %08lx lr %08lx\n",
-                        current->comm, current->pid,
-                        rt_sf, regs->nip, regs->link);
+        if (show_unhandled_signals)
+                printk_ratelimited(KERN_INFO
+                                   "%s[%d]: bad frame in sys_rt_sigreturn: "
+                                   "%p nip %08lx lr %08lx\n",
+                                   current->comm, current->pid,
+                                   rt_sf, regs->nip, regs->link);
 
         force_sig(SIGSEGV, current);
         return 0;
@@ -1149,12 +1152,12 @@ int sys_debug_setcontext(struct ucontext __user *ctx,
          * We kill the task with a SIGSEGV in this situation.
          */
         if (do_setcontext(ctx, regs, 1)) {
-                if (show_unhandled_signals && printk_ratelimit())
-                        printk(KERN_INFO "%s[%d]: bad frame in "
-                                "sys_debug_setcontext: %p nip %08lx "
-                                "lr %08lx\n",
-                                current->comm, current->pid,
-                                ctx, regs->nip, regs->link);
+                if (show_unhandled_signals)
+                        printk_ratelimited(KERN_INFO "%s[%d]: bad frame in "
+                                           "sys_debug_setcontext: %p nip %08lx "
+                                           "lr %08lx\n",
+                                           current->comm, current->pid,
+                                           ctx, regs->nip, regs->link);
 
                 force_sig(SIGSEGV, current);
                 goto out;
@@ -1236,11 +1239,12 @@ badframe:
         printk("badframe in handle_signal, regs=%p frame=%p newsp=%lx\n",
                regs, frame, newsp);
 #endif
-        if (show_unhandled_signals && printk_ratelimit())
-                printk(KERN_INFO "%s[%d]: bad frame in handle_signal32: "
-                        "%p nip %08lx lr %08lx\n",
-                        current->comm, current->pid,
-                        frame, regs->nip, regs->link);
+        if (show_unhandled_signals)
+                printk_ratelimited(KERN_INFO
+                                   "%s[%d]: bad frame in handle_signal32: "
+                                   "%p nip %08lx lr %08lx\n",
+                                   current->comm, current->pid,
+                                   frame, regs->nip, regs->link);
 
         force_sigsegv(sig, current);
         return 0;
@@ -1288,11 +1292,12 @@ long sys_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
         return 0;
 
 badframe:
-        if (show_unhandled_signals && printk_ratelimit())
-                printk(KERN_INFO "%s[%d]: bad frame in sys_sigreturn: "
-                        "%p nip %08lx lr %08lx\n",
-                        current->comm, current->pid,
-                        addr, regs->nip, regs->link);
+        if (show_unhandled_signals)
+                printk_ratelimited(KERN_INFO
+                                   "%s[%d]: bad frame in sys_sigreturn: "
+                                   "%p nip %08lx lr %08lx\n",
+                                   current->comm, current->pid,
+                                   addr, regs->nip, regs->link);
 
         force_sig(SIGSEGV, current);
         return 0;
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index da989fff19cc..e91c736cc842 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -24,6 +24,7 @@
 #include <linux/elf.h>
 #include <linux/ptrace.h>
 #include <linux/module.h>
+#include <linux/ratelimit.h>
 
 #include <asm/sigcontext.h>
 #include <asm/ucontext.h>
@@ -380,10 +381,10 @@ badframe:
         printk("badframe in sys_rt_sigreturn, regs=%p uc=%p &uc->uc_mcontext=%p\n",
                regs, uc, &uc->uc_mcontext);
 #endif
-        if (show_unhandled_signals && printk_ratelimit())
-                printk(regs->msr & MSR_64BIT ? fmt64 : fmt32,
-                        current->comm, current->pid, "rt_sigreturn",
-                        (long)uc, regs->nip, regs->link);
+        if (show_unhandled_signals)
+                printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32,
+                                   current->comm, current->pid, "rt_sigreturn",
+                                   (long)uc, regs->nip, regs->link);
 
         force_sig(SIGSEGV, current);
         return 0;
@@ -468,10 +469,10 @@ badframe:
         printk("badframe in setup_rt_frame, regs=%p frame=%p newsp=%lx\n",
                regs, frame, newsp);
 #endif
-        if (show_unhandled_signals && printk_ratelimit())
-                printk(regs->msr & MSR_64BIT ? fmt64 : fmt32,
-                        current->comm, current->pid, "setup_rt_frame",
-                        (long)frame, regs->nip, regs->link);
+        if (show_unhandled_signals)
+                printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32,
+                                   current->comm, current->pid, "setup_rt_frame",
+                                   (long)frame, regs->nip, regs->link);
 
         force_sigsegv(signr, current);
         return 0;
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 0ff4ab98d50c..1a0141426cda 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -34,6 +34,7 @@
 #include <linux/bug.h>
 #include <linux/kdebug.h>
 #include <linux/debugfs.h>
+#include <linux/ratelimit.h>
 
 #include <asm/emulated_ops.h>
 #include <asm/pgtable.h>
@@ -197,12 +198,11 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)
                 if (die("Exception in kernel mode", regs, signr))
                         return;
         } else if (show_unhandled_signals &&
-                    unhandled_signal(current, signr) &&
-                    printk_ratelimit()) {
-                        printk(regs->msr & MSR_64BIT ? fmt64 : fmt32,
-                                current->comm, current->pid, signr,
-                                addr, regs->nip, regs->link, code);
-                }
+                   unhandled_signal(current, signr)) {
+                printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32,
+                                   current->comm, current->pid, signr,
+                                   addr, regs->nip, regs->link, code);
+        }
 
         memset(&info, 0, sizeof(info));
         info.si_signo = signr;
@@ -425,7 +425,7 @@ int machine_check_e500mc(struct pt_regs *regs)
         unsigned long reason = mcsr;
         int recoverable = 1;
 
-        if (reason & MCSR_BUS_RBERR) {
+        if (reason & MCSR_LD) {
                 recoverable = fsl_rio_mcheck_exception(regs);
                 if (recoverable == 1)
                         goto silent_out;
@@ -1342,9 +1342,8 @@ void altivec_assist_exception(struct pt_regs *regs)
         } else {
                 /* didn't recognize the instruction */
                 /* XXX quick hack for now: set the non-Java bit in the VSCR */
-                if (printk_ratelimit())
-                        printk(KERN_ERR "Unrecognized altivec instruction "
-                               "in %s at %lx\n", current->comm, regs->nip);
+                printk_ratelimited(KERN_ERR "Unrecognized altivec instruction "
+                                   "in %s at %lx\n", current->comm, regs->nip);
                 current->thread.vscr.u[3] |= 0x10000;
         }
 }
@@ -1548,9 +1547,8 @@ u32 ppc_warn_emulated;
 
 void ppc_warn_emulated_print(const char *type)
 {
-        if (printk_ratelimit())
-                pr_warning("%s used emulated %s instruction\n", current->comm,
-                           type);
+        pr_warn_ratelimited("%s used emulated %s instruction\n", current->comm,
+                            type);
 }
 
 static int __init ppc_warn_emulated_init(void)
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 54f4fb994e99..ad35f66c69e8 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -31,6 +31,7 @@
 #include <linux/kdebug.h>
 #include <linux/perf_event.h>
 #include <linux/magic.h>
+#include <linux/ratelimit.h>
 
 #include <asm/firmware.h>
 #include <asm/page.h>
@@ -346,11 +347,10 @@ bad_area_nosemaphore:
                 return 0;
         }
 
-        if (is_exec && (error_code & DSISR_PROTFAULT)
-            && printk_ratelimit())
-                printk(KERN_CRIT "kernel tried to execute NX-protected"
-                       " page (%lx) - exploit attempt? (uid: %d)\n",
-                       address, current_uid());
+        if (is_exec && (error_code & DSISR_PROTFAULT))
+                printk_ratelimited(KERN_CRIT "kernel tried to execute NX-protected"
+                                   " page (%lx) - exploit attempt? (uid: %d)\n",
+                                   address, current_uid());
 
         return SIGSEGV;
 
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index 5b206a2fe17c..b3fd081d56f5 100644
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -283,23 +283,24 @@ static void __iomem *rio_regs_win;
 #ifdef CONFIG_E500
 int fsl_rio_mcheck_exception(struct pt_regs *regs)
 {
-        const struct exception_table_entry *entry = NULL;
-        unsigned long reason = mfspr(SPRN_MCSR);
-
-        if (reason & MCSR_BUS_RBERR) {
-                reason = in_be32((u32 *)(rio_regs_win + RIO_LTLEDCSR));
-                if (reason & (RIO_LTLEDCSR_IER | RIO_LTLEDCSR_PRT)) {
-                        /* Check if we are prepared to handle this fault */
-                        entry = search_exception_tables(regs->nip);
-                        if (entry) {
-                                pr_debug("RIO: %s - MC Exception handled\n",
-                                         __func__);
-                                out_be32((u32 *)(rio_regs_win + RIO_LTLEDCSR),
-                                         0);
-                                regs->msr |= MSR_RI;
-                                regs->nip = entry->fixup;
-                                return 1;
-                        }
+        const struct exception_table_entry *entry;
+        unsigned long reason;
+
+        if (!rio_regs_win)
+                return 0;
+
+        reason = in_be32((u32 *)(rio_regs_win + RIO_LTLEDCSR));
+        if (reason & (RIO_LTLEDCSR_IER | RIO_LTLEDCSR_PRT)) {
+                /* Check if we are prepared to handle this fault */
+                entry = search_exception_tables(regs->nip);
+                if (entry) {
+                        pr_debug("RIO: %s - MC Exception handled\n",
+                                 __func__);
+                        out_be32((u32 *)(rio_regs_win + RIO_LTLEDCSR),
+                                 0);
+                        regs->msr |= MSR_RI;
+                        regs->nip = entry->fixup;
+                        return 1;
                 }
         }
 
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 3a8de5bb628a..58d7a534f877 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -29,6 +29,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/syscore_ops.h>
+#include <linux/ratelimit.h>
 
 #include <asm/ptrace.h>
 #include <asm/signal.h>
@@ -1648,9 +1649,8 @@ static unsigned int _mpic_get_one_irq(struct mpic *mpic, int reg)
                 return NO_IRQ;
         }
         if (unlikely(mpic->protected && test_bit(src, mpic->protected))) {
-                if (printk_ratelimit())
-                        printk(KERN_WARNING "%s: Got protected source %d !\n",
-                               mpic->name, (int)src);
+                printk_ratelimited(KERN_WARNING "%s: Got protected source %d !\n",
+                                   mpic->name, (int)src);
                 mpic_eoi(mpic);
                 return NO_IRQ;
         }
@@ -1688,9 +1688,8 @@ unsigned int mpic_get_coreint_irq(void)
                 return NO_IRQ;
         }
         if (unlikely(mpic->protected && test_bit(src, mpic->protected))) {
-                if (printk_ratelimit())
-                        printk(KERN_WARNING "%s: Got protected source %d !\n",
-                               mpic->name, (int)src);
+                printk_ratelimited(KERN_WARNING "%s: Got protected source %d !\n",
+                                   mpic->name, (int)src);
                 return NO_IRQ;
         }
 
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index 0bb254c7d2b1..33d8aad8bba5 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -339,9 +339,9 @@ static void fsl_elbc_cmdfunc(struct mtd_info *mtd, unsigned int command,
                                     (FIR_OP_UA  << FIR_OP1_SHIFT) |
                                     (FIR_OP_RBW << FIR_OP2_SHIFT));
                 out_be32(&lbc->fcr, NAND_CMD_READID << FCR_CMD0_SHIFT);
-                /* 5 bytes for manuf, device and exts */
-                out_be32(&lbc->fbcr, 5);
-                elbc_fcm_ctrl->read_bytes = 5;
+                /* nand_get_flash_type() reads 8 bytes of entire ID string */
+                out_be32(&lbc->fbcr, 8);
+                elbc_fcm_ctrl->read_bytes = 8;
                 elbc_fcm_ctrl->use_mdr = 1;
                 elbc_fcm_ctrl->mdr = 0;