13 files changed, 40 insertions, 112 deletions

diff --git a/arch/powerpc/include/asm/debug.h b/arch/powerpc/include/asm/debug.h
index d2516308ed1e..a954e4975049 100644
--- a/arch/powerpc/include/asm/debug.h
+++ b/arch/powerpc/include/asm/debug.h
@@ -46,7 +46,8 @@ static inline int debugger_break_match(struct pt_regs *regs) { return 0; }
 static inline int debugger_fault_handler(struct pt_regs *regs) { return 0; }
 #endif
 
-int set_breakpoint(struct arch_hw_breakpoint *brk);
+void set_breakpoint(struct arch_hw_breakpoint *brk);
+void __set_breakpoint(struct arch_hw_breakpoint *brk);
 #ifdef CONFIG_PPC_ADV_DEBUG_REGS
 extern void do_send_trap(struct pt_regs *regs, unsigned long address,
                          unsigned long error_code, int signal_code, int brkpt);
diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h
index d12529f34524..b76f58c124ca 100644
--- a/arch/powerpc/include/asm/eeh.h
+++ b/arch/powerpc/include/asm/eeh.h
@@ -109,7 +109,6 @@ struct eeh_pe {
 #define EEH_DEV_NO_HANDLER      (1 << 8)        /* No error handler     */
 #define EEH_DEV_SYSFS           (1 << 9)        /* Sysfs created        */
 #define EEH_DEV_REMOVED         (1 << 10)       /* Removed permanently  */
-#define EEH_DEV_FRESET          (1 << 11)       /* Fundamental reset    */
 
 struct eeh_dev {
         int mode;                       /* EEH mode                     */
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
index 935b5e7a1436..888d8f3f2524 100644
--- a/arch/powerpc/include/asm/elf.h
+++ b/arch/powerpc/include/asm/elf.h
@@ -90,6 +90,8 @@ typedef elf_vrregset_t elf_fpxregset_t;
 do {                                                            \
         if (((ex).e_flags & 0x3) == 2)                          \
                 set_thread_flag(TIF_ELF2ABI);                   \
+        else                                                    \
+                clear_thread_flag(TIF_ELF2ABI);                 \
         if ((ex).e_ident[EI_CLASS] == ELFCLASS32)               \
                 set_thread_flag(TIF_32BIT);                     \
         else                                                    \
diff --git a/arch/powerpc/include/asm/hw_breakpoint.h b/arch/powerpc/include/asm/hw_breakpoint.h
index eb0f4ac75c4c..ac6432d9be46 100644
--- a/arch/powerpc/include/asm/hw_breakpoint.h
+++ b/arch/powerpc/include/asm/hw_breakpoint.h
@@ -79,7 +79,7 @@ static inline void hw_breakpoint_disable(void)
         brk.address = 0;
         brk.type = 0;
         brk.len = 0;
-        set_breakpoint(&brk);
+        __set_breakpoint(&brk);
 }
 extern void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs);
 
diff --git a/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild
index 48be855ef37b..7a3f795ac218 100644
--- a/arch/powerpc/include/uapi/asm/Kbuild
+++ b/arch/powerpc/include/uapi/asm/Kbuild
@@ -15,7 +15,6 @@ header-y += ioctls.h
 header-y += ipcbuf.h
 header-y += kvm.h
 header-y += kvm_para.h
-header-y += linkage.h
 header-y += mman.h
 header-y += msgbuf.h
 header-y += nvram.h
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index 3764fb788d6c..7051ea3101b9 100644
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -36,6 +36,7 @@
 #include <linux/of.h>
 
 #include <linux/atomic.h>
+#include <asm/debug.h>
 #include <asm/eeh.h>
 #include <asm/eeh_event.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/kernel/hw_breakpoint.c b/arch/powerpc/kernel/hw_breakpoint.c
index b0a1792279bb..0bb5918faaaf 100644
--- a/arch/powerpc/kernel/hw_breakpoint.c
+++ b/arch/powerpc/kernel/hw_breakpoint.c
@@ -72,7 +72,7 @@ int arch_install_hw_breakpoint(struct perf_event *bp)
          * If so, DABR will be populated in single_step_dabr_instruction().
          */
         if (current->thread.last_hit_ubp != bp)
-                set_breakpoint(info);
+                __set_breakpoint(info);
 
         return 0;
 }
