Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (209 commits)
  [POWERPC] Create add_rtc() function to enable the RTC CMOS driver
  [POWERPC] Add H_ILLAN_ATTRIBUTES hcall number
  [POWERPC] xilinxfb: Parameterize xilinxfb platform device registration
  [POWERPC] Oprofile support for Power 5++
  [POWERPC] Enable arbitary speed tty ioctls and split input/output speed
  [POWERPC] Make drivers/char/hvc_console.c:khvcd() static
  [POWERPC] Remove dead code for preventing pread() and pwrite() calls
  [POWERPC] Remove unnecessary #undef printk from prom.c
  [POWERPC] Fix typo in Ebony default DTS
  [POWERPC] Check for NULL ppc_md.init_IRQ() before calling
  [POWERPC] Remove extra return statement
  [POWERPC] pasemi: Don't auto-select CONFIG_EMBEDDED
  [POWERPC] pasemi: Rename platform
  [POWERPC] arch/powerpc/kernel/sysfs.c: Move NUMA exports
  [POWERPC] Add __read_mostly support for powerpc
  [POWERPC] Modify sched_clock() to make CONFIG_PRINTK_TIME more sane
  [POWERPC] Create a dummy zImage if no valid platform has been selected
  [POWERPC] PS3: Bootwrapper support.
  [POWERPC] powermac i2c: Use mutex
  [POWERPC] Schedule removal of arch/ppc
  ...

Fixed up conflicts manually in:

	Documentation/feature-removal-schedule.txt
	arch/powerpc/kernel/pci_32.c
	arch/powerpc/kernel/pci_64.c
	include/asm-powerpc/pci.h

and asked the powerpc people to double-check the result..

12 files changed, 177 insertions, 42 deletions

diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index ae1fc92dc1c9..992ba6753cf2 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -8,7 +8,7 @@ obj-y			:= lpar.o hvCall.o nvram.o reconfig.o \
 obj-$(CONFIG_SMP)       += smp.o
 obj-$(CONFIG_XICS)      += xics.o
 obj-$(CONFIG_SCANLOG)   += scanlog.o
-obj-$(CONFIG_EEH)       += eeh.o eeh_cache.o eeh_driver.o eeh_event.o
+obj-$(CONFIG_EEH)       += eeh.o eeh_cache.o eeh_driver.o eeh_event.o eeh_sysfs.o
 obj-$(CONFIG_KEXEC)     += kexec.o
 obj-$(CONFIG_PCI)       += pci.o pci_dlpar.o
 obj-$(CONFIG_PCI_MSI)   += msi.o
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 5f3e6d8659fe..b8770395013d 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -1,6 +1,8 @@
 /*
  * eeh.c
- * Copyright (C) 2001 Dave Engebretsen & Todd Inglett IBM Corporation
+ * Copyright IBM Corporation 2001, 2005, 2006
+ * Copyright Dave Engebretsen & Todd Inglett 2001
+ * Copyright Linas Vepstas 2005, 2006
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,6 +17,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ * Please address comments and feedback to Linas Vepstas <linas@austin.ibm.com>
  */
 
 #include <linux/delay.h>
@@ -117,7 +121,6 @@ static unsigned long no_cfg_addr;
 static unsigned long ignored_check;
 static unsigned long total_mmio_ffs;
 static unsigned long false_positives;
-static unsigned long ignored_failures;
 static unsigned long slot_resets;
 
 #define IS_BRIDGE(class_code) (((class_code)<<16) == PCI_BASE_CLASS_BRIDGE)
@@ -505,6 +508,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
                 printk(KERN_WARNING "EEH: read_slot_reset_state() failed; rc=%d dn=%s\n",
                        ret, dn->full_name);
                 false_positives++;
+                pdn->eeh_false_positives ++;
                 rc = 0;
                 goto dn_unlock;
         }
@@ -513,6 +517,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
          * they are empty when they don't have children. */
         if ((rets[0] == 5) && (dn->child == NULL)) {
                 false_positives++;
+                pdn->eeh_false_positives ++;
                 rc = 0;
                 goto dn_unlock;
         }
@@ -522,6 +527,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
                 printk(KERN_WARNING "EEH: event on unsupported device, rc=%d dn=%s\n",
                        ret, dn->full_name);
                 false_positives++;
+                pdn->eeh_false_positives ++;
                 rc = 0;
                 goto dn_unlock;
         }
