20 files changed, 273 insertions, 167 deletions

diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index 1b73508ecb2b..2cbde865d4f5 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -37,7 +37,7 @@
 #include <asm/prom.h>
 #include <asm/vdso_datapage.h>
 
-#define MODULE_VERS "1.6"
+#define MODULE_VERS "1.7"
 #define MODULE_NAME "lparcfg"
 
 /* #define LPARCFG_DEBUG */
@@ -149,17 +149,17 @@ static void log_plpar_hcall_return(unsigned long rc, char *tag)
         if (rc == 0)            /* success, return */
                 return;
 /* check for null tag ? */
-        if (rc == H_Hardware)
+        if (rc == H_HARDWARE)
                 printk(KERN_INFO
                        "plpar-hcall (%s) failed with hardware fault\n", tag);
-        else if (rc == H_Function)
+        else if (rc == H_FUNCTION)
                 printk(KERN_INFO
                        "plpar-hcall (%s) failed; function not allowed\n", tag);
-        else if (rc == H_Authority)
+        else if (rc == H_AUTHORITY)
                 printk(KERN_INFO
-                       "plpar-hcall (%s) failed; not authorized to this function\n",
-                       tag);
-        else if (rc == H_Parameter)
+                       "plpar-hcall (%s) failed; not authorized to this"
+                       " function\n", tag);
+        else if (rc == H_PARAMETER)
                 printk(KERN_INFO "plpar-hcall (%s) failed; Bad parameter(s)\n",
                        tag);
         else
@@ -209,7 +209,7 @@ static void h_pic(unsigned long *pool_idle_time, unsigned long *num_procs)
         unsigned long dummy;
         rc = plpar_hcall(H_PIC, 0, 0, 0, 0, pool_idle_time, num_procs, &dummy);
 
-        if (rc != H_Authority)
+        if (rc != H_AUTHORITY)
                 log_plpar_hcall_return(rc, "H_PIC");
 }
 
@@ -242,7 +242,7 @@ static void parse_system_parameter_string(struct seq_file *m)
 {
         int call_status;
 
-        char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
+        unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
         if (!local_buffer) {
                 printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
                        __FILE__, __FUNCTION__, __LINE__);
@@ -254,7 +254,8 @@ static void parse_system_parameter_string(struct seq_file *m)
         call_status = rtas_call(rtas_token("ibm,get-system-parameter"), 3, 1,
                                 NULL,
                                 SPLPAR_CHARACTERISTICS_TOKEN,
-                                __pa(rtas_data_buf));
+                                __pa(rtas_data_buf),
+                                RTAS_DATA_BUF_SIZE);
         memcpy(local_buffer, rtas_data_buf, SPLPAR_MAXLENGTH);
         spin_unlock(&rtas_data_buf_lock);
 
@@ -275,7 +276,7 @@ static void parse_system_parameter_string(struct seq_file *m)
 #ifdef LPARCFG_DEBUG
                 printk(KERN_INFO "success calling get-system-parameter \n");
 #endif
-                splpar_strlen = local_buffer[0] * 16 + local_buffer[1];
+                splpar_strlen = local_buffer[0] * 256 + local_buffer[1];
                 local_buffer += 2;      /* step over strlen value */
 
                 memset(workbuffer, 0, SPLPAR_MAXLENGTH);
