Merge branch 'merge'

11 files changed, 121 insertions, 83 deletions

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index bcf50031a92a..d2ab2943d230 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -67,9 +67,9 @@ pci64-$(CONFIG_PPC64)		+= pci_64.o pci_dn.o pci_iommu.o \
                                    pci_direct_iommu.o iomap.o
 pci32-$(CONFIG_PPC32)           := pci_32.o
 obj-$(CONFIG_PCI)               += $(pci64-y) $(pci32-y)
-kexec-$(CONFIG_PPC64)           := machine_kexec_64.o crash.o
+kexec-$(CONFIG_PPC64)           := machine_kexec_64.o
 kexec-$(CONFIG_PPC32)           := machine_kexec_32.o
-obj-$(CONFIG_KEXEC)             += machine_kexec.o $(kexec-y)
+obj-$(CONFIG_KEXEC)             += machine_kexec.o crash.o $(kexec-y)
 
 ifeq ($(CONFIG_PPC_ISERIES),y)
 $(obj)/head_64.o: $(obj)/lparmap.s
diff --git a/arch/powerpc/kernel/cpu_setup_ppc970.S b/arch/powerpc/kernel/cpu_setup_ppc970.S
index f619932794e8..652594891d58 100644
--- a/arch/powerpc/kernel/cpu_setup_ppc970.S
+++ b/arch/powerpc/kernel/cpu_setup_ppc970.S
@@ -81,6 +81,8 @@ _GLOBAL(__setup_cpu_ppc970)
         mfspr   r0,SPRN_HID0
         li      r11,5                   /* clear DOZE and SLEEP */
         rldimi  r0,r11,52,8             /* set NAP and DPM */
+        li      r11,0
+        rldimi  r0,r11,32,31            /* clear EN_ATTN */
         mtspr   SPRN_HID0,r0
         mfspr   r0,SPRN_HID0
         mfspr   r0,SPRN_HID0
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index 358cecdc6aef..f04c18e08b8b 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -44,6 +44,7 @@
 /* This keeps a track of which one is crashing cpu. */
 int crashing_cpu = -1;
 static cpumask_t cpus_in_crash = CPU_MASK_NONE;
+cpumask_t cpus_in_sr = CPU_MASK_NONE;
 
 static u32 *append_elf_note(u32 *buf, char *name, unsigned type, void *data,
                                                                size_t data_len)
@@ -139,7 +140,13 @@ void crash_ipi_callback(struct pt_regs *regs)
 
         if (ppc_md.kexec_cpu_down)
                 ppc_md.kexec_cpu_down(1, 1);
+
+#ifdef CONFIG_PPC64
         kexec_smp_wait();
+#else
+        for (;;);       /* FIXME */
+#endif
+
         /* NOTREACHED */
 }
 
@@ -255,7 +262,11 @@ static void crash_kexec_prepare_cpus(int cpu)
          *
          * do this if kexec in setup.c ?
          */
+#ifdef CONFIG_PPC64
         smp_release_cpus();