@@ -529,6 +535,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
         /* If not the kind of error we know about, punt. */
         if (rets[0] != 1 && rets[0] != 2 && rets[0] != 4 && rets[0] != 5) {
                 false_positives++;
+                pdn->eeh_false_positives ++;
                 rc = 0;
                 goto dn_unlock;
         }
@@ -921,6 +928,7 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
         pdn->eeh_mode = 0;
         pdn->eeh_check_count = 0;
         pdn->eeh_freeze_count = 0;
+        pdn->eeh_false_positives = 0;
 
         if (status && strcmp(status, "ok") != 0)
                 return NULL;    /* ignore devices with bad status */
@@ -1139,7 +1147,8 @@ static void eeh_add_device_late(struct pci_dev *dev)
         pdn = PCI_DN(dn);
         pdn->pcidev = dev;
 
-        pci_addr_cache_insert_device (dev);
+        pci_addr_cache_insert_device(dev);
+        eeh_sysfs_add_device(dev);
 }
 
 void eeh_add_device_tree_late(struct pci_bus *bus)
@@ -1178,6 +1187,7 @@ static void eeh_remove_device(struct pci_dev *dev)
         printk(KERN_DEBUG "EEH: remove device %s\n", pci_name(dev));
 #endif
         pci_addr_cache_remove_device(dev);
+        eeh_sysfs_remove_device(dev);
 
         dn = pci_device_to_OF_node(dev);
         if (PCI_DN(dn)->pcidev) {
@@ -1214,11 +1224,10 @@ static int proc_eeh_show(struct seq_file *m, void *v)
                                 "check not wanted=%ld\n"
                                 "eeh_total_mmio_ffs=%ld\n"
                                 "eeh_false_positives=%ld\n"
-                                "eeh_ignored_failures=%ld\n"
                                 "eeh_slot_resets=%ld\n",
                                 no_device, no_dn, no_cfg_addr, 
                                 ignored_check, total_mmio_ffs, 
-                                false_positives, ignored_failures, 
+                                false_positives,
                                 slot_resets);
         }
 
diff --git a/arch/powerpc/platforms/pseries/eeh_cache.c b/arch/powerpc/platforms/pseries/eeh_cache.c
index f2bae04424f8..e49c815eae23 100644
--- a/arch/powerpc/platforms/pseries/eeh_cache.c
+++ b/arch/powerpc/platforms/pseries/eeh_cache.c
@@ -2,7 +2,8 @@
  * eeh_cache.c
  * PCI address cache; allows the lookup of PCI devices based on I/O address
  *
- * Copyright (C) 2004 Linas Vepstas <linas@austin.ibm.com> IBM Corporation
+ * Copyright IBM Corporation 2004
+ * Copyright Linas Vepstas <linas@austin.ibm.com> 2004
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -295,6 +296,8 @@ void __init pci_addr_cache_build(void)
                         continue;
                 pci_dev_get (dev);  /* matching put is in eeh_remove_device() */
                 PCI_DN(dn)->pcidev = dev;
+
+                eeh_sysfs_add_device(dev);
         }
 
 #ifdef DEBUG
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index 161a5844ab6c..15e015ef6865 100644
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -1,6 +1,7 @@
 /*
  * PCI Error Recovery Driver for RPA-compliant PPC64 platform.
- * Copyright (C) 2004, 2005 Linas Vepstas <linas@linas.org>
+ * Copyright IBM Corp. 2004 2005
+ * Copyright Linas Vepstas <linas@linas.org> 2004, 2005
  *
  * All rights reserved.
  *
@@ -19,8 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * Send feedback to <linas@us.ibm.com>
- *
+ * Send comments and feedback to Linas Vepstas <linas@austin.ibm.com>
  */
 #include <linux/delay.h>
 #include <linux/interrupt.h>