@@ -198,7 +198,7 @@ void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs)
 
         info = counter_arch_bp(tsk->thread.last_hit_ubp);
         regs->msr &= ~MSR_SE;
-        set_breakpoint(info);
+        __set_breakpoint(info);
         tsk->thread.last_hit_ubp = NULL;
 }
 
@@ -284,7 +284,7 @@ int __kprobes hw_breakpoint_handler(struct die_args *args)
         if (!(info->type & HW_BRK_TYPE_EXTRANEOUS_IRQ))
                 perf_bp_event(bp, regs);
 
-        set_breakpoint(info);
+        __set_breakpoint(info);
 out:
         rcu_read_unlock();
         return rc;
@@ -316,7 +316,7 @@ int __kprobes single_step_dabr_instruction(struct die_args *args)
         if (!(info->type & HW_BRK_TYPE_EXTRANEOUS_IRQ))
                 perf_bp_event(bp, regs);
 
-        set_breakpoint(info);
+        __set_breakpoint(info);
         current->thread.last_hit_ubp = NULL;
 
         /*
diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c
index ef349d077129..077d2ce6c5a7 100644
--- a/arch/powerpc/kernel/module_64.c
+++ b/arch/powerpc/kernel/module_64.c
@@ -134,7 +134,7 @@ static u32 ppc64_stub_insns[] = {
         0xe98b0020,                     /* ld      r12,32(r11) */
 #if !defined(_CALL_ELF) || _CALL_ELF != 2
         /* Set up new r2 from function descriptor */
-        0xe84b0026,                     /* ld      r2,40(r11) */
+        0xe84b0028,                     /* ld      r2,40(r11) */
 #endif
         0x7d8903a6,                     /* mtctr   r12 */
         0x4e800420                      /* bctr */
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 2ae1b99166c6..8a1edbe26b8f 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -496,14 +496,21 @@ static inline int set_dawr(struct arch_hw_breakpoint *brk)
         return 0;
 }
 
-int set_breakpoint(struct arch_hw_breakpoint *brk)
+void __set_breakpoint(struct arch_hw_breakpoint *brk)
 {
         __get_cpu_var(current_brk) = *brk;
 
         if (cpu_has_feature(CPU_FTR_DAWR))
-                return set_dawr(brk);
+                set_dawr(brk);
+        else
+                set_dabr(brk);
+}
 
-        return set_dabr(brk);
+void set_breakpoint(struct arch_hw_breakpoint *brk)
+{
+        preempt_disable();
+        __set_breakpoint(brk);
+        preempt_enable();
 }
 
 #ifdef CONFIG_PPC64