+#else
+        /* FIXME */
+#endif
 }
 
 void crash_kexec_secondary(struct pt_regs *regs)
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index b2ded6460a86..fd4ddb858dbd 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -694,7 +694,7 @@ unsigned int irq_radix_revmap(struct irq_host *host,
         /* If not there, try to insert it */
         virq = irq_find_mapping(host, hwirq);
         if (virq != NO_IRQ)
-                radix_tree_insert(tree, virq, &irq_map[virq]);
+                radix_tree_insert(tree, hwirq, &irq_map[virq]);
  bail:
         spin_unlock_irqrestore(&irq_big_lock, flags);
         return virq;
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index 9f0898c89759..cd65c367b8b6 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -61,6 +61,8 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
         if (!ret) {
                 memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
                 p->opcode = *p->addr;
+                flush_icache_range((unsigned long)p->ainsn.insn,
+                        (unsigned long)p->ainsn.insn + sizeof(kprobe_opcode_t));
         }
 
         return ret;
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index ee1e0b8c7f1f..5e6ddfa474c0 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -116,6 +116,7 @@ static int __init add_legacy_soc_port(struct device_node *np,
         u64 addr;
         const u32 *addrp;
         upf_t flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ;
+        struct device_node *tsi = of_get_parent(np);
 
         /* We only support ports that have a clock frequency properly
          * encoded in the device-tree.
@@ -135,7 +136,10 @@ static int __init add_legacy_soc_port(struct device_node *np,
         /* Add port, irq will be dealt with later. We passed a translated
          * IO port value. It will be fixed up later along with the irq
          */
-        return add_legacy_port(np, -1, UPIO_MEM, addr, addr, NO_IRQ, flags, 0);
+        if (tsi && !strcmp(tsi->type, "tsi-bridge"))
+                return add_legacy_port(np, -1, UPIO_TSI, addr, addr, NO_IRQ, flags, 0);
+        else
+                return add_legacy_port(np, -1, UPIO_MEM, addr, addr, NO_IRQ, flags, 0);
 }
 
 static int __init add_legacy_isa_port(struct device_node *np,
@@ -465,7 +469,7 @@ static int __init serial_dev_init(void)
                         fixup_port_irq(i, np, port);
                 if (port->iotype == UPIO_PORT)
                         fixup_port_pio(i, np, port);
-                if (port->iotype == UPIO_MEM)
+                if ((port->iotype == UPIO_MEM) || (port->iotype == UPIO_TSI))
                         fixup_port_mmio(i, np, port);
         }
 
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c
index a81ca1b841ec..e60a0c544d63 100644
--- a/arch/powerpc/kernel/machine_kexec.c
+++ b/arch/powerpc/kernel/machine_kexec.c
@@ -13,6 +13,7 @@
 #include <linux/reboot.h>
 #include <linux/threads.h>
 #include <asm/machdep.h>
+#include <asm/lmb.h>
 
 void machine_crash_shutdown(struct pt_regs *regs)
 {
@@ -59,3 +60,58 @@ NORET_TYPE void machine_kexec(struct kimage *image)
         }
         for(;;);
 }
+
+static int __init early_parse_crashk(char *p)
+{
+        unsigned long size;
+
+        if (!p)
+                return 1;
+
+        size = memparse(p, &p);
+
+        if (*p == '@')
+                crashk_res.start = memparse(p + 1, &p);
+        else
+                crashk_res.start = KDUMP_KERNELBASE;
+
+        crashk_res.end = crashk_res.start + size - 1;
+
+        return 0;
+}
+early_param("crashkernel", early_parse_crashk);
+
+void __init reserve_crashkernel(void)
+{
+        unsigned long size;
+
+        if (crashk_res.start == 0)
+                return;
+
+        /* We might have got these values via the command line or the
+         * device tree, either way sanitise them now. */
+
+        size = crashk_res.end - crashk_res.start + 1;
+
+        if (crashk_res.start != KDUMP_KERNELBASE)
+                printk("Crash kernel location must be 0x%x\n",
+                                KDUMP_KERNELBASE);
+
+        crashk_res.start = KDUMP_KERNELBASE;
+        size = PAGE_ALIGN(size);
+        crashk_res.end = crashk_res.start + size - 1;
+
+        /* Crash kernel trumps memory limit */
+        if (memory_limit && memory_limit <= crashk_res.end) {
+                memory_limit = crashk_res.end + 1;
+                printk("Adjusted memory limit for crashkernel, now 0x%lx\n",
+                                memory_limit);
+        }
+
+        lmb_reserve(crashk_res.start, size);
+}
+
+int overlaps_crashkernel(unsigned long start, unsigned long size)
+{
+        return (start + size) > crashk_res.start && start <= crashk_res.end;
+}
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index 4efdaa9d3f43..a24b09c27718 100644
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -10,7 +10,6 @@
  */
 
 
-#include <linux/cpumask.h>
 #include <linux/kexec.h>
 #include <linux/smp.h>
 #include <linux/thread_info.h>
@@ -21,7 +20,6 @@
 #include <asm/machdep.h>
 #include <asm/cacheflush.h>
 #include <asm/paca.h>