diff --git a/arch/powerpc/platforms/pseries/eeh_sysfs.c b/arch/powerpc/platforms/pseries/eeh_sysfs.c
new file mode 100644
index 000000000000..15e13b568904
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/eeh_sysfs.c
@@ -0,0 +1,87 @@
+/*
+ * Sysfs entries for PCI Error Recovery for PAPR-compliant platform.
+ * Copyright IBM Corporation 2007
+ * Copyright Linas Vepstas <linas@austin.ibm.com> 2007
+ *
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
+ * NON INFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Send comments and feedback to Linas Vepstas <linas@austin.ibm.com>
+ */
+#include <linux/pci.h>
+#include <asm/ppc-pci.h>
+#include <asm/pci-bridge.h>
+#include <linux/kobject.h>
+
+/**
+ * EEH_SHOW_ATTR -- create sysfs entry for eeh statistic
+ * @_name: name of file in sysfs directory
+ * @_memb: name of member in struct pci_dn to access
+ * @_format: printf format for display
+ *
+ * All of the attributes look very similar, so just
+ * auto-gen a cut-n-paste routine to display them.
+ */
+#define EEH_SHOW_ATTR(_name,_memb,_format)               \
+static ssize_t eeh_show_##_name(struct device *dev,      \
+                struct device_attribute *attr, char *buf)          \
+{                                                        \
+        struct pci_dev *pdev = to_pci_dev(dev);               \
+        struct device_node *dn = pci_device_to_OF_node(pdev); \
+        struct pci_dn *pdn;                                   \
+                                                              \
+        if (!dn || PCI_DN(dn) == NULL)                        \
+                return 0;                                          \
+                                                              \
+        pdn = PCI_DN(dn);                                     \
+        return sprintf(buf, _format "\n", pdn->_memb);        \
+}                                                        \
+static DEVICE_ATTR(_name, S_IRUGO, eeh_show_##_name, NULL);
+
+
+EEH_SHOW_ATTR(eeh_mode, eeh_mode, "0x%x");
+EEH_SHOW_ATTR(eeh_config_addr, eeh_config_addr, "0x%x");
+EEH_SHOW_ATTR(eeh_pe_config_addr, eeh_pe_config_addr, "0x%x");
+EEH_SHOW_ATTR(eeh_check_count, eeh_check_count, "%d");
+EEH_SHOW_ATTR(eeh_freeze_count, eeh_freeze_count, "%d");
+EEH_SHOW_ATTR(eeh_false_positives, eeh_false_positives, "%d");
+
+void eeh_sysfs_add_device(struct pci_dev *pdev)
+{
+        int rc=0;
+
+        rc += device_create_file(&pdev->dev, &dev_attr_eeh_mode);
+        rc += device_create_file(&pdev->dev, &dev_attr_eeh_config_addr);
+        rc += device_create_file(&pdev->dev, &dev_attr_eeh_pe_config_addr);
+        rc += device_create_file(&pdev->dev, &dev_attr_eeh_check_count);
+        rc += device_create_file(&pdev->dev, &dev_attr_eeh_false_positives);
+        rc += device_create_file(&pdev->dev, &dev_attr_eeh_freeze_count);
+
+        if (rc)
+                printk(KERN_WARNING "EEH: Unable to create sysfs entries\n");
+}
+
+void eeh_sysfs_remove_device(struct pci_dev *pdev)
+{
+        device_remove_file(&pdev->dev, &dev_attr_eeh_mode);
+        device_remove_file(&pdev->dev, &dev_attr_eeh_config_addr);
+        device_remove_file(&pdev->dev, &dev_attr_eeh_pe_config_addr);
+        device_remove_file(&pdev->dev, &dev_attr_eeh_check_count);
+        device_remove_file(&pdev->dev, &dev_attr_eeh_false_positives);
+        device_remove_file(&pdev->dev, &dev_attr_eeh_freeze_count);
+}
+
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 362dfbc260a6..8cc6eeeaae2f 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -373,12 +373,23 @@ static void pSeries_lpar_hptab_clear(void)
 {
         unsigned long size_bytes = 1UL << ppc64_pft_size;
         unsigned long hpte_count = size_bytes >> 4;
-        unsigned long dummy1, dummy2;
+        unsigned long dummy1, dummy2, dword0;
+        long lpar_rc;
         int i;
 
         /* TODO: Use bulk call */
-        for (i = 0; i < hpte_count; i++)
-                plpar_pte_remove_raw(0, i, 0, &dummy1, &dummy2);
+        for (i = 0; i < hpte_count; i++) {
+                /* dont remove HPTEs with VRMA mappings */
+                lpar_rc = plpar_pte_remove_raw(H_ANDCOND, i, HPTE_V_1TB_SEG,
+                                                &dummy1, &dummy2);
+                if (lpar_rc == H_NOT_FOUND) {
+                        lpar_rc = plpar_pte_read_raw(0, i, &dword0, &dummy1);
+                        if (!lpar_rc && ((dword0 & HPTE_V_VRMA_MASK)
+                                != HPTE_V_VRMA_MASK))
+                                /* Can be hpte for 1TB Seg. So remove it */
+                                plpar_pte_remove_raw(0, i, 0, &dummy1, &dummy2);
+                }
+        }
 }
 
 /*
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index ffaf6c5c517b..47f0e0857f0e 100644
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -110,8 +110,6 @@ pcibios_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus)
                         }
                 }
         }
-
-        eeh_add_device_tree_late(bus);
 }
 EXPORT_SYMBOL_GPL(pcibios_fixup_new_pci_devices);
 
@@ -139,6 +137,8 @@ pcibios_pci_config_bridge(struct pci_dev *dev)
 
         /* Make the discovered devices available */
         pci_bus_add_devices(child_bus);
+
+        eeh_add_device_tree_late(child_bus);
         return 0;
 }
 