@@ -529,13 +530,13 @@ static ssize_t lparcfg_write(struct file *file, const char __user * buf,
         retval = plpar_hcall_norets(H_SET_PPP, *new_entitled_ptr,
                                     *new_weight_ptr);
 
-        if (retval == H_Success || retval == H_Constrained) {
+        if (retval == H_SUCCESS || retval == H_CONSTRAINED) {
                 retval = count;
-        } else if (retval == H_Busy) {
+        } else if (retval == H_BUSY) {
                 retval = -EBUSY;
-        } else if (retval == H_Hardware) {
+        } else if (retval == H_HARDWARE) {
                 retval = -EIO;
-        } else if (retval == H_Parameter) {
+        } else if (retval == H_PARAMETER) {
                 retval = -EINVAL;
         } else {
                 printk(KERN_WARNING "%s: received unknown hv return code %ld",
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 06636c927a7e..0112318213ab 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -578,18 +578,18 @@ static void rtas_percpu_suspend_me(void *info)
          * We use "waiting" to indicate our state.  As long
          * as it is >0, we are still trying to all join up.
          * If it goes to 0, we have successfully joined up and
-         * one thread got H_Continue.  If any error happens,
+         * one thread got H_CONTINUE.  If any error happens,
          * we set it to <0.
          */
         local_irq_save(flags);
         do {
                 rc = plpar_hcall_norets(H_JOIN);
                 smp_rmb();
-        } while (rc == H_Success && data->waiting > 0);
-        if (rc == H_Success)
+        } while (rc == H_SUCCESS && data->waiting > 0);
+        if (rc == H_SUCCESS)
                 goto out;
 
-        if (rc == H_Continue) {
+        if (rc == H_CONTINUE) {
                 data->waiting = 0;
                 data->args->args[data->args->nargs] =
                         rtas_call(ibm_suspend_me_token, 0, 1, NULL);
@@ -597,7 +597,7 @@ static void rtas_percpu_suspend_me(void *info)
                         plpar_hcall_norets(H_PROD,i);
         } else {
                 data->waiting = -EBUSY;
-                printk(KERN_ERR "Error on H_Join hypervisor call\n");
+                printk(KERN_ERR "Error on H_JOIN hypervisor call\n");
         }
 
 out:
@@ -624,7 +624,7 @@ static int rtas_ibm_suspend_me(struct rtas_args *args)
                 printk(KERN_ERR "Error doing global join\n");
 
         /* Prod each CPU.  This won't hurt, and will wake
-         * anyone we successfully put to sleep with H_Join
+         * anyone we successfully put to sleep with H_JOIN.
          */
         for_each_possible_cpu(i)
                 plpar_hcall_norets(H_PROD, i);
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index a72bf5dceeee..69ac25701344 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -50,7 +50,6 @@
 #include <asm/kgdb.h>
 #endif
 
-extern void platform_init(void);
 extern void bootx_init(unsigned long r4, unsigned long phys);
 
 boot_infos_t *boot_infos;
@@ -138,12 +137,7 @@ void __init machine_init(unsigned long dt_ptr, unsigned long phys)
                 strlcpy(cmd_line, CONFIG_CMDLINE, sizeof(cmd_line));
 #endif /* CONFIG_CMDLINE */
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
         probe_machine();
-#else
-        /* Base init based on machine type. Obsoloete, please kill ! */
-        platform_init();
-#endif
 
 #ifdef CONFIG_6xx
         if (cpu_has_feature(CPU_FTR_CAN_DOZE) ||
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 59aa92cd6fa4..13e91c4d70a8 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -215,12 +215,10 @@ void __init early_setup(unsigned long dt_ptr)
         /*
          * Initialize stab / SLB management except on iSeries
          */
-        if (!firmware_has_feature(FW_FEATURE_ISERIES)) {
-                if (cpu_has_feature(CPU_FTR_SLB))
-                        slb_initialize();
-                else
-                        stab_initialize(get_paca()->stab_real);
-        }
+        if (cpu_has_feature(CPU_FTR_SLB))
+                slb_initialize();
+        else if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                stab_initialize(get_paca()->stab_real);
 
         DBG(" <- early_setup()\n");
 }
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 4cbde211eb69..064a52564692 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -228,7 +228,7 @@ void system_reset_exception(struct pt_regs *regs)
  */
 static inline int check_io_access(struct pt_regs *regs)
 {
-#ifdef CONFIG_PPC_PMAC
+#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32)
         unsigned long msr = regs->msr;
         const struct exception_table_entry *entry;
         unsigned int *nip = (unsigned int *)regs->nip;
@@ -261,7 +261,7 @@ static inline int check_io_access(struct pt_regs *regs)
                         return 1;
                 }
         }
-#endif /* CONFIG_PPC_PMAC */
+#endif /* CONFIG_PPC_PMAC && CONFIG_PPC32 */
         return 0;
 }
 
@@ -308,8 +308,8 @@ platform_machine_check(struct pt_regs *regs)
 
 void machine_check_exception(struct pt_regs *regs)
 {
-#ifdef CONFIG_PPC64
         int recover = 0;
+        unsigned long reason = get_mc_reason(regs);
 
         /* See if any machine dependent calls */
         if (ppc_md.machine_check_exception)
@@ -317,8 +317,6 @@ void machine_check_exception(struct pt_regs *regs)
 
         if (recover)
                 return;
-#else
-        unsigned long reason = get_mc_reason(regs);
 
         if (user_mode(regs)) {
                 regs->msr |= MSR_RI;
@@ -462,7 +460,6 @@ void machine_check_exception(struct pt_regs *regs)
          * additional info, e.g. bus error registers.
          */
         platform_machine_check(regs);
-#endif /* CONFIG_PPC64 */
 
         if (debugger_fault_handler(regs))
                 return;
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 5aea0909a5ec..fdbba4206d59 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -177,15 +177,15 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
 
         /* When running in the kernel we expect faults to occur only to
          * addresses in user space.  All other faults represent errors in the
-         * kernel and should generate an OOPS.  Unfortunatly, in the case of an
-         * erroneous fault occuring in a code path which already holds mmap_sem
+         * kernel and should generate an OOPS.  Unfortunately, in the case of an
+         * erroneous fault occurring in a code path which already holds mmap_sem
          * we will deadlock attempting to validate the fault against the
          * address space.  Luckily the kernel only validly references user
          * space from well defined areas of code, which are listed in the
          * exceptions table.
          *
          * As the vast majority of faults will be valid we will only perform
-         * the source reference check when there is a possibilty of a deadlock.
+         * the source reference check when there is a possibility of a deadlock.
          * Attempt to lock the address space, if we cannot we then validate the
          * source.  If this is invalid we can skip the address space check,
          * thus avoiding the deadlock.
diff --git a/arch/powerpc/platforms/83xx/mpc834x_sys.c b/arch/powerpc/platforms/83xx/mpc834x_sys.c
index 7c18b4cd5db4..7e789d2420ba 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_sys.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_sys.c
@@ -158,25 +158,25 @@ static int __init mpc834x_rtc_hookup(void)
 late_initcall(mpc834x_rtc_hookup);
 #endif
 
-void __init platform_init(void)
+/*
+ * Called very early, MMU is off, device-tree isn't unflattened
+ */
+static int __init mpc834x_sys_probe(void)
 {
-        /* setup the PowerPC module struct */
-        ppc_md.setup_arch = mpc834x_sys_setup_arch;
-
-        ppc_md.init_IRQ = mpc834x_sys_init_IRQ;
-        ppc_md.get_irq = ipic_get_irq;
-
-        ppc_md.restart = mpc83xx_restart;
-
-        ppc_md.time_init = mpc83xx_time_init;
-        ppc_md.set_rtc_time = NULL;
-        ppc_md.get_rtc_time = NULL;
-        ppc_md.calibrate_decr = generic_calibrate_decr;
-
-        ppc_md.progress = udbg_progress;
-
-        if (ppc_md.progress)
-                ppc_md.progress("mpc834x_sys_init(): exit", 0);
-
-        return;
+        /* We always match for now, eventually we should look at the flat
+           dev tree to ensure this is the board we are suppose to run on
+        */
+        return 1;
 }
+
+define_machine(mpc834x_sys) {
+        .name                   = "MPC834x SYS",
+        .probe                  = mpc834x_sys_probe,
+        .setup_arch             = mpc834x_sys_setup_arch,
+        .init_IRQ               = mpc834x_sys_init_IRQ,
+        .get_irq                = ipic_get_irq,
+        .restart                = mpc83xx_restart,
+        .time_init              = mpc83xx_time_init,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index b7821dbae00d..5eeff370f5fc 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -220,25 +220,25 @@ void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
         seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
 
-void __init platform_init(void)
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init mpc85xx_ads_probe(void)
 {
-        ppc_md.setup_arch = mpc85xx_ads_setup_arch;
-        ppc_md.show_cpuinfo = mpc85xx_ads_show_cpuinfo;
-
-        ppc_md.init_IRQ = mpc85xx_ads_pic_init;
-        ppc_md.get_irq = mpic_get_irq;
-
-        ppc_md.restart = mpc85xx_restart;
-        ppc_md.power_off = NULL;
-        ppc_md.halt = NULL;
-
-        ppc_md.time_init = NULL;
-        ppc_md.set_rtc_time = NULL;
-        ppc_md.get_rtc_time = NULL;
-        ppc_md.calibrate_decr = generic_calibrate_decr;
-
-        ppc_md.progress = udbg_progress;
-
-        if (ppc_md.progress)
-                ppc_md.progress("mpc85xx_ads platform_init(): exit", 0);
+        /* We always match for now, eventually we should look at the flat
+           dev tree to ensure this is the board we are suppose to run on
+        */
+        return 1;
 }
+
+define_machine(mpc85xx_ads) {
+        .name                   = "MPC85xx ADS",
+        .probe                  = mpc85xx_ads_probe,
+        .setup_arch             = mpc85xx_ads_setup_arch,
+        .init_IRQ               = mpc85xx_ads_pic_init,
+        .show_cpuinfo           = mpc85xx_ads_show_cpuinfo,
+        .get_irq                = mpic_get_irq,
+        .restart                = mpc85xx_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/cell/spu_callbacks.c b/arch/powerpc/platforms/cell/spu_callbacks.c
index 3a4245c926ad..6594bec73882 100644
--- a/arch/powerpc/platforms/cell/spu_callbacks.c
+++ b/arch/powerpc/platforms/cell/spu_callbacks.c
@@ -316,6 +316,7 @@ void *spu_syscall_table[] = {
         [__NR_pselect6]                 sys_ni_syscall, /* sys_pselect */
         [__NR_ppoll]                    sys_ni_syscall, /* sys_ppoll */
         [__NR_unshare]                  sys_unshare,
+        [__NR_splice]                   sys_splice,
 };
 
 long spu_sys_callback(struct spu_syscall_block *s)
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c
index c04e078c0fe5..483c8b76232c 100644
--- a/arch/powerpc/platforms/cell/spufs/run.c
+++ b/arch/powerpc/platforms/cell/spufs/run.c
@@ -2,6 +2,7 @@
 #include <linux/ptrace.h>
 
 #include <asm/spu.h>
+#include <asm/unistd.h>
 
 #include "spufs.h"
 
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 9b2b1cb117b3..780fb27a0099 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -865,7 +865,7 @@ void __init eeh_init(void)
  * on the CEC architecture, type of the device, on earlier boot
  * command-line arguments & etc.
  */
-void eeh_add_device_early(struct device_node *dn)
+static void eeh_add_device_early(struct device_node *dn)
 {
         struct pci_controller *phb;
         struct eeh_early_enable_info info;
@@ -882,7 +882,6 @@ void eeh_add_device_early(struct device_node *dn)
         info.buid_lo = BUID_LO(phb->buid);
         early_enable_eeh(dn, &info);
 }
-EXPORT_SYMBOL_GPL(eeh_add_device_early);
 
 void eeh_add_device_tree_early(struct device_node *dn)
 {
@@ -893,20 +892,6 @@ void eeh_add_device_tree_early(struct device_node *dn)
 }
 EXPORT_SYMBOL_GPL(eeh_add_device_tree_early);
 
-void eeh_add_device_tree_late(struct pci_bus *bus)
-{
-        struct pci_dev *dev;
-
-        list_for_each_entry(dev, &bus->devices, bus_list) {
-                eeh_add_device_late(dev);
-                if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
-                        struct pci_bus *subbus = dev->subordinate;
-                        if (subbus)
-                                eeh_add_device_tree_late(subbus);
-                }
-        }
-}
-
 /**
  * eeh_add_device_late - perform EEH initialization for the indicated pci device
  * @dev: pci device for which to set up EEH
@@ -914,7 +899,7 @@ void eeh_add_device_tree_late(struct pci_bus *bus)
  * This routine must be used to complete EEH initialization for PCI
  * devices that were added after system boot (e.g. hotplug, dlpar).
  */
-void eeh_add_device_late(struct pci_dev *dev)
+static void eeh_add_device_late(struct pci_dev *dev)
 {
         struct device_node *dn;
         struct pci_dn *pdn;
@@ -933,16 +918,33 @@ void eeh_add_device_late(struct pci_dev *dev)
 
         pci_addr_cache_insert_device (dev);
 }
-EXPORT_SYMBOL_GPL(eeh_add_device_late);
+
+void eeh_add_device_tree_late(struct pci_bus *bus)
+{
+        struct pci_dev *dev;
+
+        list_for_each_entry(dev, &bus->devices, bus_list) {
+                eeh_add_device_late(dev);
+                if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
+                        struct pci_bus *subbus = dev->subordinate;
+                        if (subbus)
+                                eeh_add_device_tree_late(subbus);
+                }
+        }
+}
+EXPORT_SYMBOL_GPL(eeh_add_device_tree_late);
 
 /**
  * eeh_remove_device - undo EEH setup for the indicated pci device
  * @dev: pci device to be removed
  *
- * This routine should be when a device is removed from a running
- * system (e.g. by hotplug or dlpar).
+ * This routine should be called when a device is removed from
+ * a running system (e.g. by hotplug or dlpar).  It unregisters
+ * the PCI device from the EEH subsystem.  I/O errors affecting
+ * this device will no longer be detected after this call; thus,
+ * i/o errors affecting this slot may leave this device unusable.
  */
-void eeh_remove_device(struct pci_dev *dev)
+static void eeh_remove_device(struct pci_dev *dev)
 {
         struct device_node *dn;
         if (!dev || !eeh_subsystem_enabled)
@@ -958,21 +960,17 @@ void eeh_remove_device(struct pci_dev *dev)
         PCI_DN(dn)->pcidev = NULL;
         pci_dev_put (dev);
 }
-EXPORT_SYMBOL_GPL(eeh_remove_device);
 
 void eeh_remove_bus_device(struct pci_dev *dev)
 {
+        struct pci_bus *bus = dev->subordinate;
+        struct pci_dev *child, *tmp;
+
         eeh_remove_device(dev);
-        if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
-                struct pci_bus *bus = dev->subordinate;
-                struct list_head *ln;
-                if (!bus)
-                        return; 
-                for (ln = bus->devices.next; ln != &bus->devices; ln = ln->next) {
-                        struct pci_dev *pdev = pci_dev_b(ln);
-                        if (pdev)
-                                eeh_remove_bus_device(pdev);
-                }
+
+        if (bus && dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
+                list_for_each_entry_safe(child, tmp, &bus->devices, bus_list)
+                         eeh_remove_bus_device(child);
         }
 }
 EXPORT_SYMBOL_GPL(eeh_remove_bus_device);
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index cc2495a0cdd5..1fba695e32e8 100644
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -293,15 +293,16 @@ void handle_eeh_events (struct eeh_event *event)
         frozen_pdn = PCI_DN(frozen_dn);
         frozen_pdn->eeh_freeze_count++;
 
-        pci_str = pci_name (frozen_pdn->pcidev);
-        drv_str = pcid_name (frozen_pdn->pcidev);
-        if (!pci_str) {
+        if (frozen_pdn->pcidev) {
+                pci_str = pci_name (frozen_pdn->pcidev);
+                drv_str = pcid_name (frozen_pdn->pcidev);
+        } else {
                 pci_str = pci_name (event->dev);
                 drv_str = pcid_name (event->dev);
         }
         
         if (frozen_pdn->eeh_freeze_count > EEH_MAX_ALLOWED_FREEZES)
-                goto hard_fail;
+                goto excess_failures;
 
         /* If the reset state is a '5' and the time to reset is 0 (infinity)
          * or is more then 15 seconds, then mark this as a permanent failure.
@@ -356,7 +357,7 @@ void handle_eeh_events (struct eeh_event *event)
 
         return;
         
-hard_fail:
+excess_failures:
         /*
          * About 90% of all real-life EEH failures in the field
          * are due to poorly seated PCI cards. Only 10% or so are
@@ -367,7 +368,15 @@ hard_fail:
            "and has been permanently disabled.  Please try reseating\n"
            "this device or replacing it.\n",
                 drv_str, pci_str, frozen_pdn->eeh_freeze_count);
+        goto perm_error;
+
+hard_fail:
+        printk(KERN_ERR
+           "EEH: Unable to recover from failure of PCI device %s - %s\n"
+           "Please try reseating this device or replacing it.\n",
+                drv_str, pci_str);
 
+perm_error:
         eeh_slot_error_detail(frozen_pdn, 2 /* Permanent Error */);
 
         /* Notify all devices that they're about to go down. */
diff --git a/arch/powerpc/platforms/pseries/eeh_event.c b/arch/powerpc/platforms/pseries/eeh_event.c
index 9a9961f27480..a1bda6f96fd1 100644
--- a/arch/powerpc/platforms/pseries/eeh_event.c
+++ b/arch/powerpc/platforms/pseries/eeh_event.c
@@ -19,7 +19,9 @@
  */
 
 #include <linux/list.h>
+#include <linux/mutex.h>
 #include <linux/pci.h>
+#include <linux/workqueue.h>
 #include <asm/eeh_event.h>
 #include <asm/ppc-pci.h>
 
@@ -37,14 +39,18 @@ LIST_HEAD(eeh_eventlist);
 static void eeh_thread_launcher(void *);
 DECLARE_WORK(eeh_event_wq, eeh_thread_launcher, NULL);
 
+/* Serialize reset sequences for a given pci device */
+DEFINE_MUTEX(eeh_event_mutex);
+
 /**
- * eeh_event_handler - dispatch EEH events.  The detection of a frozen
- * slot can occur inside an interrupt, where it can be hard to do
- * anything about it.  The goal of this routine is to pull these
- * detection events out of the context of the interrupt handler, and
- * re-dispatch them for processing at a later time in a normal context.
- *
+ * eeh_event_handler - dispatch EEH events.
  * @dummy - unused
+ *
+ * The detection of a frozen slot can occur inside an interrupt,
+ * where it can be hard to do anything about it.  The goal of this
+ * routine is to pull these detection events out of the context
+ * of the interrupt handler, and re-dispatch them for processing
+ * at a later time in a normal context.
  */
 static int eeh_event_handler(void * dummy)
 {
@@ -64,23 +70,24 @@ static int eeh_event_handler(void * dummy)
                         event = list_entry(eeh_eventlist.next, struct eeh_event, list);
                         list_del(&event->list);
                 }
-                
-                if (event)
-                        eeh_mark_slot(event->dn, EEH_MODE_RECOVERING);
-
                 spin_unlock_irqrestore(&eeh_eventlist_lock, flags);
+
                 if (event == NULL)
                         break;
 
+                /* Serialize processing of EEH events */
+                mutex_lock(&eeh_event_mutex);
+                eeh_mark_slot(event->dn, EEH_MODE_RECOVERING);
+
                 printk(KERN_INFO "EEH: Detected PCI bus error on device %s\n",
                        pci_name(event->dev));
 
                 handle_eeh_events(event);
 
                 eeh_clear_slot(event->dn, EEH_MODE_RECOVERING);
-
                 pci_dev_put(event->dev);
                 kfree(event);
+                mutex_unlock(&eeh_event_mutex);
         }
 
         return 0;
@@ -88,7 +95,6 @@ static int eeh_event_handler(void * dummy)
 
 /**
  * eeh_thread_launcher
- *
  * @dummy - unused
  */
 static void eeh_thread_launcher(void *dummy)
diff --git a/arch/powerpc/platforms/pseries/hvCall.S b/arch/powerpc/platforms/pseries/hvCall.S
index db7c19fe9297..c9ff547f9d25 100644
--- a/arch/powerpc/platforms/pseries/hvCall.S
+++ b/arch/powerpc/platforms/pseries/hvCall.S
@@ -127,3 +127,103 @@ _GLOBAL(plpar_hcall_4out)
 
         mtcrf   0xff,r0
         blr                             /* return r3 = status */
+
+/* plpar_hcall_7arg_7ret(unsigned long opcode,          R3
+                         unsigned long arg1,            R4
+                         unsigned long arg2,            R5
+                         unsigned long arg3,            R6
+                         unsigned long arg4,            R7
+                         unsigned long arg5,            R8
+                         unsigned long arg6,            R9
+                         unsigned long arg7,            R10
+                         unsigned long *out1,           112(R1)
+                         unsigned long *out2,           110(R1)
+                         unsigned long *out3,           108(R1)
+                         unsigned long *out4,           106(R1)
+                         unsigned long *out5,           104(R1)
+                         unsigned long *out6,           102(R1)
+                         unsigned long *out7);          100(R1)
+*/
+_GLOBAL(plpar_hcall_7arg_7ret)
+        HMT_MEDIUM
+
+        mfcr    r0
+        stw     r0,8(r1)
+
+        HVSC                            /* invoke the hypervisor */
+
+        lwz     r0,8(r1)
+
+        ld      r11,STK_PARM(r11)(r1)   /* Fetch r4 ret arg */
+        std     r4,0(r11)
+        ld      r11,STK_PARM(r12)(r1)   /* Fetch r5 ret arg */
+        std     r5,0(r11)
+        ld      r11,STK_PARM(r13)(r1)   /* Fetch r6 ret arg */
+        std     r6,0(r11)
+        ld      r11,STK_PARM(r14)(r1)   /* Fetch r7 ret arg */
+        std     r7,0(r11)
+        ld      r11,STK_PARM(r15)(r1)   /* Fetch r8 ret arg */
+        std     r8,0(r11)
+        ld      r11,STK_PARM(r16)(r1)   /* Fetch r9 ret arg */
+        std     r9,0(r11)
+        ld      r11,STK_PARM(r17)(r1)   /* Fetch r10 ret arg */
+        std     r10,0(r11)
+
+        mtcrf   0xff,r0
+
+        blr                             /* return r3 = status */
+
+/* plpar_hcall_9arg_9ret(unsigned long opcode,          R3
+                         unsigned long arg1,            R4
+                         unsigned long arg2,            R5
+                         unsigned long arg3,            R6
+                         unsigned long arg4,            R7
+                         unsigned long arg5,            R8
+                         unsigned long arg6,            R9
+                         unsigned long arg7,            R10
+                         unsigned long arg8,            112(R1)
+                         unsigned long arg9,            110(R1)
+                         unsigned long *out1,           108(R1)
+                         unsigned long *out2,           106(R1)
+                         unsigned long *out3,           104(R1)
+                         unsigned long *out4,           102(R1)
+                         unsigned long *out5,           100(R1)
+                         unsigned long *out6,            98(R1)
+                         unsigned long *out7);           96(R1)
+                         unsigned long *out8,            94(R1)
+                         unsigned long *out9,            92(R1)
+*/
+_GLOBAL(plpar_hcall_9arg_9ret)
+        HMT_MEDIUM
+
+        mfcr    r0
+        stw     r0,8(r1)
+
+        ld      r11,STK_PARM(r11)(r1)    /* put arg8 in R11 */
+        ld      r12,STK_PARM(r12)(r1)    /* put arg9 in R12 */
+
+        HVSC                            /* invoke the hypervisor */
+
+        ld      r0,STK_PARM(r13)(r1)    /* Fetch r4 ret arg */
+        stdx    r4,r0,r0
+        ld      r0,STK_PARM(r14)(r1)    /* Fetch r5 ret arg */
+        stdx    r5,r0,r0
+        ld      r0,STK_PARM(r15)(r1)    /* Fetch r6 ret arg */
+        stdx    r6,r0,r0
+        ld      r0,STK_PARM(r16)(r1)    /* Fetch r7 ret arg */
+        stdx    r7,r0,r0
+        ld      r0,STK_PARM(r17)(r1)    /* Fetch r8 ret arg */
+        stdx    r8,r0,r0
+        ld      r0,STK_PARM(r18)(r1)    /* Fetch r9 ret arg */
+        stdx    r9,r0,r0
+        ld      r0,STK_PARM(r19)(r1)    /* Fetch r10 ret arg */
+        stdx    r10,r0,r0
+        ld      r0,STK_PARM(r20)(r1)    /* Fetch r11 ret arg */
+        stdx    r11,r0,r0
+        ld      r0,STK_PARM(r21)(r1)    /* Fetch r12 ret arg */
+        stdx    r12,r0,r0
+
+        lwz     r0,8(r1)
+        mtcrf   0xff,r0
+
+        blr                             /* return r3 = status */
diff --git a/arch/powerpc/platforms/pseries/hvconsole.c b/arch/powerpc/platforms/pseries/hvconsole.c
index ba6befd96636..a72a987f1d4d 100644
--- a/arch/powerpc/platforms/pseries/hvconsole.c
+++ b/arch/powerpc/platforms/pseries/hvconsole.c
@@ -41,7 +41,7 @@ int hvc_get_chars(uint32_t vtermno, char *buf, int count)
         unsigned long got;
 
         if (plpar_hcall(H_GET_TERM_CHAR, vtermno, 0, 0, 0, &got,
-                (unsigned long *)buf, (unsigned long *)buf+1) == H_Success)
+                (unsigned long *)buf, (unsigned long *)buf+1) == H_SUCCESS)
                 return got;
         return 0;
 }
