39 files changed, 641 insertions, 342 deletions

diff --git a/arch/sparc/include/asm/cpudata_64.h b/arch/sparc/include/asm/cpudata_64.h
index 7da7c13d23c4..a11b89ee9ef8 100644
--- a/arch/sparc/include/asm/cpudata_64.h
+++ b/arch/sparc/include/asm/cpudata_64.h
@@ -17,7 +17,7 @@
 typedef struct {
         /* Dcache line 1 */
         unsigned int    __softirq_pending; /* must be 1st, see rtrap.S */
-        unsigned int    __pad0;
+        unsigned int    __nmi_count;
         unsigned long   clock_tick;     /* %tick's per second */
         unsigned long   __pad;
         unsigned int    __pad1;
diff --git a/arch/sparc/include/asm/irq_64.h b/arch/sparc/include/asm/irq_64.h
index d47d4a1955a9..1934f2cbf513 100644
--- a/arch/sparc/include/asm/irq_64.h
+++ b/arch/sparc/include/asm/irq_64.h
@@ -66,9 +66,6 @@ extern void virt_irq_free(unsigned int virt_irq);
 extern void __init init_IRQ(void);
 extern void fixup_irqs(void);
 
-extern int register_perfctr_intr(void (*handler)(struct pt_regs *));
-extern void release_perfctr_intr(void (*handler)(struct pt_regs *));
-
 static inline void set_softint(unsigned long bits)
 {
         __asm__ __volatile__("wr        %0, 0x0, %%set_softint"
@@ -98,5 +95,6 @@ void __trigger_all_cpu_backtrace(void);
 extern void *hardirq_stack[NR_CPUS];
 extern void *softirq_stack[NR_CPUS];
 #define __ARCH_HAS_DO_SOFTIRQ
+#define ARCH_HAS_NMI_WATCHDOG
 
 #endif
diff --git a/arch/sparc/include/asm/kdebug_64.h b/arch/sparc/include/asm/kdebug_64.h
index f905b773235a..feb3578e12c4 100644
--- a/arch/sparc/include/asm/kdebug_64.h
+++ b/arch/sparc/include/asm/kdebug_64.h
@@ -14,6 +14,8 @@ enum die_val {
         DIE_TRAP,
         DIE_TRAP_TL1,
         DIE_CALL,
+        DIE_NMI,
+        DIE_NMIWATCHDOG,
 };
 
 #endif
diff --git a/arch/sparc/include/asm/nmi.h b/arch/sparc/include/asm/nmi.h
new file mode 100644
index 000000000000..fbd546dd4feb
--- /dev/null
+++ b/arch/sparc/include/asm/nmi.h
@@ -0,0 +1,10 @@
+#ifndef __NMI_H
+#define __NMI_H
+
+extern int __init nmi_init(void);
+extern void perfctr_irq(int irq, struct pt_regs *regs);
+extern void nmi_adjust_hz(unsigned int new_hz);
+
+extern int nmi_usable;
+
+#endif /* __NMI_H */
diff --git a/arch/sparc/include/asm/pcr.h b/arch/sparc/include/asm/pcr.h
new file mode 100644
index 000000000000..a2f5c61f924e
--- /dev/null
+++ b/arch/sparc/include/asm/pcr.h
@@ -0,0 +1,46 @@
+#ifndef __PCR_H
+#define __PCR_H
+
+struct pcr_ops {
+        u64 (*read)(void);
+        void (*write)(u64);
+};
+extern const struct pcr_ops *pcr_ops;
+
+extern void deferred_pcr_work_irq(int irq, struct pt_regs *regs);
+extern void schedule_deferred_pcr_work(void);
+
+#define PCR_PIC_PRIV            0x00000001 /* PIC access is privileged */
+#define PCR_STRACE              0x00000002 /* Trace supervisor events  */
+#define PCR_UTRACE              0x00000004 /* Trace user events        */
+#define PCR_N2_HTRACE           0x00000008 /* Trace hypervisor events  */
+#define PCR_N2_TOE_OV0          0x00000010 /* Trap if PIC 0 overflows  */
+#define PCR_N2_TOE_OV1          0x00000020 /* Trap if PIC 1 overflows  */
+#define PCR_N2_MASK0            0x00003fc0
+#define PCR_N2_MASK0_SHIFT      6
+#define PCR_N2_SL0              0x0003c000
+#define PCR_N2_SL0_SHIFT        14
+#define PCR_N2_OV0              0x00040000
+#define PCR_N2_MASK1            0x07f80000
+#define PCR_N2_MASK1_SHIFT      19
+#define PCR_N2_SL1              0x78000000
+#define PCR_N2_SL1_SHIFT        27
+#define PCR_N2_OV1              0x80000000
+
+extern unsigned int picl_shift;
+
+/* In order to commonize as much of the implementation as
+ * possible, we use PICH as our counter.  Mostly this is
+ * to accomodate Niagara-1 which can only count insn cycles
+ * in PICH.
+ */
+static inline u64 picl_value(unsigned int nmi_hz)
+{
+        u32 delta = local_cpu_data().clock_tick / (nmi_hz << picl_shift);
+
+        return ((u64)((0 - delta) & 0xffffffff)) << 32;
+}
+
+extern u64 pcr_enable;
+
+#endif /* __PCR_H */
diff --git a/arch/sparc/include/asm/pil.h b/arch/sparc/include/asm/pil.h
index d573820c0ff4..32a7efe76d00 100644
--- a/arch/sparc/include/asm/pil.h
+++ b/arch/sparc/include/asm/pil.h
@@ -23,6 +23,7 @@
 #define PIL_SMP_CTX_NEW_VERSION 4
 #define PIL_DEVICE_IRQ          5
 #define PIL_SMP_CALL_FUNC_SNGL  6
+#define PIL_DEFERRED_PCR_WORK   7
 #define PIL_NORMAL_MAX          14
 #define PIL_NMI                 15
 
diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
index 53adcaa0348b..54742e58831c 100644
--- a/arch/sparc/kernel/Makefile
+++ b/arch/sparc/kernel/Makefile
@@ -52,6 +52,8 @@ obj-$(CONFIG_SPARC64)   += visemul.o
 obj-$(CONFIG_SPARC64)   += hvapi.o
 obj-$(CONFIG_SPARC64)   += sstate.o
 obj-$(CONFIG_SPARC64)   += mdesc.o
+obj-$(CONFIG_SPARC64)   += pcr.o
+obj-$(CONFIG_SPARC64)   += nmi.o
 
 # sparc32 do not use GENERIC_HARDIRQS but uses the generic devres implementation
 obj-$(CONFIG_SPARC32)     += devres.o
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c
index 32d32b4824f5..d85c3dc4953a 100644
--- a/arch/sparc/kernel/cpu.c
+++ b/arch/sparc/kernel/cpu.c
@@ -26,6 +26,7 @@ EXPORT_PER_CPU_SYMBOL(__cpu_data);
 struct cpu_info {
         int psr_vers;
         const char *name;
+        const char *pmu_name;
 };
 
 struct fpu_info {
@@ -45,6 +46,9 @@ struct manufacturer_info {
 #define CPU(ver, _name) \
 { .psr_vers = ver, .name = _name }
 
+#define CPU_PMU(ver, _name, _pmu_name)  \
+{ .psr_vers = ver, .name = _name, .pmu_name = _pmu_name }
+
 #define FPU(ver, _name) \
 { .fp_vers = ver, .name = _name }
 
@@ -183,10 +187,10 @@ static const struct manufacturer_info __initconst manufacturer_info[] = {
 },{
         0x17,
         .cpu_info = {
-                CPU(0x10, "TI UltraSparc I   (SpitFire)"),
-                CPU(0x11, "TI UltraSparc II  (BlackBird)"),
-                CPU(0x12, "TI UltraSparc IIi (Sabre)"),
-                CPU(0x13, "TI UltraSparc IIe (Hummingbird)"),
+                CPU_PMU(0x10, "TI UltraSparc I   (SpitFire)", "ultra12"),
+                CPU_PMU(0x11, "TI UltraSparc II  (BlackBird)", "ultra12"),
+                CPU_PMU(0x12, "TI UltraSparc IIi (Sabre)", "ultra12"),
+                CPU_PMU(0x13, "TI UltraSparc IIe (Hummingbird)", "ultra12"),
                 CPU(-1, NULL)
         },
         .fpu_info = {
@@ -199,7 +203,7 @@ static const struct manufacturer_info __initconst manufacturer_info[] = {
 },{
         0x22,
         .cpu_info = {
-                CPU(0x10, "TI UltraSparc I   (SpitFire)"),
+                CPU_PMU(0x10, "TI UltraSparc I   (SpitFire)", "ultra12"),
                 CPU(-1, NULL)
         },
         .fpu_info = {
@@ -209,12 +213,12 @@ static const struct manufacturer_info __initconst manufacturer_info[] = {
 },{
         0x3e,
         .cpu_info = {
-                CPU(0x14, "TI UltraSparc III (Cheetah)"),
-                CPU(0x15, "TI UltraSparc III+ (Cheetah+)"),
-                CPU(0x16, "TI UltraSparc IIIi (Jalapeno)"),
-                CPU(0x18, "TI UltraSparc IV (Jaguar)"),
-                CPU(0x19, "TI UltraSparc IV+ (Panther)"),
-                CPU(0x22, "TI UltraSparc IIIi+ (Serrano)"),
+                CPU_PMU(0x14, "TI UltraSparc III (Cheetah)", "ultra3"),
+                CPU_PMU(0x15, "TI UltraSparc III+ (Cheetah+)", "ultra3+"),
+                CPU_PMU(0x16, "TI UltraSparc IIIi (Jalapeno)", "ultra3i"),
+                CPU_PMU(0x18, "TI UltraSparc IV (Jaguar)", "ultra3+"),
+                CPU_PMU(0x19, "TI UltraSparc IV+ (Panther)", "ultra4+"),
+                CPU_PMU(0x22, "TI UltraSparc IIIi+ (Serrano)", "ultra3i"),
                 CPU(-1, NULL)
         },
         .fpu_info = {
@@ -234,6 +238,7 @@ static const struct manufacturer_info __initconst manufacturer_info[] = {
 
 const char *sparc_cpu_type;
 const char *sparc_fpu_type;
+const char *sparc_pmu_type;
 
 unsigned int fsr_storage;
 
@@ -244,6 +249,7 @@ static void set_cpu_and_fpu(int psr_impl, int psr_vers, int fpu_vers)
 
         sparc_cpu_type = NULL;
         sparc_fpu_type = NULL;
+        sparc_pmu_type = NULL;
         manuf = NULL;
 
         for (i = 0; i < ARRAY_SIZE(manufacturer_info); i++)
@@ -263,6 +269,7 @@ static void set_cpu_and_fpu(int psr_impl, int psr_vers, int fpu_vers)
                 {
                         if (cpu->psr_vers == psr_vers) {
                                 sparc_cpu_type = cpu->name;
+                                sparc_pmu_type = cpu->pmu_name;
                                 sparc_fpu_type = "No FPU";
                                 break;
                         }
@@ -290,6 +297,8 @@ static void set_cpu_and_fpu(int psr_impl, int psr_vers, int fpu_vers)
                        psr_impl, fpu_vers);
                 sparc_fpu_type = "Unknown FPU";
         }
+        if (sparc_pmu_type == NULL)
+                sparc_pmu_type = "Unknown PMU";
 }
 
 #ifdef CONFIG_SPARC32
@@ -315,11 +324,13 @@ static void __init sun4v_cpu_probe(void)
         case SUN4V_CHIP_NIAGARA1:
                 sparc_cpu_type = "UltraSparc T1 (Niagara)";
                 sparc_fpu_type = "UltraSparc T1 integrated FPU";
+                sparc_pmu_type = "niagara";
                 break;
 
         case SUN4V_CHIP_NIAGARA2:
                 sparc_cpu_type = "UltraSparc T2 (Niagara2)";
                 sparc_fpu_type = "UltraSparc T2 integrated FPU";
+                sparc_pmu_type = "niagara2";
                 break;
 
         default:
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
index cab8e0286871..e289376198eb 100644
--- a/arch/sparc/kernel/irq_64.c
+++ b/arch/sparc/kernel/irq_64.c
@@ -196,6 +196,11 @@ int show_interrupts(struct seq_file *p, void *v)
                 seq_putc(p, '\n');
 skip:
                 spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+        } else if (i == NR_IRQS) {
+                seq_printf(p, "NMI: ");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ", cpu_data(j).__nmi_count);
+                seq_printf(p, "     Non-maskable interrupts\n");
         }
         return 0;
 }
@@ -778,69 +783,6 @@ void do_softirq(void)
         local_irq_restore(flags);
 }
 
-static void unhandled_perf_irq(struct pt_regs *regs)
-{
-        unsigned long pcr, pic;
-
-        read_pcr(pcr);
-        read_pic(pic);
-
-        write_pcr(0);
-
-        printk(KERN_EMERG "CPU %d: Got unexpected perf counter IRQ.\n",
-               smp_processor_id());
-        printk(KERN_EMERG "CPU %d: PCR[%016lx] PIC[%016lx]\n",
-               smp_processor_id(), pcr, pic);
-}
-
-/* Almost a direct copy of the powerpc PMC code.  */
-static DEFINE_SPINLOCK(perf_irq_lock);
-static void *perf_irq_owner_caller; /* mostly for debugging */
-static void (*perf_irq)(struct pt_regs *regs) = unhandled_perf_irq;
-
-/* Invoked from level 15 PIL handler in trap table.  */
-void perfctr_irq(int irq, struct pt_regs *regs)
-{
-        clear_softint(1 << irq);
-        perf_irq(regs);
-}
-
-int register_perfctr_intr(void (*handler)(struct pt_regs *))
-{
-        int ret;
-
-        if (!handler)
-                return -EINVAL;
-
-        spin_lock(&perf_irq_lock);
-        if (perf_irq != unhandled_perf_irq) {
-                printk(KERN_WARNING "register_perfctr_intr: "
-                       "perf IRQ busy (reserved by caller %p)\n",
-                       perf_irq_owner_caller);
-                ret = -EBUSY;
-                goto out;
-        }
-
-        perf_irq_owner_caller = __builtin_return_address(0);
-        perf_irq = handler;
-
-        ret = 0;
-out:
-        spin_unlock(&perf_irq_lock);
-
-        return ret;
-}
-EXPORT_SYMBOL_GPL(register_perfctr_intr);
-
-void release_perfctr_intr(void (*handler)(struct pt_regs *))
-{
-        spin_lock(&perf_irq_lock);
-        perf_irq_owner_caller = NULL;
-        perf_irq = unhandled_perf_irq;
-        spin_unlock(&perf_irq_lock);
-}
-EXPORT_SYMBOL_GPL(release_perfctr_intr);
-
 #ifdef CONFIG_HOTPLUG_CPU
 void fixup_irqs(void)
 {
diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h
index 81a972e8d8ea..15d8a3f645c9 100644
--- a/arch/sparc/kernel/kernel.h
+++ b/arch/sparc/kernel/kernel.h
@@ -5,6 +5,7 @@
 
 /* cpu.c */
 extern const char *sparc_cpu_type;
+extern const char *sparc_pmu_type;
 extern const char *sparc_fpu_type;
 
 extern unsigned int fsr_storage;
diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c
new file mode 100644
index 000000000000..09f088ed4a64
--- /dev/null
+++ b/arch/sparc/kernel/nmi.c
@@ -0,0 +1,224 @@
+/* Pseudo NMI support on sparc64 systems.
+ *
+ * Copyright (C) 2009 David S. Miller <davem@davemloft.net>
+ *
+ * The NMI watchdog support and infrastructure is based almost
+ * entirely upon the x86 NMI support code.
+ */
+#include <linux/kernel.h>
+#include <linux/param.h>
+#include <linux/init.h>
+#include <linux/percpu.h>
+#include <linux/nmi.h>
+#include <linux/module.h>
+#include <linux/kprobes.h>
+#include <linux/kernel_stat.h>
+#include <linux/slab.h>
+#include <linux/kdebug.h>
+#include <linux/delay.h>
+#include <linux/smp.h>
+
+#include <asm/ptrace.h>
+#include <asm/local.h>
+#include <asm/pcr.h>
+
+/* We don't have a real NMI on sparc64, but we can fake one
+ * up using profiling counter overflow interrupts and interrupt
+ * levels.
+ *
+ * The profile overflow interrupts at level 15, so we use
+ * level 14 as our IRQ off level.
+ */
+
+static int nmi_watchdog_active;
+static int panic_on_timeout;
+
+int nmi_usable;
+EXPORT_SYMBOL_GPL(nmi_usable);
+
+static unsigned int nmi_hz = HZ;
+
+static DEFINE_PER_CPU(unsigned int, last_irq_sum);
+static DEFINE_PER_CPU(local_t, alert_counter);
+static DEFINE_PER_CPU(int, nmi_touch);
+
+void touch_nmi_watchdog(void)
+{
+        if (nmi_watchdog_active) {
+                int cpu;
+
+                for_each_present_cpu(cpu) {
+                        if (per_cpu(nmi_touch, cpu) != 1)
+                                per_cpu(nmi_touch, cpu) = 1;
+                }
+        }
+
+        touch_softlockup_watchdog();
+}
+EXPORT_SYMBOL(touch_nmi_watchdog);
+
+static void die_nmi(const char *str, struct pt_regs *regs, int do_panic)
+{
+        if (notify_die(DIE_NMIWATCHDOG, str, regs, 0,
+                       pt_regs_trap_type(regs), SIGINT) == NOTIFY_STOP)
+                return;
+
+        console_verbose();
+        bust_spinlocks(1);
+
+        printk(KERN_EMERG "%s", str);
+        printk(" on CPU%d, ip %08lx, registers:\n",
+               smp_processor_id(), regs->tpc);
+        show_regs(regs);
+
+        bust_spinlocks(0);
+
+        if (do_panic || panic_on_oops)
+                panic("Non maskable interrupt");
+
+        local_irq_enable();
+        do_exit(SIGBUS);
+}
+
+notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs)
+{
+        unsigned int sum, touched = 0;
+        int cpu = smp_processor_id();
+
+        clear_softint(1 << irq);
+        pcr_ops->write(PCR_PIC_PRIV);
+
+        local_cpu_data().__nmi_count++;
+
+        if (notify_die(DIE_NMI, "nmi", regs, 0,
+                       pt_regs_trap_type(regs), SIGINT) == NOTIFY_STOP)
+                touched = 1;
+
+        sum = kstat_irqs_cpu(0, cpu);
+        if (__get_cpu_var(nmi_touch)) {
+                __get_cpu_var(nmi_touch) = 0;
+                touched = 1;
+        }
+        if (!touched && __get_cpu_var(last_irq_sum) == sum) {
+                local_inc(&__get_cpu_var(alert_counter));
+                if (local_read(&__get_cpu_var(alert_counter)) == 5 * nmi_hz)
+                        die_nmi("BUG: NMI Watchdog detected LOCKUP",
+                                regs, panic_on_timeout);
+        } else {
+                __get_cpu_var(last_irq_sum) = sum;
+                local_set(&__get_cpu_var(alert_counter), 0);
+        }
+        if (nmi_usable) {
+                write_pic(picl_value(nmi_hz));
+                pcr_ops->write(pcr_enable);
+        }
+}
+
+static inline unsigned int get_nmi_count(int cpu)
+{
+        return cpu_data(cpu).__nmi_count;
+}
+
+static int endflag __initdata;
+
+static __init void nmi_cpu_busy(void *data)
+{
+        local_irq_enable_in_hardirq();
+        while (endflag == 0)
+                mb();
+}
+
+static void report_broken_nmi(int cpu, int *prev_nmi_count)
+{
+        printk(KERN_CONT "\n");
+
+        printk(KERN_WARNING
+                "WARNING: CPU#%d: NMI appears to be stuck (%d->%d)!\n",
+                        cpu, prev_nmi_count[cpu], get_nmi_count(cpu));
+
+        printk(KERN_WARNING
+                "Please report this to bugzilla.kernel.org,\n");
+        printk(KERN_WARNING
+                "and attach the output of the 'dmesg' command.\n");
+
+        nmi_usable = 0;
+}
+
+static void stop_watchdog(void *unused)
+{
+        pcr_ops->write(PCR_PIC_PRIV);
+}
+
+static int __init check_nmi_watchdog(void)
+{
+        unsigned int *prev_nmi_count;
+        int cpu, err;
+
+        prev_nmi_count = kmalloc(nr_cpu_ids * sizeof(unsigned int), GFP_KERNEL);
+        if (!prev_nmi_count) {
+                err = -ENOMEM;
+                goto error;
+        }
+
+        printk(KERN_INFO "Testing NMI watchdog ... ");
+
+        smp_call_function(nmi_cpu_busy, (void *)&endflag, 0);
+
+        for_each_possible_cpu(cpu)
+                prev_nmi_count[cpu] = get_nmi_count(cpu);
+        local_irq_enable();
+        mdelay((20 * 1000) / nmi_hz); /* wait 20 ticks */
+
+        for_each_online_cpu(cpu) {
+                if (get_nmi_count(cpu) - prev_nmi_count[cpu] <= 5)
+                        report_broken_nmi(cpu, prev_nmi_count);
+        }
+        endflag = 1;
+        if (!nmi_usable) {
+                kfree(prev_nmi_count);
+                err = -ENODEV;
+                goto error;
+        }
+        printk("OK.\n");
+
+        nmi_hz = 1;
+
+        kfree(prev_nmi_count);
+        return 0;
+error:
+        on_each_cpu(stop_watchdog, NULL, 1);
+        return err;
+}
+
+static void start_watchdog(void *unused)
+{
+        pcr_ops->write(PCR_PIC_PRIV);
+        write_pic(picl_value(nmi_hz));
+
+        pcr_ops->write(pcr_enable);
+}
+
+void nmi_adjust_hz(unsigned int new_hz)
+{
+        nmi_hz = new_hz;
+        on_each_cpu(start_watchdog, NULL, 1);
+}
+EXPORT_SYMBOL_GPL(nmi_adjust_hz);
+
+int __init nmi_init(void)
+{
+        nmi_usable = 1;
+
+        on_each_cpu(start_watchdog, NULL, 1);
+
+        return check_nmi_watchdog();
+}
+
+static int __init setup_nmi_watchdog(char *str)
+{
+        if (!strncmp(str, "panic", 5))
+                panic_on_timeout = 1;
+
+        return 0;
+}
+__setup("nmi_watchdog=", setup_nmi_watchdog);
diff --git a/arch/sparc/kernel/pcr.c b/arch/sparc/kernel/pcr.c
new file mode 100644
index 000000000000..92e0dda141a4
--- /dev/null
+++ b/arch/sparc/kernel/pcr.c
@@ -0,0 +1,153 @@
+/* pcr.c: Generic sparc64 performance counter infrastructure.
+ *
+ * Copyright (C) 2009 David S. Miller (davem@davemloft.net)
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+
+#include <asm/pil.h>
+#include <asm/pcr.h>
+#include <asm/nmi.h>
+
+/* This code is shared between various users of the performance
+ * counters.  Users will be oprofile, pseudo-NMI watchdog, and the
+ * perf_counter support layer.
+ */
+
+#define PCR_SUN4U_ENABLE        (PCR_PIC_PRIV | PCR_STRACE | PCR_UTRACE)
+#define PCR_N2_ENABLE           (PCR_PIC_PRIV | PCR_STRACE | PCR_UTRACE | \
+                                 PCR_N2_TOE_OV1 | \
+                                 (2 << PCR_N2_SL1_SHIFT) | \
+                                 (0xff << PCR_N2_MASK1_SHIFT))
+
+u64 pcr_enable;
+unsigned int picl_shift;
+
+/* Performance counter interrupts run unmasked at PIL level 15.
+ * Therefore we can't do things like wakeups and other work
+ * that expects IRQ disabling to be adhered to in locking etc.
+ *
+ * Therefore in such situations we defer the work by signalling
+ * a lower level cpu IRQ.
+ */
+void deferred_pcr_work_irq(int irq, struct pt_regs *regs)
+{
+        clear_softint(1 << PIL_DEFERRED_PCR_WORK);
+}
+
+void schedule_deferred_pcr_work(void)
+{
+        set_softint(1 << PIL_DEFERRED_PCR_WORK);
+}
+
+const struct pcr_ops *pcr_ops;
+EXPORT_SYMBOL_GPL(pcr_ops);
+
+static u64 direct_pcr_read(void)
+{
+        u64 val;
+
+        read_pcr(val);
+        return val;
+}
+
+static void direct_pcr_write(u64 val)
+{
+        write_pcr(val);
+}
+
+static const struct pcr_ops direct_pcr_ops = {
+        .read   = direct_pcr_read,
+        .write  = direct_pcr_write,
+};
+
+static void n2_pcr_write(u64 val)
+{
+        unsigned long ret;
+
+        ret = sun4v_niagara2_setperf(HV_N2_PERF_SPARC_CTL, val);
+        if (val != HV_EOK)
+                write_pcr(val);
+}
+
+static const struct pcr_ops n2_pcr_ops = {
+        .read   = direct_pcr_read,
+        .write  = n2_pcr_write,
+};
+
+static unsigned long perf_hsvc_group;
+static unsigned long perf_hsvc_major;
+static unsigned long perf_hsvc_minor;
+
+static int __init register_perf_hsvc(void)
+{
+        if (tlb_type == hypervisor) {
+                switch (sun4v_chip_type) {
+                case SUN4V_CHIP_NIAGARA1:
+                        perf_hsvc_group = HV_GRP_NIAG_PERF;
+                        break;
+
+                case SUN4V_CHIP_NIAGARA2:
+                        perf_hsvc_group = HV_GRP_N2_CPU;
+                        break;
+
+                default:
+                        return -ENODEV;
+                }
+
+
+                perf_hsvc_major = 1;
+                perf_hsvc_minor = 0;
+                if (sun4v_hvapi_register(perf_hsvc_group,
+                                         perf_hsvc_major,
+                                         &perf_hsvc_minor)) {
+                        printk("perfmon: Could not register hvapi.\n");
+                        return -ENODEV;
+                }
+        }
+        return 0;
+}
+
+static void __init unregister_perf_hsvc(void)
+{
+        if (tlb_type != hypervisor)
+                return;
+        sun4v_hvapi_unregister(perf_hsvc_group);
+}
+
+int __init pcr_arch_init(void)
+{
+        int err = register_perf_hsvc();
+
+        if (err)
+                return err;
+
+        switch (tlb_type) {
+        case hypervisor:
+                pcr_ops = &n2_pcr_ops;
+                pcr_enable = PCR_N2_ENABLE;
+                picl_shift = 2;
+                break;
+
+        case cheetah:
+        case cheetah_plus:
+        case spitfire:
+                pcr_ops = &direct_pcr_ops;
+                pcr_enable = PCR_SUN4U_ENABLE;
+                break;
+
+        default:
+                err = -ENODEV;
+                goto out_unregister;
+        }
+
+        return nmi_init();
+
+out_unregister:
+        unregister_perf_hsvc();
+        return err;
+}
+
+arch_initcall(pcr_arch_init);
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index cc8b5604442c..a73954b87f0a 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -29,6 +29,7 @@
 #include <linux/cpu.h>
 #include <linux/elfcore.h>
 #include <linux/sysrq.h>
+#include <linux/nmi.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -52,8 +53,10 @@
 
 static void sparc64_yield(int cpu)
 {
-        if (tlb_type != hypervisor)
+        if (tlb_type != hypervisor) {
+                touch_nmi_watchdog();
                 return;
+        }
 
         clear_thread_flag(TIF_POLLING_NRFLAG);
         smp_mb__after_clear_bit();
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index 49d061f4ae9d..f2bcfd2967d7 100644
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -354,6 +354,7 @@ static int show_cpuinfo(struct seq_file *m, void *__unused)
         seq_printf(m, 
                    "cpu\t\t: %s\n"
                    "fpu\t\t: %s\n"
+                   "pmu\t\t: %s\n"
                    "prom\t\t: %s\n"
                    "type\t\t: %s\n"
                    "ncpus probed\t: %d\n"
@@ -366,6 +367,7 @@ static int show_cpuinfo(struct seq_file *m, void *__unused)
                    ,
                    sparc_cpu_type,
                    sparc_fpu_type,
+                   sparc_pmu_type,
                    prom_version,
                    ((tlb_type == hypervisor) ?
                     "sun4v" :
diff --git a/arch/sparc/kernel/ttable.S b/arch/sparc/kernel/ttable.S
index ea925503b42e..d9bdfb9d5c18 100644
--- a/arch/sparc/kernel/ttable.S
+++ b/arch/sparc/kernel/ttable.S
@@ -63,7 +63,8 @@ tl0_irq6:	TRAP_IRQ(smp_call_function_single_client, 6)
 #else
 tl0_irq6:       BTRAP(0x46)
 #endif
-tl0_irq7:       BTRAP(0x47) BTRAP(0x48) BTRAP(0x49)
+tl0_irq7:       TRAP_IRQ(deferred_pcr_work_irq, 7)
+tl0_irq8:       BTRAP(0x48) BTRAP(0x49)
 tl0_irq10:      BTRAP(0x4a) BTRAP(0x4b) BTRAP(0x4c) BTRAP(0x4d)
 tl0_irq14:      TRAP_IRQ(timer_interrupt, 14)
 tl0_irq15:      TRAP_NMI_IRQ(perfctr_irq, 15)
diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
index a9e474bf6385..4ab8993b0863 100644
--- a/arch/sparc/mm/fault_64.c
+++ b/arch/sparc/mm/fault_64.c
@@ -19,6 +19,7 @@
 #include <linux/interrupt.h>
 #include <linux/kprobes.h>
 #include <linux/kdebug.h>
+#include <linux/percpu.h>
 
 #include <asm/page.h>
 #include <asm/pgtable.h>
@@ -224,6 +225,30 @@ cannot_handle:
         unhandled_fault (address, current, regs);
 }
 
+static void noinline bogus_32bit_fault_tpc(struct pt_regs *regs)
+{
+        static int times;
+
+        if (times++ < 10)
+                printk(KERN_ERR "FAULT[%s:%d]: 32-bit process reports "
+                       "64-bit TPC [%lx]\n",
+                       current->comm, current->pid,
+                       regs->tpc);
+        show_regs(regs);
+}
+
+static void noinline bogus_32bit_fault_address(struct pt_regs *regs,
+                                               unsigned long addr)
+{
+        static int times;
+
+        if (times++ < 10)
+                printk(KERN_ERR "FAULT[%s:%d]: 32-bit process "
+                       "reports 64-bit fault address [%lx]\n",
+                       current->comm, current->pid, addr);
+        show_regs(regs);
+}
+
 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
 {
         struct mm_struct *mm = current->mm;
@@ -244,6 +269,19 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
             (fault_code & FAULT_CODE_DTLB))
                 BUG();
 
+        if (test_thread_flag(TIF_32BIT)) {
+                if (!(regs->tstate & TSTATE_PRIV)) {
+                        if (unlikely((regs->tpc >> 32) != 0)) {
+                                bogus_32bit_fault_tpc(regs);
+                                goto intr_or_no_mm;
+                        }
+                }
+                if (unlikely((address >> 32) != 0)) {
+                        bogus_32bit_fault_address(regs, address);
+                        goto intr_or_no_mm;
+                }
+        }
+
         if (regs->tstate & TSTATE_PRIV) {
                 unsigned long tpc = regs->tpc;
 
@@ -264,12 +302,6 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
         if (in_atomic() || !mm)
                 goto intr_or_no_mm;
 
-        if (test_thread_flag(TIF_32BIT)) {
-                if (!(regs->tstate & TSTATE_PRIV))
-                        regs->tpc &= 0xffffffff;
-                address &= 0xffffffff;
-        }
-
         if (!down_read_trylock(&mm->mmap_sem)) {
                 if ((regs->tstate & TSTATE_PRIV) &&
                     !search_exception_tables(regs->tpc)) {
diff --git a/arch/sparc/oprofile/init.c b/arch/sparc/oprofile/init.c
index d6e170c074fc..d172f86439b1 100644
--- a/arch/sparc/oprofile/init.c
+++ b/arch/sparc/oprofile/init.c
@@ -13,217 +13,57 @@
 #include <linux/init.h>
  
 #ifdef CONFIG_SPARC64
-#include <asm/hypervisor.h>
-#include <asm/spitfire.h>
-#include <asm/cpudata.h>
-#include <asm/irq.h>
+#include <linux/notifier.h>
+#include <linux/rcupdate.h>
+#include <linux/kdebug.h>
+#include <asm/nmi.h>
 
-static int nmi_enabled;
-
-struct pcr_ops {
-        u64 (*read)(void);
-        void (*write)(u64);
-};
-static const struct pcr_ops *pcr_ops;
-
-static u64 direct_pcr_read(void)
-{
-        u64 val;
-
-        read_pcr(val);
-        return val;
-}
-
-static void direct_pcr_write(u64 val)
-{
-        write_pcr(val);
-}
-
-static const struct pcr_ops direct_pcr_ops = {
-        .read   = direct_pcr_read,
-        .write  = direct_pcr_write,
-};
-
-static void n2_pcr_write(u64 val)
+static int profile_timer_exceptions_notify(struct notifier_block *self,
+                                           unsigned long val, void *data)
 {
-        unsigned long ret;
-
-        ret = sun4v_niagara2_setperf(HV_N2_PERF_SPARC_CTL, val);
-        if (val != HV_EOK)
-                write_pcr(val);
-}
-
-static const struct pcr_ops n2_pcr_ops = {
-        .read   = direct_pcr_read,
-        .write  = n2_pcr_write,
-};
-
-/* In order to commonize as much of the implementation as
- * possible, we use PICH as our counter.  Mostly this is
- * to accomodate Niagara-1 which can only count insn cycles
- * in PICH.
- */
-static u64 picl_value(void)
-{
-        u32 delta = local_cpu_data().clock_tick / HZ;
-
-        return ((u64)((0 - delta) & 0xffffffff)) << 32;
-}
-
-#define PCR_PIC_PRIV            0x00000001 /* PIC access is privileged */
-#define PCR_STRACE              0x00000002 /* Trace supervisor events  */
-#define PCR_UTRACE              0x00000004 /* Trace user events        */
-#define PCR_N2_HTRACE           0x00000008 /* Trace hypervisor events  */
-#define PCR_N2_TOE_OV0          0x00000010 /* Trap if PIC 0 overflows  */
-#define PCR_N2_TOE_OV1          0x00000020 /* Trap if PIC 1 overflows  */
-#define PCR_N2_MASK0            0x00003fc0
-#define PCR_N2_MASK0_SHIFT      6
-#define PCR_N2_SL0              0x0003c000
-#define PCR_N2_SL0_SHIFT        14
-#define PCR_N2_OV0              0x00040000
-#define PCR_N2_MASK1            0x07f80000
-#define PCR_N2_MASK1_SHIFT      19
-#define PCR_N2_SL1              0x78000000
-#define PCR_N2_SL1_SHIFT        27
-#define PCR_N2_OV1              0x80000000
-
-#define PCR_SUN4U_ENABLE        (PCR_PIC_PRIV | PCR_STRACE | PCR_UTRACE)
-#define PCR_N2_ENABLE           (PCR_PIC_PRIV | PCR_STRACE | PCR_UTRACE | \
-                                 PCR_N2_TOE_OV1 | \
-                                 (2 << PCR_N2_SL1_SHIFT) | \
-                                 (0xff << PCR_N2_MASK1_SHIFT))
-
-static u64 pcr_enable = PCR_SUN4U_ENABLE;
-
-static void nmi_handler(struct pt_regs *regs)
-{
-        pcr_ops->write(PCR_PIC_PRIV);
-
-        if (nmi_enabled) {
-                oprofile_add_sample(regs, 0);
-
-                write_pic(picl_value());
-                pcr_ops->write(pcr_enable);
-        }
-}
-
-/* We count "clock cycle" events in the lower 32-bit PIC.
- * Then configure it such that it overflows every HZ, and thus
- * generates a level 15 interrupt at that frequency.
- */
-static void cpu_nmi_start(void *_unused)
-{
-        pcr_ops->write(PCR_PIC_PRIV);
-        write_pic(picl_value());
-
-        pcr_ops->write(pcr_enable);
-}
+        struct die_args *args = (struct die_args *)data;
+        int ret = NOTIFY_DONE;
 
-static void cpu_nmi_stop(void *_unused)
-{
-        pcr_ops->write(PCR_PIC_PRIV);
-}
-
-static int nmi_start(void)
-{
-        int err = register_perfctr_intr(nmi_handler);
-
-        if (!err) {
-                nmi_enabled = 1;
-                wmb();
-                err = on_each_cpu(cpu_nmi_start, NULL, 1);
-                if (err) {
-                        nmi_enabled = 0;
-                        wmb();
-                        on_each_cpu(cpu_nmi_stop, NULL, 1);
-                        release_perfctr_intr(nmi_handler);
-                }
+        switch (val) {
+        case DIE_NMI:
+                oprofile_add_sample(args->regs, 0);
+                ret = NOTIFY_STOP;
+                break;
+        default:
+                break;
         }
-
-        return err;
-}
-
-static void nmi_stop(void)
-{
-        nmi_enabled = 0;
-        wmb();
-
-        on_each_cpu(cpu_nmi_stop, NULL, 1);
-        release_perfctr_intr(nmi_handler);
-        synchronize_sched();
+        return ret;
 }
 
-static unsigned long perf_hsvc_group;
-static unsigned long perf_hsvc_major;
-static unsigned long perf_hsvc_minor;
+static struct notifier_block profile_timer_exceptions_nb = {
+        .notifier_call  = profile_timer_exceptions_notify,
+};
 
-static int __init register_perf_hsvc(void)
+static int timer_start(void)
 {
-        if (tlb_type == hypervisor) {
-                switch (sun4v_chip_type) {
-                case SUN4V_CHIP_NIAGARA1:
-                        perf_hsvc_group = HV_GRP_NIAG_PERF;
-                        break;
-
-                case SUN4V_CHIP_NIAGARA2:
-                        perf_hsvc_group = HV_GRP_N2_CPU;
-                        break;
-
-                default:
-                        return -ENODEV;
-                }
-
-
-                perf_hsvc_major = 1;
-                perf_hsvc_minor = 0;
-                if (sun4v_hvapi_register(perf_hsvc_group,
-                                         perf_hsvc_major,
-                                         &perf_hsvc_minor)) {
-                        printk("perfmon: Could not register N2 hvapi.\n");
-                        return -ENODEV;
-                }
-        }
+        if (register_die_notifier(&profile_timer_exceptions_nb))
+                return 1;
+        nmi_adjust_hz(HZ);
         return 0;
 }
 
-static void unregister_perf_hsvc(void)
+
+static void timer_stop(void)
 {
-        if (tlb_type != hypervisor)
-                return;
-        sun4v_hvapi_unregister(perf_hsvc_group);
+        nmi_adjust_hz(1);
+        unregister_die_notifier(&profile_timer_exceptions_nb);
+        synchronize_sched();  /* Allow already-started NMIs to complete. */
 }
 
-static int oprofile_nmi_init(struct oprofile_operations *ops)
+static int op_nmi_timer_init(struct oprofile_operations *ops)
 {
-        int err = register_perf_hsvc();
-
-        if (err)
-                return err;
-
-        switch (tlb_type) {
-        case hypervisor:
-                pcr_ops = &n2_pcr_ops;
-                pcr_enable = PCR_N2_ENABLE;
-                break;
-
-        case cheetah:
-        case cheetah_plus:
-                pcr_ops = &direct_pcr_ops;
-                break;
-
-        default:
+        if (!nmi_usable)
                 return -ENODEV;
-        }
 
-        ops->create_files = NULL;
-        ops->setup = NULL;
-        ops->shutdown = NULL;
-        ops->start = nmi_start;
-        ops->stop = nmi_stop;
+        ops->start = timer_start;
+        ops->stop = timer_stop;
         ops->cpu_type = "timer";
-
-        printk(KERN_INFO "oprofile: Using perfctr based NMI timer interrupt.\n");
-
+        printk(KERN_INFO "oprofile: Using perfctr NMI timer interrupt.\n");
         return 0;
 }
 #endif
@@ -233,7 +73,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
         int ret = -ENODEV;
 
 #ifdef CONFIG_SPARC64
-        ret = oprofile_nmi_init(ops);
+        ret = op_nmi_timer_init(ops);
         if (!ret)
                 return ret;
 #endif
@@ -241,10 +81,6 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
         return ret;
 }
 
-
 void oprofile_arch_exit(void)
 {
-#ifdef CONFIG_SPARC64
-        unregister_perf_hsvc();
-#endif
 }
diff --git a/drivers/dca/dca-core.c b/drivers/dca/dca-core.c
index 55433849bfa6..33bd75347518 100644
--- a/drivers/dca/dca-core.c
+++ b/drivers/dca/dca-core.c
@@ -28,7 +28,7 @@
 #include <linux/device.h>
 #include <linux/dca.h>
 
-#define DCA_VERSION "1.4"
+#define DCA_VERSION "1.8"
 
 MODULE_VERSION(DCA_VERSION);
 MODULE_LICENSE("GPL");
@@ -60,16 +60,17 @@ int dca_add_requester(struct device *dev)
 {
         struct dca_provider *dca;
         int err, slot = -ENODEV;
+        unsigned long flags;
 
         if (!dev)
                 return -EFAULT;
 
-        spin_lock(&dca_lock);
+        spin_lock_irqsave(&dca_lock, flags);
 
         /* check if the requester has not been added already */
         dca = dca_find_provider_by_dev(dev);
         if (dca) {
-                spin_unlock(&dca_lock);
+                spin_unlock_irqrestore(&dca_lock, flags);
                 return -EEXIST;
         }
 
@@ -78,19 +79,21 @@ int dca_add_requester(struct device *dev)
                 if (slot >= 0)
                         break;
         }
-        if (slot < 0) {
-                spin_unlock(&dca_lock);
+
+        spin_unlock_irqrestore(&dca_lock, flags);
+
+        if (slot < 0)
                 return slot;
-        }
 
         err = dca_sysfs_add_req(dca, dev, slot);
         if (err) {
-                dca->ops->remove_requester(dca, dev);
-                spin_unlock(&dca_lock);
+                spin_lock_irqsave(&dca_lock, flags);
+                if (dca == dca_find_provider_by_dev(dev))
+                        dca->ops->remove_requester(dca, dev);
+                spin_unlock_irqrestore(&dca_lock, flags);
                 return err;
         }
 
-        spin_unlock(&dca_lock);
         return 0;
 }
 EXPORT_SYMBOL_GPL(dca_add_requester);
@@ -103,25 +106,25 @@ int dca_remove_requester(struct device *dev)
 {
         struct dca_provider *dca;
         int slot;
+        unsigned long flags;
 
         if (!dev)
                 return -EFAULT;
 
-        spin_lock(&dca_lock);
+        spin_lock_irqsave(&dca_lock, flags);
         dca = dca_find_provider_by_dev(dev);
         if (!dca) {
-                spin_unlock(&dca_lock);
+                spin_unlock_irqrestore(&dca_lock, flags);
                 return -ENODEV;
         }
         slot = dca->ops->remove_requester(dca, dev);
-        if (slot < 0) {
-                spin_unlock(&dca_lock);
+        spin_unlock_irqrestore(&dca_lock, flags);
+
+        if (slot < 0)
                 return slot;
-        }
 
         dca_sysfs_remove_req(dca, slot);
 
-        spin_unlock(&dca_lock);
         return 0;
 }
 EXPORT_SYMBOL_GPL(dca_remove_requester);
@@ -135,17 +138,18 @@ u8 dca_common_get_tag(struct device *dev, int cpu)
 {
         struct dca_provider *dca;
         u8 tag;
+        unsigned long flags;
 
-        spin_lock(&dca_lock);
+        spin_lock_irqsave(&dca_lock, flags);
 
         dca = dca_find_provider_by_dev(dev);
         if (!dca) {
-                spin_unlock(&dca_lock);
+                spin_unlock_irqrestore(&dca_lock, flags);
                 return -ENODEV;
         }
         tag = dca->ops->get_tag(dca, dev, cpu);
 
-        spin_unlock(&dca_lock);
+        spin_unlock_irqrestore(&dca_lock, flags);
         return tag;
 }
 
@@ -217,11 +221,16 @@ static BLOCKING_NOTIFIER_HEAD(dca_provider_chain);
 int register_dca_provider(struct dca_provider *dca, struct device *dev)
 {
         int err;
+        unsigned long flags;
 
         err = dca_sysfs_add_provider(dca, dev);
         if (err)
                 return err;
+
+        spin_lock_irqsave(&dca_lock, flags);
         list_add(&dca->node, &dca_providers);
+        spin_unlock_irqrestore(&dca_lock, flags);
+
         blocking_notifier_call_chain(&dca_provider_chain,
                                      DCA_PROVIDER_ADD, NULL);
         return 0;
@@ -234,9 +243,15 @@ EXPORT_SYMBOL_GPL(register_dca_provider);
  */
 void unregister_dca_provider(struct dca_provider *dca)
 {
+        unsigned long flags;
+
         blocking_notifier_call_chain(&dca_provider_chain,
                                      DCA_PROVIDER_REMOVE, NULL);
+
+        spin_lock_irqsave(&dca_lock, flags);
         list_del(&dca->node);
+        spin_unlock_irqrestore(&dca_lock, flags);
+
         dca_sysfs_remove_provider(dca);
 }
 EXPORT_SYMBOL_GPL(unregister_dca_provider);
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index 24508e28e3fb..ea9488e7ad6d 100644
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
@@ -626,7 +626,6 @@ static int __devinit pcf50633_probe(struct i2c_client *client,
         }
 
         if (client->irq) {
-                set_irq_handler(client->irq, handle_level_irq);
                 ret = request_irq(client->irq, pcf50633_irq,
                                 IRQF_TRIGGER_LOW, "pcf50633", pcf);
 
diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c
index 7957f525b2f4..6faefcffcb53 100644
--- a/drivers/misc/sgi-xp/xpnet.c
+++ b/drivers/misc/sgi-xp/xpnet.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1999-2008 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1999-2009 Silicon Graphics, Inc. All rights reserved.
  */
 
 /*
@@ -551,6 +551,7 @@ xpnet_init(void)
 
         netif_carrier_off(xpnet_device);
 
+        xpnet_device->netdev_ops = &xpnet_netdev_ops;
         xpnet_device->mtu = XPNET_DEF_MTU;
 
         /*
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 840b3d1a22f5..bbbc3bb08aa5 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -806,7 +806,7 @@ static int cas_reset_mii_phy(struct cas *cp)
 
         cas_phy_write(cp, MII_BMCR, BMCR_RESET);
         udelay(100);
-        while (limit--) {
+        while (--limit) {
                 val = cas_phy_read(cp, MII_BMCR);
                 if ((val & BMCR_RESET) == 0)
                         break;
@@ -979,7 +979,7 @@ static void cas_phy_init(struct cas *cp)
                 writel(val, cp->regs + REG_PCS_MII_CTRL);
 
                 limit = STOP_TRIES;
-                while (limit-- > 0) {
+                while (--limit > 0) {
                         udelay(10);
                         if ((readl(cp->regs + REG_PCS_MII_CTRL) &
                              PCS_MII_RESET) == 0)
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index c986978ce761..6bd63cc67b3e 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -940,7 +940,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                 err = pci_enable_device(pdev);
         } else {
                 bars = pci_select_bars(pdev, IORESOURCE_MEM);
-                err = pci_enable_device(pdev);
+                err = pci_enable_device_mem(pdev);
         }
         if (err)
                 return err;
diff --git a/drivers/net/ibm_newemac/phy.c b/drivers/net/ibm_newemac/phy.c
index c40cd8df2212..ac9d964e59ec 100644
--- a/drivers/net/ibm_newemac/phy.c
+++ b/drivers/net/ibm_newemac/phy.c
@@ -60,7 +60,7 @@ int emac_mii_reset_phy(struct mii_phy *phy)
 
         udelay(300);
 
-        while (limit--) {
+        while (--limit) {
                 val = phy_read(phy, MII_BMCR);
                 if (val >= 0 && (val & BMCR_RESET) == 0)
                         break;
@@ -84,7 +84,7 @@ int emac_mii_reset_gpcs(struct mii_phy *phy)
 
         udelay(300);
 
-        while (limit--) {
+        while (--limit) {
                 val = gpcs_phy_read(phy, MII_BMCR);
                 if (val >= 0 && (val & BMCR_RESET) == 0)
                         break;
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index c38ed777f0a8..a6999403f37b 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -586,7 +586,7 @@ static int pcnet_config(struct pcmcia_device *link)
     }
 
     if ((link->conf.ConfigBase == 0x03c0)
-        && (link->manf_id == 0x149) && (link->card_id = 0xc1ab)) {
+        && (link->manf_id == 0x149) && (link->card_id == 0xc1ab)) {
         printk(KERN_INFO "pcnet_cs: this is an AX88190 card!\n");
         printk(KERN_INFO "pcnet_cs: use axnet_cs instead.\n");
         goto failed;
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h
index c1dadadfab18..e6fdce9206cc 100644
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
@@ -787,12 +787,12 @@ struct mbox_params {
 
 struct flash_params {
         u8 dev_id_str[4];
-        u16 size;
-        u16 csum;
-        u16 ver;
-        u16 sub_dev_id;
+        __le16 size;
+        __le16 csum;
+        __le16 ver;
+        __le16 sub_dev_id;
         u8 mac_addr[6];
-        u16 res;
+        __le16 res;
 };
 
 
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 45421c8b6010..3d1d7b6e55aa 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -641,7 +641,7 @@ static void ql_enable_all_completion_interrupts(struct ql_adapter *qdev)
 
 }
 
-static int ql_read_flash_word(struct ql_adapter *qdev, int offset, u32 *data)
+static int ql_read_flash_word(struct ql_adapter *qdev, int offset, __le32 *data)
 {
         int status = 0;
         /* wait for reg to come ready */
@@ -656,8 +656,11 @@ static int ql_read_flash_word(struct ql_adapter *qdev, int offset, u32 *data)
                         FLASH_ADDR, FLASH_ADDR_RDY, FLASH_ADDR_ERR);
         if (status)
                 goto exit;
-        /* get the data */
-        *data = ql_read32(qdev, FLASH_DATA);
+         /* This data is stored on flash as an array of
+         * __le32.  Since ql_read32() returns cpu endian
+         * we need to swap it back.
+         */
+        *data = cpu_to_le32(ql_read32(qdev, FLASH_DATA));
 exit:
         return status;
 }
@@ -666,13 +669,20 @@ static int ql_get_flash_params(struct ql_adapter *qdev)
 {
         int i;
         int status;
-        u32 *p = (u32 *)&qdev->flash;
+        __le32 *p = (__le32 *)&qdev->flash;
+        u32 offset = 0;
+
+        /* Second function's parameters follow the first
+         * function's.
+         */
+        if (qdev->func)
+                offset = sizeof(qdev->flash) / sizeof(u32);
 
         if (ql_sem_spinlock(qdev, SEM_FLASH_MASK))
                 return -ETIMEDOUT;
 
         for (i = 0; i < sizeof(qdev->flash) / sizeof(u32); i++, p++) {
-                status = ql_read_flash_word(qdev, i, p);
+                status = ql_read_flash_word(qdev, i+offset, p);
                 if (status) {
                         QPRINTK(qdev, IFUP, ERR, "Error reading flash.\n");
                         goto exit;
@@ -3826,7 +3836,7 @@ static int qlge_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *ndev = pci_get_drvdata(pdev);
         struct ql_adapter *qdev = netdev_priv(ndev);
-        int err;
+        int err, i;
 
         netif_device_detach(ndev);
 
@@ -3836,6 +3846,9 @@ static int qlge_suspend(struct pci_dev *pdev, pm_message_t state)
                         return err;
         }
 
+        for (i = qdev->rss_ring_first_cq_id; i < qdev->rx_ring_count; i++)
+                netif_napi_del(&qdev->rx_ring[i].napi);
+
         err = pci_save_state(pdev);
         if (err)
                 return err;
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index bf3aa2a1effe..223cde0d43be 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -220,9 +220,9 @@ static void smc911x_reset(struct net_device *dev)
 
         /* make sure EEPROM has finished loading before setting GPIO_CFG */
         timeout=1000;
-        while ( timeout-- && (SMC_GET_E2P_CMD(lp) & E2P_CMD_EPC_BUSY_)) {
+        while (--timeout && (SMC_GET_E2P_CMD(lp) & E2P_CMD_EPC_BUSY_))
                 udelay(10);
-        }
+
         if (timeout == 0){
                 PRINTK("%s: smc911x_reset timeout waiting for EEPROM busy\n", dev->name);
                 return;
diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c
index d801900a5036..a1e4b3895b33 100644
--- a/drivers/net/smsc9420.c
+++ b/drivers/net/smsc9420.c
@@ -498,7 +498,7 @@ static void smsc9420_check_mac_address(struct net_device *dev)
 static void smsc9420_stop_tx(struct smsc9420_pdata *pd)
 {
         u32 dmac_control, mac_cr, dma_intr_ena;
-        int timeOut = 1000;
+        int timeout = 1000;
 
         /* disable TX DMAC */
         dmac_control = smsc9420_reg_read(pd, DMAC_CONTROL);
@@ -506,13 +506,13 @@ static void smsc9420_stop_tx(struct smsc9420_pdata *pd)
         smsc9420_reg_write(pd, DMAC_CONTROL, dmac_control);
 
         /* Wait max 10ms for transmit process to stop */
-        while (timeOut--) {
+        while (--timeout) {
                 if (smsc9420_reg_read(pd, DMAC_STATUS) & DMAC_STS_TS_)
                         break;
                 udelay(10);
         }
 
-        if (!timeOut)
+        if (!timeout)
                 smsc_warn(IFDOWN, "TX DMAC failed to stop");
 
         /* ACK Tx DMAC stop bit */
@@ -596,7 +596,7 @@ static void smsc9420_free_rx_ring(struct smsc9420_pdata *pd)
 
 static void smsc9420_stop_rx(struct smsc9420_pdata *pd)
 {
-        int timeOut = 1000;
+        int timeout = 1000;
         u32 mac_cr, dmac_control, dma_intr_ena;
 
         /* mask RX DMAC interrupts */
@@ -617,13 +617,13 @@ static void smsc9420_stop_rx(struct smsc9420_pdata *pd)
         smsc9420_pci_flush_write(pd);
 
         /* wait up to 10ms for receive to stop */
-        while (timeOut--) {
+        while (--timeout) {
                 if (smsc9420_reg_read(pd, DMAC_STATUS) & DMAC_STS_RS_)
                         break;
                 udelay(10);
         }
 
-        if (!timeOut)
+        if (!timeout)
                 smsc_warn(IFDOWN, "RX DMAC did not stop! timeout.");
 
         /* ACK the Rx DMAC stop bit */
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 86c765d83de1..b17efa9cc530 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -148,7 +148,7 @@ static u16 __phy_read(struct gem *gp, int phy_addr, int reg)
         cmd |= (MIF_FRAME_TAMSB);
         writel(cmd, gp->regs + MIF_FRAME);
 
-        while (limit--) {
+        while (--limit) {
                 cmd = readl(gp->regs + MIF_FRAME);
                 if (cmd & MIF_FRAME_TALSB)
                         break;
diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c
index 61843fd57525..78f8cee5fd74 100644
--- a/drivers/net/sungem_phy.c
+++ b/drivers/net/sungem_phy.c
@@ -79,7 +79,7 @@ static int reset_one_mii_phy(struct mii_phy* phy, int phy_id)
 
         udelay(100);
 
-        while (limit--) {
+        while (--limit) {
                 val = __phy_read(phy, phy_id, MII_BMCR);
                 if ((val & BMCR_RESET) == 0)
                         break;
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index 6e8f377355fe..fe0c3f244562 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -227,7 +227,7 @@ static int qe_init(struct sunqe *qep, int from_irq)
         if (!(sbus_readb(mregs + MREGS_PHYCONFIG) & MREGS_PHYCONFIG_LTESTDIS)) {
                 int tries = 50;
 
-                while (tries--) {
+                while (--tries) {
                         u8 tmp;
 
                         mdelay(5);
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c
index 75461dbd4876..a9fd2b2ccaf6 100644
--- a/drivers/net/tsi108_eth.c
+++ b/drivers/net/tsi108_eth.c
@@ -1237,7 +1237,7 @@ static void tsi108_init_phy(struct net_device *dev)
         spin_lock_irqsave(&phy_lock, flags);
 
         tsi108_write_mii(data, MII_BMCR, BMCR_RESET);
-        while (i--){
+        while (--i) {
                 if(!(tsi108_read_mii(data, MII_BMCR) & BMCR_RESET))
                         break;
                 udelay(10);
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index d5d53b633cf8..0bf2114738be 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -392,7 +392,7 @@ static void de_rx (struct de_private *de)
         unsigned drop = 0;
         int rc;
 
-        while (rx_work--) {
+        while (--rx_work) {
                 u32 status, len;
                 dma_addr_t mapping;
                 struct sk_buff *skb, *copy_skb;
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 0d0fa91c0251..fe98acaead97 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -455,6 +455,7 @@ static const struct usb_device_id hso_ids[] = {
         {icon321_port_device(0x0af0, 0xd033)},  /* Icon-322 */
         {USB_DEVICE(0x0af0, 0x7301)},           /* GE40x */
         {USB_DEVICE(0x0af0, 0x7361)},           /* GE40x */
+        {USB_DEVICE(0x0af0, 0x7381)},           /* GE40x */
         {USB_DEVICE(0x0af0, 0x7401)},           /* GI 0401 */
         {USB_DEVICE(0x0af0, 0x7501)},           /* GTM 382 */
         {USB_DEVICE(0x0af0, 0x7601)},           /* GE40x */
@@ -462,7 +463,8 @@ static const struct usb_device_id hso_ids[] = {
         {USB_DEVICE(0x0af0, 0x7801)},
         {USB_DEVICE(0x0af0, 0x7901)},
         {USB_DEVICE(0x0af0, 0x7361)},
-        {icon321_port_device(0x0af0, 0xd051)},
+        {USB_DEVICE(0x0af0, 0xd057)},
+        {USB_DEVICE(0x0af0, 0xd055)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, hso_ids);
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 2124c063a7ef..b97cdc516a8f 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -90,7 +90,6 @@ header-y += if_ppp.h
 header-y += if_slip.h
 header-y += if_strip.h
 header-y += if_tun.h
-header-y += if_tunnel.h
 header-y += in_route.h
 header-y += ioctl.h
 header-y += ip6_tunnel.h
@@ -236,6 +235,7 @@ unifdef-y += if_phonet.h
 unifdef-y += if_pppol2tp.h
 unifdef-y += if_pppox.h
 unifdef-y += if_tr.h
+unifdef-y += if_tunnel.h
 unifdef-y += if_vlan.h
 unifdef-y += igmp.h
 unifdef-y += inet_diag.h
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index aeab2cb32a9c..82c43624c067 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -2,7 +2,10 @@
 #define _IF_TUNNEL_H_
 
 #include <linux/types.h>
+
+#ifdef __KERNEL__
 #include <linux/ip.h>
+#endif
 
 #define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)
 #define SIOCADDTUNNEL   (SIOCDEVPRIVATE + 1)
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index b7faffe5c029..1ab180bad72a 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1015,9 +1015,11 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 
         if ((rc = sock_queue_rcv_skb(sk, skb)) < 0) {
                 /* Note that an ENOMEM error is charged twice */
-                if (rc == -ENOMEM)
+                if (rc == -ENOMEM) {
                         UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
                                          is_udplite);
+                        atomic_inc(&sk->sk_drops);
+                }
                 goto drop;
         }
 
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 9454d4ae46df..1fc4a7885c41 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -222,13 +222,13 @@ static void *packet_lookup_frame(struct packet_sock *po, unsigned int position,
         h.raw = po->pg_vec[pg_vec_pos] + (frame_offset * po->frame_size);
         switch (po->tp_version) {
         case TPACKET_V1:
-                if (status != h.h1->tp_status ? TP_STATUS_USER :
-                                                TP_STATUS_KERNEL)
+                if (status != (h.h1->tp_status ? TP_STATUS_USER :
+                                                TP_STATUS_KERNEL))
                         return NULL;
                 break;
         case TPACKET_V2:
-                if (status != h.h2->tp_status ? TP_STATUS_USER :
-                                                TP_STATUS_KERNEL)
+                if (status != (h.h2->tp_status ? TP_STATUS_USER :
+                                                TP_STATUS_KERNEL))
                         return NULL;
                 break;
         }
diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig
index dcef600d0bf5..5592883e1e4a 100644
--- a/net/sunrpc/Kconfig
+++ b/net/sunrpc/Kconfig
@@ -6,7 +6,7 @@ config SUNRPC_GSS
 
 config SUNRPC_XPRT_RDMA
         tristate
-        depends on SUNRPC && INFINIBAND && EXPERIMENTAL
+        depends on SUNRPC && INFINIBAND && INFINIBAND_ADDR_TRANS && EXPERIMENTAL
         default SUNRPC && INFINIBAND
         help
           This option allows the NFS client and server to support