@@ -171,6 +171,7 @@ pcibios_add_pci_devices(struct pci_bus * bus)
                 if (!list_empty(&bus->devices)) {
                         pcibios_fixup_new_pci_devices(bus, 0);
                         pci_bus_add_devices(bus);
+                        eeh_add_device_tree_late(bus);
                 }
         } else if (mode == PCI_PROBE_NORMAL) {
                 /* use legacy probe */
@@ -179,6 +180,7 @@ pcibios_add_pci_devices(struct pci_bus * bus)
                 if (num) {
                         pcibios_fixup_new_pci_devices(bus, 1);
                         pci_bus_add_devices(bus);
+                        eeh_add_device_tree_late(bus);
                 }
 
                 list_for_each_entry(dev, &bus->devices, bus_list)
@@ -200,8 +202,6 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
         rtas_setup_phb(phb);
         pci_process_bridge_OF_ranges(phb, dn, 0);
 
-        pci_setup_phb_io_dynamic(phb, primary);
-
         pci_devs_phb_init_dynamic(phb);
 
         if (dn->child)
@@ -210,6 +210,7 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
         scan_phb(phb);
         pcibios_fixup_new_pci_devices(phb->bus, 0);
         pci_bus_add_devices(phb->bus);
+        eeh_add_device_tree_late(phb->bus);
 
         return phb;
 }
diff --git a/arch/powerpc/platforms/pseries/plpar_wrappers.h b/arch/powerpc/platforms/pseries/plpar_wrappers.h
index 2e4d10c9eea8..d003c80fa31d 100644
--- a/arch/powerpc/platforms/pseries/plpar_wrappers.h
+++ b/arch/powerpc/platforms/pseries/plpar_wrappers.h
@@ -108,6 +108,21 @@ static inline long plpar_pte_read(unsigned long flags, unsigned long ptex,
         return rc;
 }
 