@@ -69,9 +69,9 @@ int hvc_put_chars(uint32_t vtermno, const char *buf, int count)
 
         ret = plpar_hcall_norets(H_PUT_TERM_CHAR, vtermno, count, lbuf[0],
                                  lbuf[1]);
-        if (ret == H_Success)
+        if (ret == H_SUCCESS)
                 return count;
-        if (ret == H_Busy)
+        if (ret == H_BUSY)
                 return 0;
         return -EIO;
 }
diff --git a/arch/powerpc/platforms/pseries/hvcserver.c b/arch/powerpc/platforms/pseries/hvcserver.c
index 22bfb5c89db9..fcf4b4cbeaf3 100644
--- a/arch/powerpc/platforms/pseries/hvcserver.c
+++ b/arch/powerpc/platforms/pseries/hvcserver.c
@@ -43,21 +43,21 @@ MODULE_VERSION(HVCS_ARCH_VERSION);
 static int hvcs_convert(long to_convert)
 {
         switch (to_convert) {
-                case H_Success:
+                case H_SUCCESS:
                         return 0;
-                case H_Parameter:
+                case H_PARAMETER:
                         return -EINVAL;
-                case H_Hardware:
+                case H_HARDWARE:
                         return -EIO;
-                case H_Busy:
-                case H_LongBusyOrder1msec:
-                case H_LongBusyOrder10msec:
-                case H_LongBusyOrder100msec:
-                case H_LongBusyOrder1sec:
-                case H_LongBusyOrder10sec:
-                case H_LongBusyOrder100sec:
+                case H_BUSY:
+                case H_LONG_BUSY_ORDER_1_MSEC:
+                case H_LONG_BUSY_ORDER_10_MSEC:
+                case H_LONG_BUSY_ORDER_100_MSEC:
+                case H_LONG_BUSY_ORDER_1_SEC:
+                case H_LONG_BUSY_ORDER_10_SEC:
+                case H_LONG_BUSY_ORDER_100_SEC:
                         return -EBUSY;
-                case H_Function: /* fall through */
+                case H_FUNCTION: /* fall through */
                 default:
                         return -EPERM;
         }
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 8952528d31ac..634b7d06d3cc 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -54,7 +54,8 @@ EXPORT_SYMBOL(plpar_hcall);
 EXPORT_SYMBOL(plpar_hcall_4out);
 EXPORT_SYMBOL(plpar_hcall_norets);
 EXPORT_SYMBOL(plpar_hcall_8arg_2ret);
-
+EXPORT_SYMBOL(plpar_hcall_7arg_7ret);
+EXPORT_SYMBOL(plpar_hcall_9arg_9ret);
 extern void pSeries_find_serial_port(void);
 
 
@@ -72,7 +73,7 @@ static void udbg_hvsi_putc(char c)
 
         do {
                 rc = plpar_put_term_char(vtermno, sizeof(packet), packet);
-        } while (rc == H_Busy);
+        } while (rc == H_BUSY);
 }
 
 static long hvsi_udbg_buf_len;