-#include <asm/lmb.h>
 #include <asm/mmu.h>
 #include <asm/sections.h>       /* _end */
 #include <asm/prom.h>
@@ -383,58 +381,3 @@ static int __init kexec_setup(void)
         return 0;
 }
 __initcall(kexec_setup);
-
-static int __init early_parse_crashk(char *p)
-{
-        unsigned long size;
-
-        if (!p)
-                return 1;
-
-        size = memparse(p, &p);
-
-        if (*p == '@')
-                crashk_res.start = memparse(p + 1, &p);
-        else
-                crashk_res.start = KDUMP_KERNELBASE;
-
-        crashk_res.end = crashk_res.start + size - 1;
-
-        return 0;
-}
-early_param("crashkernel", early_parse_crashk);
-
-void __init reserve_crashkernel(void)
-{
-        unsigned long size;
-
-        if (crashk_res.start == 0)
-                return;
-
-        /* We might have got these values via the command line or the
-         * device tree, either way sanitise them now. */
-
-        size = crashk_res.end - crashk_res.start + 1;
-
-        if (crashk_res.start != KDUMP_KERNELBASE)
-                printk("Crash kernel location must be 0x%x\n",
-                                KDUMP_KERNELBASE);
-
-        crashk_res.start = KDUMP_KERNELBASE;
-        size = PAGE_ALIGN(size);
-        crashk_res.end = crashk_res.start + size - 1;
-
-        /* Crash kernel trumps memory limit */
-        if (memory_limit && memory_limit <= crashk_res.end) {
-                memory_limit = crashk_res.end + 1;
-                printk("Adjusted memory limit for crashkernel, now 0x%lx\n",
-                                memory_limit);
-        }
-
-        lmb_reserve(crashk_res.start, size);
-}
-
-int overlaps_crashkernel(unsigned long start, unsigned long size)
-{
-        return (start + size) > crashk_res.start && start <= crashk_res.end;
-}
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index 59f69d34cb67..603203276ef6 100644
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -601,11 +601,6 @@ static struct device_node *of_irq_find_parent(struct device_node *child)
         return p;
 }
 
-static u8 of_irq_pci_swizzle(u8 slot, u8 pin)
-{
-        return (((pin - 1) + slot) % 4) + 1;
-}
-
 /* This doesn't need to be called if you don't have any special workaround
  * flags to pass
  */
@@ -895,6 +890,12 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq
 }
 EXPORT_SYMBOL_GPL(of_irq_map_one);
 
+#ifdef CONFIG_PCI
+static u8 of_irq_pci_swizzle(u8 slot, u8 pin)
+{
+        return (((pin - 1) + slot) % 4) + 1;
+}
+
 int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq)
 {
         struct device_node *dn, *ppnode;
@@ -971,4 +972,4 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq)
         return of_irq_map_raw(ppnode, &lspec, laddr, out_irq);
 }
 EXPORT_SYMBOL_GPL(of_irq_map_pci);
-
+#endif /* CONFIG_PCI */
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 8d4ccf061a4d..272cb826901d 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -417,7 +417,7 @@ static __inline__ void timer_check_rtc(void)
 /*
  * This version of gettimeofday has microsecond resolution.
  */
-static inline void __do_gettimeofday(struct timeval *tv, u64 tb_val)
+static inline void __do_gettimeofday(struct timeval *tv)
 {
         unsigned long sec, usec;
         u64 tb_ticks, xsec;
@@ -431,7 +431,12 @@ static inline void __do_gettimeofday(struct timeval *tv, u64 tb_val)
          * without a divide (and in fact, without a multiply)
          */
         temp_varp = do_gtod.varp;
-        tb_ticks = tb_val - temp_varp->tb_orig_stamp;
+
+        /* Sampling the time base must be done after loading
+         * do_gtod.varp in order to avoid racing with update_gtod.
+         */
+        data_barrier(temp_varp);
+        tb_ticks = get_tb() - temp_varp->tb_orig_stamp;
         temp_tb_to_xs = temp_varp->tb_to_xs;
         temp_stamp_xsec = temp_varp->stamp_xsec;
         xsec = temp_stamp_xsec + mulhdu(tb_ticks, temp_tb_to_xs);
@@ -464,7 +469,7 @@ void do_gettimeofday(struct timeval *tv)
                 tv->tv_usec = usec;
                 return;
         }