+/* plpar_pte_read_raw can be called in real mode. It calls plpar_hcall_raw */
+static inline long plpar_pte_read_raw(unsigned long flags, unsigned long ptex,
+                unsigned long *old_pteh_ret, unsigned long *old_ptel_ret)
+{
+        long rc;
+        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
+
+        rc = plpar_hcall_raw(H_READ, retbuf, flags, ptex);
+
+        *old_pteh_ret = retbuf[0];
+        *old_ptel_ret = retbuf[1];
+
+        return rc;
+}
+
 static inline long plpar_pte_protect(unsigned long flags, unsigned long ptex,
                 unsigned long avpn)
 {
diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h
index 2729d559fd91..61e19f78b923 100644
--- a/arch/powerpc/platforms/pseries/pseries.h
+++ b/arch/powerpc/platforms/pseries/pseries.h
@@ -33,6 +33,8 @@ static inline void setup_kexec_cpu_down_xics(void) { }
 static inline void setup_kexec_cpu_down_mpic(void) { }
 #endif
 
+extern void pSeries_final_fixup(void);
+
 /* Poweron flag used for enabling auto ups restart */
 extern unsigned long rtas_poweron_auto;
 
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index 5aa97aff3391..c02f8742c54d 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -123,7 +123,7 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist
         strcpy(np->full_name, path);
 
         np->properties = proplist;
-        OF_MARK_DYNAMIC(np);
+        of_node_set_flag(np, OF_DYNAMIC);
         kref_init(&np->kref);
 
         np->parent = derive_parent(path);
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index a031d99becb7..59e69f085cb4 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -399,6 +399,7 @@ static void pseries_dedicated_idle_sleep(void)
          * a good time to find other work to dispatch.
          */
         get_lppaca()->idle = 1;
+        get_lppaca()->donate_dedicated_cpu = 1;
 
         /*
          * We come in with interrupts disabled, and need_resched()
@@ -431,6 +432,7 @@ static void pseries_dedicated_idle_sleep(void)
 
 out:
         HMT_medium();
+        get_lppaca()->donate_dedicated_cpu = 0;
         get_lppaca()->idle = 0;
 }
 
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index f1df942072bb..5bd90a7eb763 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -156,9 +156,9 @@ static inline void lpar_qirr_info(int n_cpu , u8 value)
 
 
 #ifdef CONFIG_SMP
-static int get_irq_server(unsigned int virq)
+static int get_irq_server(unsigned int virq, unsigned int strict_check)
 {
-        unsigned int server;
+        int server;
         /* For the moment only implement delivery to all cpus or one cpu */
         cpumask_t cpumask = irq_desc[virq].affinity;
         cpumask_t tmp = CPU_MASK_NONE;
@@ -166,22 +166,25 @@ static int get_irq_server(unsigned int virq)
         if (!distribute_irqs)
                 return default_server;
 
-        if (cpus_equal(cpumask, CPU_MASK_ALL)) {
-                server = default_distrib_server;
-        } else {
+        if (!cpus_equal(cpumask, CPU_MASK_ALL)) {
                 cpus_and(tmp, cpu_online_map, cpumask);
 
-                if (cpus_empty(tmp))
-                        server = default_distrib_server;
-                else
-                        server = get_hard_smp_processor_id(first_cpu(tmp));
+                server = first_cpu(tmp);
+
+                if (server < NR_CPUS)
+                        return get_hard_smp_processor_id(server);
+
+                if (strict_check)
+                        return -1;
         }
 
-        return server;
+        if (cpus_equal(cpu_online_map, cpu_present_map))
+                return default_distrib_server;
 
+        return default_server;
 }
 #else
-static int get_irq_server(unsigned int virq)
+static int get_irq_server(unsigned int virq, unsigned int strict_check)
 {
         return default_server;
 }
@@ -192,7 +195,7 @@ static void xics_unmask_irq(unsigned int virq)
 {
         unsigned int irq;
         int call_status;
-        unsigned int server;
+        int server;
 
         pr_debug("xics: unmask virq %d\n", virq);
 
@@ -201,7 +204,7 @@ static void xics_unmask_irq(unsigned int virq)
         if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)
                 return;
 
-        server = get_irq_server(virq);
+        server = get_irq_server(virq, 0);
 
         call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server,
                                 DEFAULT_PRIORITY);
@@ -398,8 +401,7 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)
         unsigned int irq;
         int status;
         int xics_status[2];
-        unsigned long newmask;
-        cpumask_t tmp = CPU_MASK_NONE;
+        int irq_server;
 
         irq = (unsigned int)irq_map[virq].hwirq;
         if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)
@@ -413,18 +415,21 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)
                 return;
         }
 
-        /* For the moment only implement delivery to all cpus or one cpu */
-        if (cpus_equal(cpumask, CPU_MASK_ALL)) {
-                newmask = default_distrib_server;
-        } else {
-                cpus_and(tmp, cpu_online_map, cpumask);
-                if (cpus_empty(tmp))
-                        return;
-                newmask = get_hard_smp_processor_id(first_cpu(tmp));
+        /*
+         * For the moment only implement delivery to all cpus or one cpu.
+         * Get current irq_server for the given irq
+         */
+        irq_server = get_irq_server(irq, 1);
+        if (irq_server == -1) {
+                char cpulist[128];
+                cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);
+                printk(KERN_WARNING "xics_set_affinity: No online cpus in "
+                                "the mask %s for irq %d\n", cpulist, virq);
+                return;
         }
 
         status = rtas_call(ibm_set_xive, 3, 1, NULL,
-                                irq, newmask, xics_status[1]);
+                                irq, irq_server, xics_status[1]);
 
         if (status) {
                 printk(KERN_ERR "xics_set_affinity: irq=%u ibm,set-xive "