@@ -85,7 +86,7 @@ static int udbg_hvsi_getc_poll(void)
 
         if (hvsi_udbg_buf_len == 0) {
                 rc = plpar_get_term_char(vtermno, &hvsi_udbg_buf_len, hvsi_udbg_buf);
-                if (rc != H_Success || hvsi_udbg_buf[0] != 0xff) {
+                if (rc != H_SUCCESS || hvsi_udbg_buf[0] != 0xff) {
                         /* bad read or non-data packet */
                         hvsi_udbg_buf_len = 0;
                 } else {
@@ -139,7 +140,7 @@ static void udbg_putcLP(char c)
         buf[0] = c;
         do {
                 rc = plpar_put_term_char(vtermno, 1, buf);
-        } while(rc == H_Busy);
+        } while(rc == H_BUSY);
 }
 
 /* Buffered chars getc */
@@ -158,7 +159,7 @@ static int udbg_getc_pollLP(void)
                 /* get some more chars. */
                 inbuflen = 0;
                 rc = plpar_get_term_char(vtermno, &inbuflen, buf);
-                if (rc != H_Success)
+                if (rc != H_SUCCESS)
                         inbuflen = 0;   /* otherwise inbuflen is garbage */
         }
         if (inbuflen <= 0 || inbuflen > 16) {
@@ -304,7 +305,7 @@ long pSeries_lpar_hpte_insert(unsigned long hpte_group,
 
         lpar_rc = plpar_hcall(H_ENTER, flags, hpte_group, hpte_v,
                               hpte_r, &slot, &dummy0, &dummy1);
-        if (unlikely(lpar_rc == H_PTEG_Full)) {
+        if (unlikely(lpar_rc == H_PTEG_FULL)) {
                 if (!(vflags & HPTE_V_BOLTED))
                         DBG_LOW(" full\n");
                 return -1;
@@ -315,7 +316,7 @@ long pSeries_lpar_hpte_insert(unsigned long hpte_group,
          * will fail. However we must catch the failure in hash_page
          * or we will loop forever, so return -2 in this case.
          */
-        if (unlikely(lpar_rc != H_Success)) {
+        if (unlikely(lpar_rc != H_SUCCESS)) {
                 if (!(vflags & HPTE_V_BOLTED))
                         DBG_LOW(" lpar err %d\n", lpar_rc);
                 return -2;
@@ -346,9 +347,9 @@ static long pSeries_lpar_hpte_remove(unsigned long hpte_group)
                 /* don't remove a bolted entry */
                 lpar_rc = plpar_pte_remove(H_ANDCOND, hpte_group + slot_offset,
                                            (0x1UL << 4), &dummy1, &dummy2);
-                if (lpar_rc == H_Success)
+                if (lpar_rc == H_SUCCESS)
                         return i;
-                BUG_ON(lpar_rc != H_Not_Found);
+                BUG_ON(lpar_rc != H_NOT_FOUND);
 
                 slot_offset++;
                 slot_offset &= 0x7;
@@ -391,14 +392,14 @@ static long pSeries_lpar_hpte_updatepp(unsigned long slot,
 
         lpar_rc = plpar_pte_protect(flags, slot, want_v & HPTE_V_AVPN);
 
-        if (lpar_rc == H_Not_Found) {
+        if (lpar_rc == H_NOT_FOUND) {
                 DBG_LOW("not found !\n");
                 return -1;
         }
 
         DBG_LOW("ok\n");
 
-        BUG_ON(lpar_rc != H_Success);
+        BUG_ON(lpar_rc != H_SUCCESS);
 
         return 0;
 }
@@ -417,7 +418,7 @@ static unsigned long pSeries_lpar_hpte_getword0(unsigned long slot)
 
         lpar_rc = plpar_pte_read(flags, slot, &dword0, &dummy_word1);
 
-        BUG_ON(lpar_rc != H_Success);
+        BUG_ON(lpar_rc != H_SUCCESS);
 
         return dword0;
 }
@@ -468,7 +469,7 @@ static void pSeries_lpar_hpte_updateboltedpp(unsigned long newpp,
         flags = newpp & 7;
         lpar_rc = plpar_pte_protect(flags, slot, 0);
 
-        BUG_ON(lpar_rc != H_Success);
+        BUG_ON(lpar_rc != H_SUCCESS);
 }
 
 static void pSeries_lpar_hpte_invalidate(unsigned long slot, unsigned long va,
@@ -484,10 +485,10 @@ static void pSeries_lpar_hpte_invalidate(unsigned long slot, unsigned long va,
         want_v = hpte_encode_v(va, psize);
         lpar_rc = plpar_pte_remove(H_AVPN, slot, want_v & HPTE_V_AVPN,
                                    &dummy1, &dummy2);
-        if (lpar_rc == H_Not_Found)
+        if (lpar_rc == H_NOT_FOUND)
                 return;
 
-        BUG_ON(lpar_rc != H_Success);
+        BUG_ON(lpar_rc != H_SUCCESS);
 }
 
 /*
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index b2fbf8ba8fbb..5eb55ef1c91c 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -463,7 +463,7 @@ static void pseries_dedicated_idle_sleep(void)
          * very low priority.  The cede enables interrupts, which
          * doesn't matter here.
          */
-        if (!lppaca[cpu ^ 1].idle || poll_pending() == H_Pending)
+        if (!lppaca[cpu ^ 1].idle || poll_pending() == H_PENDING)
                 cede_processor();
 
 out:
diff --git a/arch/powerpc/platforms/pseries/vio.c b/arch/powerpc/platforms/pseries/vio.c
index 866379b80c09..8e53e04ada8b 100644
--- a/arch/powerpc/platforms/pseries/vio.c
+++ b/arch/powerpc/platforms/pseries/vio.c
@@ -258,7 +258,7 @@ EXPORT_SYMBOL(vio_find_node);
 int vio_enable_interrupts(struct vio_dev *dev)
 {
         int rc = h_vio_signal(dev->unit_address, VIO_IRQ_ENABLE);
-        if (rc != H_Success)
+        if (rc != H_SUCCESS)
                 printk(KERN_ERR "vio: Error 0x%x enabling interrupts\n", rc);
         return rc;
 }
@@ -267,7 +267,7 @@ EXPORT_SYMBOL(vio_enable_interrupts);
 int vio_disable_interrupts(struct vio_dev *dev)
 {
         int rc = h_vio_signal(dev->unit_address, VIO_IRQ_DISABLE);
-        if (rc != H_Success)
+        if (rc != H_SUCCESS)
                 printk(KERN_ERR "vio: Error 0x%x disabling interrupts\n", rc);
         return rc;
 }
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index 4864cb32be25..2d60ea30fed6 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -168,7 +168,7 @@ static int pSeriesLP_xirr_info_get(int n_cpu)
         unsigned long return_value;
 
         lpar_rc = plpar_xirr(&return_value);
-        if (lpar_rc != H_Success)
+        if (lpar_rc != H_SUCCESS)
                 panic(" bad return code xirr - rc = %lx \n", lpar_rc);
         return (int)return_value;
 }
@@ -179,7 +179,7 @@ static void pSeriesLP_xirr_info_set(int n_cpu, int value)
         unsigned long val64 = value & 0xffffffff;
 
         lpar_rc = plpar_eoi(val64);
-        if (lpar_rc != H_Success)
+        if (lpar_rc != H_SUCCESS)
                 panic("bad return code EOI - rc = %ld, value=%lx\n", lpar_rc,
                       val64);
 }
@@ -189,7 +189,7 @@ void pSeriesLP_cppr_info(int n_cpu, u8 value)
         unsigned long lpar_rc;
 
         lpar_rc = plpar_cppr(value);
-        if (lpar_rc != H_Success)
+        if (lpar_rc != H_SUCCESS)
                 panic("bad return code cppr - rc = %lx\n", lpar_rc);
 }
 
@@ -198,7 +198,7 @@ static void pSeriesLP_qirr_info(int n_cpu , u8 value)
         unsigned long lpar_rc;
 
         lpar_rc = plpar_ipi(get_hard_smp_processor_id(n_cpu), value);
-        if (lpar_rc != H_Success)
+        if (lpar_rc != H_SUCCESS)
                 panic("bad return code qirr - rc = %lx\n", lpar_rc);
 }