-        __do_gettimeofday(tv, get_tb());
+        __do_gettimeofday(tv);
 }
 
 EXPORT_SYMBOL(do_gettimeofday);
@@ -650,6 +655,7 @@ void timer_interrupt(struct pt_regs * regs)
         int next_dec;
         int cpu = smp_processor_id();
         unsigned long ticks;
+        u64 tb_next_jiffy;
 
 #ifdef CONFIG_PPC32
         if (atomic_read(&ppc_n_lost_interrupts) != 0)
@@ -691,11 +697,14 @@ void timer_interrupt(struct pt_regs * regs)
                         continue;
 
                 write_seqlock(&xtime_lock);
-                tb_last_jiffy += tb_ticks_per_jiffy;
-                tb_last_stamp = per_cpu(last_jiffy, cpu);
-                do_timer(regs);
-                timer_recalc_offset(tb_last_jiffy);
-                timer_check_rtc();
+                tb_next_jiffy = tb_last_jiffy + tb_ticks_per_jiffy;
+                if (per_cpu(last_jiffy, cpu) >= tb_next_jiffy) {
+                        tb_last_jiffy = tb_next_jiffy;
+                        tb_last_stamp = per_cpu(last_jiffy, cpu);
+                        do_timer(regs);
+                        timer_recalc_offset(tb_last_jiffy);
+                        timer_check_rtc();
+                }
                 write_sequnlock(&xtime_lock);
         }
         
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 2105767fcc57..4d0b4e74d579 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -55,9 +55,6 @@
 
 #ifdef CONFIG_PPC64     /* XXX */
 #define _IO_BASE        pci_io_base
-#ifdef CONFIG_KEXEC
-cpumask_t cpus_in_sr = CPU_MASK_NONE;
-#endif
 #endif
 
 #ifdef CONFIG_DEBUGGER
@@ -211,6 +208,19 @@ void system_reset_exception(struct pt_regs *regs)
 
         die("System Reset", regs, SIGABRT);
 
+        /*
+         * Some CPUs when released from the debugger will execute this path.
+         * These CPUs entered the debugger via a soft-reset. If the CPU was
+         * hung before entering the debugger it will return to the hung
+         * state when exiting this function.  This causes a problem in
+         * kdump since the hung CPU(s) will not respond to the IPI sent
+         * from kdump. To prevent the problem we call crash_kexec_secondary()
+         * here. If a kdump had not been initiated or we exit the debugger
+         * with the "exit and recover" command (x) crash_kexec_secondary()
+         * will return after 5ms and the CPU returns to its previous state.
+         */
+        crash_kexec_secondary(regs);
+
         /* Must die if the interrupt is not recoverable */
         if (!(regs->msr & MSR_RI))
                 panic("Unrecoverable System Reset");
@@ -575,14 +585,14 @@ static void parse_fpe(struct pt_regs *regs)
 #define INST_MFSPR_PVR_MASK     0xfc1fffff
 
 #define INST_DCBA               0x7c0005ec
-#define INST_DCBA_MASK          0x7c0007fe
+#define INST_DCBA_MASK          0xfc0007fe
 
 #define INST_MCRXR              0x7c000400
-#define INST_MCRXR_MASK         0x7c0007fe
+#define INST_MCRXR_MASK         0xfc0007fe
 
 #define INST_STRING             0x7c00042a
-#define INST_STRING_MASK        0x7c0007fe
-#define INST_STRING_GEN_MASK    0x7c00067e
+#define INST_STRING_MASK        0xfc0007fe
+#define INST_STRING_GEN_MASK    0xfc00067e
 #define INST_LSWI               0x7c0004aa
 #define INST_LSWX               0x7c00042a
 #define INST_STSWI              0x7c0005aa