@@ -835,7 +842,7 @@ struct task_struct *__switch_to(struct task_struct *prev,
  */
 #ifndef CONFIG_HAVE_HW_BREAKPOINT
         if (unlikely(!hw_brk_match(&__get_cpu_var(current_brk), &new->thread.hw_brk)))
-                set_breakpoint(&new->thread.hw_brk);
+                __set_breakpoint(&new->thread.hw_brk);
 #endif /* CONFIG_HAVE_HW_BREAKPOINT */
 #endif
 
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
index 8fc4177ed65a..1c794cef2883 100644
--- a/arch/powerpc/kernel/signal.c
+++ b/arch/powerpc/kernel/signal.c
@@ -134,7 +134,7 @@ static int do_signal(struct pt_regs *regs)
          */
         if (current->thread.hw_brk.address &&
                 current->thread.hw_brk.type)
-                set_breakpoint(&current->thread.hw_brk);
+                __set_breakpoint(&current->thread.hw_brk);
 #endif
         /* Re-enable the breakpoints for the signal stack */
         thread_change_pc(current, regs);
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 122a580f7322..7e711bdcc6da 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -813,9 +813,6 @@ static void __init clocksource_init(void)
 static int decrementer_set_next_event(unsigned long evt,
                                       struct clock_event_device *dev)
 {
-        /* Don't adjust the decrementer if some irq work is pending */
-        if (test_irq_work_pending())
-                return 0;
         __get_cpu_var(decrementers_next_tb) = get_tb_or_rtc() + evt;
         set_dec(evt);
 
diff --git a/arch/powerpc/platforms/powernv/eeh-ioda.c b/arch/powerpc/platforms/powernv/eeh-ioda.c
index 79d0cdf786d0..753f08e36dfa 100644
--- a/arch/powerpc/platforms/powernv/eeh-ioda.c
+++ b/arch/powerpc/platforms/powernv/eeh-ioda.c
@@ -477,127 +477,49 @@ out:
         return 0;
 }
 
-static bool ioda_eeh_is_plx_dnport(struct pci_dev *dev, int *reg,
-                                   int *mask, int *len)
-{
-        unsigned short *pid;
-        unsigned short ids[] = {
-                0x10b5, 0x8748, 0x0080, 0x0400, /* PLX#8748     */
-                0x0000, 0x0000, 0x0000, 0x0000, /* End flag     */
-        };
-
-        if (!pci_is_pcie(dev))
-                return false;
-        if (pci_pcie_type(dev) != PCI_EXP_TYPE_DOWNSTREAM)
-                return false;
-
-        pid = &ids[0];
-        while (!reg) {
-                if (pid[0] == 0x0)
-                        break;
-
-                if (dev->vendor == pid[0] &&
-                    dev->device == pid[1]) {
-                        *reg  = pid[2];
-                        *mask = pid[3];
-                        *len  = 2;
-                        return true;
-                }
-        }
-
-        *reg  = PCI_BRIDGE_CONTROL;
-        *mask = PCI_BRIDGE_CTL_BUS_RESET;
-        *len  = 2;
-        return false;
-}
-
 static int ioda_eeh_bridge_reset(struct pci_dev *dev, int option)
 
 {
         struct device_node *dn = pci_device_to_OF_node(dev);
         struct eeh_dev *edev = of_node_to_eeh_dev(dn);
         int aer = edev ? edev->aer_cap : 0;
-        int reg, mask, val, len;
-        bool is_plx_dnport;
+        u32 ctrl;
 
         pr_debug("%s: Reset PCI bus %04x:%02x with option %d\n",
                  __func__, pci_domain_nr(dev->bus),
                  dev->bus->number, option);
 
-
-        is_plx_dnport = ioda_eeh_is_plx_dnport(dev, &reg, &mask, &len);
-        if (option == EEH_RESET_FUNDAMENTAL)
-                if (!is_plx_dnport || !edev)
-                        option = EEH_RESET_HOT;
-
-        if (option == EEH_RESET_HOT) {
-                reg  = PCI_BRIDGE_CONTROL;
-                mask = PCI_BRIDGE_CTL_BUS_RESET;
-                len  = 2;
-        }
-
-        if (option == EEH_RESET_DEACTIVATE) {
-                if (!is_plx_dnport || !edev ||
-                    !(edev->mode & EEH_DEV_FRESET)) {
-                        reg  = PCI_BRIDGE_CONTROL;
-                        mask = PCI_BRIDGE_CTL_BUS_RESET;
-                        len  = 2;
-                }
-        }
-
         switch (option) {
         case EEH_RESET_FUNDAMENTAL:
-                edev->mode |= EEH_DEV_FRESET;
-                /* Fall through */
         case EEH_RESET_HOT:
+                /* Don't report linkDown event */
                 if (aer) {
-                        /* Mask receiver error */
-                        eeh_ops->read_config(dn, aer + PCI_ERR_COR_MASK,
-                                             4, &val);
-                        val |= PCI_ERR_COR_RCVR;
-                        eeh_ops->write_config(dn, aer + PCI_ERR_COR_MASK,
-                                              4, val);
-
-                        /* Mask linkDown */
                         eeh_ops->read_config(dn, aer + PCI_ERR_UNCOR_MASK,
-                                             4, &val);
-                        val |= PCI_ERR_UNC_SURPDN;
+                                             4, &ctrl);
+                        ctrl |= PCI_ERR_UNC_SURPDN;
                         eeh_ops->write_config(dn, aer + PCI_ERR_UNCOR_MASK,
-                                              4, val);
-                }
+                                              4, ctrl);
+                }
 
-                eeh_ops->read_config(dn, reg, len, &val);
-                val |= mask;
-                eeh_ops->write_config(dn, reg, len, val);
+                eeh_ops->read_config(dn, PCI_BRIDGE_CONTROL, 2, &ctrl);
+                ctrl |= PCI_BRIDGE_CTL_BUS_RESET;
+                eeh_ops->write_config(dn, PCI_BRIDGE_CONTROL, 2, ctrl);
                 msleep(EEH_PE_RST_HOLD_TIME);
 
                 break;
         case EEH_RESET_DEACTIVATE:
-                eeh_ops->read_config(dn, reg, len, &val);
-                val &= ~mask;
-                eeh_ops->write_config(dn, reg, len, val);
+                eeh_ops->read_config(dn, PCI_BRIDGE_CONTROL, 2, &ctrl);
+                ctrl &= ~PCI_BRIDGE_CTL_BUS_RESET;
+                eeh_ops->write_config(dn, PCI_BRIDGE_CONTROL, 2, ctrl);
                 msleep(EEH_PE_RST_SETTLE_TIME);
 
-                if (edev)
-                        edev->mode &= ~EEH_DEV_FRESET;
+                /* Continue reporting linkDown event */
                 if (aer) {
-                        /* Clear receive error and enable it */
-                        eeh_ops->write_config(dn, aer + PCI_ERR_COR_STATUS,
-                                              4, PCI_ERR_COR_RCVR);
-                        eeh_ops->read_config(dn, aer + PCI_ERR_COR_MASK,
-                                             4, &val);
-                        val &= ~PCI_ERR_COR_RCVR;
-                        eeh_ops->write_config(dn, aer + PCI_ERR_COR_MASK,
-                                              4, val);
-
-                        /* Clear linkDown and enable it */
-                        eeh_ops->write_config(dn, aer + PCI_ERR_UNCOR_STATUS,
-                                              4, PCI_ERR_UNC_SURPDN);
                         eeh_ops->read_config(dn, aer + PCI_ERR_UNCOR_MASK,
-                                             4, &val);
-                        val &= ~PCI_ERR_UNC_SURPDN;
+                                             4, &ctrl);
+                        ctrl &= ~PCI_ERR_UNC_SURPDN;
                         eeh_ops->write_config(dn, aer + PCI_ERR_UNCOR_MASK,
-                                              4, val);
+                                              4, ctrl);
                 }
 
                 break;
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 08504e75b2c7..d3759b7a5535 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -759,7 +759,7 @@ static void insert_cpu_bpts(void)
                 brk.address = dabr.address;
                 brk.type = (dabr.enabled & HW_BRK_TYPE_DABR) | HW_BRK_TYPE_PRIV_ALL;
                 brk.len = 8;
-                set_breakpoint(&brk);
+                __set_breakpoint(&brk);
         }
         if (iabr && cpu_has_feature(CPU_FTR_IABR))
                 mtspr(SPRN_IABR, iabr->address