29 files changed, 414 insertions, 250 deletions

diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index e16eb2a33173..6ff3cf506088 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -191,6 +191,37 @@ exception_marker:
         ori     reg,reg,(label)@l;      /* virt addr of handler ... */
 #endif
 
+/*
+ * Equal to EXCEPTION_PROLOG_PSERIES, except that it forces 64bit mode.
+ * The firmware calls the registered system_reset_fwnmi and
+ * machine_check_fwnmi handlers in 32bit mode if the cpu happens to run
+ * a 32bit application at the time of the event.
+ * This firmware bug is present on POWER4 and JS20.
+ */
+#define EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(area, label)               \
+        mfspr   r13,SPRN_SPRG3;         /* get paca address into r13 */ \
+        std     r9,area+EX_R9(r13);     /* save r9 - r12 */             \
+        std     r10,area+EX_R10(r13);                                   \
+        std     r11,area+EX_R11(r13);                                   \
+        std     r12,area+EX_R12(r13);                                   \
+        mfspr   r9,SPRN_SPRG1;                                          \
+        std     r9,area+EX_R13(r13);                                    \
+        mfcr    r9;                                                     \
+        clrrdi  r12,r13,32;             /* get high part of &label */   \
+        mfmsr   r10;                                                    \
+        /* force 64bit mode */                                          \
+        li      r11,5;                  /* MSR_SF_LG|MSR_ISF_LG */      \
+        rldimi  r10,r11,61,0;           /* insert into top 3 bits */    \
+        /* done 64bit mode */                                           \
+        mfspr   r11,SPRN_SRR0;          /* save SRR0 */                 \
+        LOAD_HANDLER(r12,label)                                         \
+        ori     r10,r10,MSR_IR|MSR_DR|MSR_RI;                           \
+        mtspr   SPRN_SRR0,r12;                                          \
+        mfspr   r12,SPRN_SRR1;          /* and SRR1 */                  \
+        mtspr   SPRN_SRR1,r10;                                          \
+        rfid;                                                           \
+        b       .       /* prevent speculative execution */
+
 #define EXCEPTION_PROLOG_PSERIES(area, label)                           \
         mfspr   r13,SPRN_SPRG3;         /* get paca address into r13 */ \
         std     r9,area+EX_R9(r13);     /* save r9 - r12 */             \
@@ -604,14 +635,14 @@ slb_miss_user_pseries:
 system_reset_fwnmi:
         HMT_MEDIUM
         mtspr   SPRN_SPRG1,r13          /* save r13 */
-        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common)
+        EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(PACA_EXGEN, system_reset_common)
 
         .globl machine_check_fwnmi
       .align 7
 machine_check_fwnmi:
         HMT_MEDIUM
         mtspr   SPRN_SPRG1,r13          /* save r13 */
-        EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common)
+        EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(PACA_EXMC, machine_check_common)
 
 #ifdef CONFIG_PPC_ISERIES
 /***  ISeries-LPAR interrupt handlers ***/
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index d9a0b087fa7f..124dbcba94a8 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -323,7 +323,7 @@ int ibmebus_request_irq(struct ibmebus_dev *dev,
                         unsigned long irq_flags, const char * devname,
                         void *dev_id)
 {
-        unsigned int irq = irq_create_mapping(NULL, ist, 0);
+        unsigned int irq = irq_create_mapping(NULL, ist);
         
         if (irq == NO_IRQ)
                 return -EINVAL;
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 8cf987809c66..01bdae35cb55 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -391,15 +391,14 @@ struct irq_host *irq_alloc_host(unsigned int revmap_type,
                         irq_map[i].host = host;
                         smp_wmb();
 
-                        /* Clear some flags */
-                        get_irq_desc(i)->status
-                                &= ~(IRQ_NOREQUEST | IRQ_LEVEL);
+                        /* Clear norequest flags */
+                        get_irq_desc(i)->status &= ~IRQ_NOREQUEST;
 
                         /* Legacy flags are left to default at this point,
                          * one can then use irq_create_mapping() to
                          * explicitely change them
                          */
-                        ops->map(host, i, i, 0);
+                        ops->map(host, i, i);
                 }
                 break;
         case IRQ_HOST_MAP_LINEAR:
@@ -457,13 +456,11 @@ void irq_set_virq_count(unsigned int count)
 }
 
 unsigned int irq_create_mapping(struct irq_host *host,
-                                irq_hw_number_t hwirq,
-                                unsigned int flags)
+                                irq_hw_number_t hwirq)
 {
         unsigned int virq, hint;
 
-        pr_debug("irq: irq_create_mapping(0x%p, 0x%lx, 0x%x)\n",
-                 host, hwirq, flags);
+        pr_debug("irq: irq_create_mapping(0x%p, 0x%lx)\n", host, hwirq);
 
         /* Look for default host if nececssary */
         if (host == NULL)
@@ -482,7 +479,6 @@ unsigned int irq_create_mapping(struct irq_host *host,
         virq = irq_find_mapping(host, hwirq);
         if (virq != IRQ_NONE) {
                 pr_debug("irq: -> existing mapping on virq %d\n", virq);
-                host->ops->map(host, virq, hwirq, flags);
                 return virq;
         }
 
@@ -504,18 +500,18 @@ unsigned int irq_create_mapping(struct irq_host *host,
         }
         pr_debug("irq: -> obtained virq %d\n", virq);
 
-        /* Clear some flags */
-        get_irq_desc(virq)->status &= ~(IRQ_NOREQUEST | IRQ_LEVEL);
+        /* Clear IRQ_NOREQUEST flag */
+        get_irq_desc(virq)->status &= ~IRQ_NOREQUEST;
 
         /* map it */
-        if (host->ops->map(host, virq, hwirq, flags)) {
+        smp_wmb();
+        irq_map[virq].hwirq = hwirq;
+        smp_mb();
+        if (host->ops->map(host, virq, hwirq)) {
                 pr_debug("irq: -> mapping failed, freeing\n");
                 irq_free_virt(virq, 1);
                 return NO_IRQ;
         }
-        smp_wmb();
-        irq_map[virq].hwirq = hwirq;
-        smp_mb();
         return virq;
 }
 EXPORT_SYMBOL_GPL(irq_create_mapping);
@@ -525,25 +521,38 @@ extern unsigned int irq_create_of_mapping(struct device_node *controller,
 {
         struct irq_host *host;
         irq_hw_number_t hwirq;
-        unsigned int flags = IRQ_TYPE_NONE;
+        unsigned int type = IRQ_TYPE_NONE;
+        unsigned int virq;
 
         if (controller == NULL)
                 host = irq_default_host;
         else
                 host = irq_find_host(controller);
-        if (host == NULL)
+        if (host == NULL) {
+                printk(KERN_WARNING "irq: no irq host found for %s !\n",
+                       controller->full_name);
                 return NO_IRQ;
+        }
 
         /* If host has no translation, then we assume interrupt line */
         if (host->ops->xlate == NULL)
                 hwirq = intspec[0];
         else {
                 if (host->ops->xlate(host, controller, intspec, intsize,
-                                     &hwirq, &flags))
+                                     &hwirq, &type))
                         return NO_IRQ;
         }
 
-        return irq_create_mapping(host, hwirq, flags);
+        /* Create mapping */
+        virq = irq_create_mapping(host, hwirq);
+        if (virq == NO_IRQ)
+                return virq;
+
+        /* Set type if specified and different than the current one */
+        if (type != IRQ_TYPE_NONE &&
+            type != (get_irq_desc(virq)->status & IRQF_TRIGGER_MASK))
+                set_irq_type(virq, type);
+        return virq;
 }
 EXPORT_SYMBOL_GPL(irq_create_of_mapping);
 
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index bfb407fc1aa1..e3ed21cd3d94 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -687,7 +687,7 @@ _GLOBAL(kexec_sequence)
         /* clear out hardware hash page table and tlb */
         ld      r5,0(r27)               /* deref function descriptor */
         mtctr   r5
-        bctrl                           /* ppc_md.hash_clear_all(void); */
+        bctrl                           /* ppc_md.hpte_clear_all(void); */
 
 /*
  *   kexec image calling is:
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 3f6bd36e9e14..9b49f8691d29 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -11,6 +11,7 @@
 #include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/bootmem.h>
+#include <linux/irq.h>
 
 #include <asm/processor.h>
 #include <asm/io.h>
@@ -18,7 +19,6 @@
 #include <asm/sections.h>
 #include <asm/pci-bridge.h>
 #include <asm/byteorder.h>
-#include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/machdep.h>
 
@@ -1423,15 +1423,37 @@ int pci_read_irq_line(struct pci_dev *pci_dev)
 
         DBG("Try to map irq for %s...\n", pci_name(pci_dev));
 
+        /* Try to get a mapping from the device-tree */
         if (of_irq_map_pci(pci_dev, &oirq)) {
-                DBG(" -> failed !\n");
-                return -1;
-        }
+                u8 line, pin;
+
+                /* If that fails, lets fallback to what is in the config
+                 * space and map that through the default controller. We
+                 * also set the type to level low since that's what PCI
+                 * interrupts are. If your platform does differently, then
+                 * either provide a proper interrupt tree or don't use this
+                 * function.
+                 */
+                if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_PIN, &pin))
+                        return -1;
+                if (pin == 0)
+                        return -1;
+                if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_LINE, &line) ||
+                    line == 0xff) {
+                        return -1;
+                }
+                DBG(" -> no map ! Using irq line %d from PCI config\n", line);
 
-        DBG(" -> got one, spec %d cells (0x%08x...) on %s\n",
-            oirq.size, oirq.specifier[0], oirq.controller->full_name);
+                virq = irq_create_mapping(NULL, line);
+                if (virq != NO_IRQ)
+                        set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
+        } else {
+                DBG(" -> got one, spec %d cells (0x%08x...) on %s\n",
+                    oirq.size, oirq.specifier[0], oirq.controller->full_name);
 
-        virq = irq_create_of_mapping(oirq.controller, oirq.specifier, oirq.size);
+                virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
+                                             oirq.size);
+        }
         if(virq == NO_IRQ) {
                 DBG(" -> failed to map !\n");
                 return -1;
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index e795a7e2a38e..d51be7c7a2ef 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -21,13 +21,13 @@
 #include <linux/mm.h>
 #include <linux/list.h>
 #include <linux/syscalls.h>
+#include <linux/irq.h>
 
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
 #include <asm/byteorder.h>
-#include <asm/irq.h>
 #include <asm/machdep.h>
 #include <asm/ppc-pci.h>
 
@@ -1254,15 +1254,37 @@ int pci_read_irq_line(struct pci_dev *pci_dev)
 
         DBG("Try to map irq for %s...\n", pci_name(pci_dev));
 
+        /* Try to get a mapping from the device-tree */
         if (of_irq_map_pci(pci_dev, &oirq)) {
-                DBG(" -> failed !\n");
-                return -1;
-        }
+                u8 line, pin;
+
+                /* If that fails, lets fallback to what is in the config
+                 * space and map that through the default controller. We
+                 * also set the type to level low since that's what PCI
+                 * interrupts are. If your platform does differently, then
+                 * either provide a proper interrupt tree or don't use this
+                 * function.
+                 */
+                if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_PIN, &pin))
+                        return -1;
+                if (pin == 0)
+                        return -1;
+                if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_LINE, &line) ||
+                    line == 0xff) {
+                        return -1;
+                }
+                DBG(" -> no map ! Using irq line %d from PCI config\n", line);
 
-        DBG(" -> got one, spec %d cells (0x%08x...) on %s\n",
-            oirq.size, oirq.specifier[0], oirq.controller->full_name);
+                virq = irq_create_mapping(NULL, line);
+                if (virq != NO_IRQ)
+                        set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
+        } else {
+                DBG(" -> got one, spec %d cells (0x%08x...) on %s\n",
+                    oirq.size, oirq.specifier[0], oirq.controller->full_name);
 
-        virq = irq_create_of_mapping(oirq.controller, oirq.specifier, oirq.size);
+                virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
+                                             oirq.size);
+        }
         if(virq == NO_IRQ) {
                 DBG(" -> failed to map !\n");
                 return -1;
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index e3b80f71748e..f6a05f090b25 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -5,7 +5,7 @@
 #include <linux/elfcore.h>
 #include <linux/string.h>
 #include <linux/interrupt.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
 #include <linux/vt_kern.h>
 #include <linux/nvram.h>
 #include <linux/console.h>
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index cdcd5d665468..59f69d34cb67 100644
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -885,7 +885,7 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq
         intsize = *tmp;
 
         /* Check index */
-        if (index * intsize >= intlen)
+        if ((index + 1) * intsize > intlen)
                 return -EINVAL;
 
         /* Get new specifier and map it */
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index aaf1727b3570..d57930d86faa 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -26,7 +26,7 @@
 #include <linux/ioport.h>
 #include <linux/console.h>
 #include <linux/utsname.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
 #include <linux/root_dev.h>
 #include <linux/notifier.h>
 #include <linux/cpu.h>
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index 1d724aef438a..ae927a4e46e4 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -277,7 +277,7 @@ static void unregister_cpu_online(unsigned int cpu)
 }
 #endif /* CONFIG_HOTPLUG_CPU */
 
-static int __devinit sysfs_cpu_notify(struct notifier_block *self,
+static int __cpuinit sysfs_cpu_notify(struct notifier_block *self,
                                       unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned int)(long)hcpu;
@@ -295,7 +295,7 @@ static int __devinit sysfs_cpu_notify(struct notifier_block *self,
         return NOTIFY_OK;
 }
 
-static struct notifier_block __devinitdata sysfs_cpu_nb = {
+static struct notifier_block __cpuinitdata sysfs_cpu_nb = {
         .notifier_call  = sysfs_cpu_notify,
 };
 
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 3c668078e524..2105767fcc57 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -150,13 +150,9 @@ int die(const char *str, struct pt_regs *regs, long err)
         if (in_interrupt())
                 panic("Fatal exception in interrupt");
 
-        if (panic_on_oops) {
-#ifdef CONFIG_PPC64
-                printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
-                ssleep(5);
-#endif
-                panic("Fatal exception");
-        }
+        if (panic_on_oops)
+                panic("Fatal exception: panic_on_oops");
+
         do_exit(err);
 
         return 0;
diff --git a/arch/powerpc/kernel/vdso32/Makefile b/arch/powerpc/kernel/vdso32/Makefile
index 8a3bed5f143a..3726358faae8 100644
--- a/arch/powerpc/kernel/vdso32/Makefile
+++ b/arch/powerpc/kernel/vdso32/Makefile
@@ -14,7 +14,8 @@ obj-vdso32 := $(addprefix $(obj)/, $(obj-vdso32))
 
 
 EXTRA_CFLAGS := -shared -s -fno-common -fno-builtin
-EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso32.so.1
+EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso32.so.1 \
+                $(call ld-option, -Wl$(comma)--hash-style=sysv)
 EXTRA_AFLAGS := -D__VDSO32__ -s
 
 obj-y += vdso32_wrapper.o
diff --git a/arch/powerpc/kernel/vdso32/vdso32.lds.S b/arch/powerpc/kernel/vdso32/vdso32.lds.S
index f4bad720cb0a..6187af2d54c3 100644
--- a/arch/powerpc/kernel/vdso32/vdso32.lds.S
+++ b/arch/powerpc/kernel/vdso32/vdso32.lds.S
@@ -14,6 +14,7 @@ SECTIONS
 {
   . = VDSO32_LBASE + SIZEOF_HEADERS;
   .hash           : { *(.hash) }                        :text
+  .gnu.hash       : { *(.gnu.hash) }
   .dynsym         : { *(.dynsym) }
   .dynstr         : { *(.dynstr) }
   .gnu.version    : { *(.gnu.version) }
diff --git a/arch/powerpc/kernel/vdso64/Makefile b/arch/powerpc/kernel/vdso64/Makefile
index ab39988452cc..43af9b2a6f3b 100644
--- a/arch/powerpc/kernel/vdso64/Makefile
+++ b/arch/powerpc/kernel/vdso64/Makefile
@@ -8,7 +8,8 @@ targets := $(obj-vdso64) vdso64.so
 obj-vdso64 := $(addprefix $(obj)/, $(obj-vdso64))
 
 EXTRA_CFLAGS := -shared -s -fno-common -fno-builtin
-EXTRA_CFLAGS +=  -nostdlib -Wl,-soname=linux-vdso64.so.1
+EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso64.so.1 \
+                $(call ld-option, -Wl$(comma)--hash-style=sysv)
 EXTRA_AFLAGS := -D__VDSO64__ -s
 
 obj-y += vdso64_wrapper.o
diff --git a/arch/powerpc/kernel/vdso64/vdso64.lds.S b/arch/powerpc/kernel/vdso64/vdso64.lds.S
index 4bdf224464ab..4a2b6dc0960c 100644
--- a/arch/powerpc/kernel/vdso64/vdso64.lds.S
+++ b/arch/powerpc/kernel/vdso64/vdso64.lds.S
@@ -12,6 +12,7 @@ SECTIONS
 {
   . = VDSO64_LBASE + SIZEOF_HEADERS;
   .hash           : { *(.hash) }                :text
+  .gnu.hash       : { *(.gnu.hash) }
   .dynsym         : { *(.dynsym) }
   .dynstr         : { *(.dynstr) }
   .gnu.version    : { *(.gnu.version) }
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index b26b496f6548..7813a58e0db4 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -159,7 +159,7 @@ static void iic_request_ipi(int ipi, const char *name)
                 if (iic_hosts[node] == NULL)
                         continue;
                 virq = irq_create_mapping(iic_hosts[node],
-                                          iic_ipi_to_irq(ipi), 0);
+                                          iic_ipi_to_irq(ipi));
                 if (virq == NO_IRQ) {
                         printk(KERN_ERR
                                "iic: failed to map IPI %s on node %d\n",
@@ -197,7 +197,7 @@ static int iic_host_match(struct irq_host *h, struct device_node *node)
 }
 
 static int iic_host_map(struct irq_host *h, unsigned int virq,
-                        irq_hw_number_t hw, unsigned int flags)
+                        irq_hw_number_t hw)
 {
         if (hw < IIC_IRQ_IPI0)
                 set_irq_chip_and_handler(virq, &iic_chip, handle_fasteoi_irq);
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
index ab4c252a4d9b..742a03282b44 100644
--- a/arch/powerpc/platforms/cell/spider-pic.c
+++ b/arch/powerpc/platforms/cell/spider-pic.c
@@ -85,9 +85,6 @@ static void spider_unmask_irq(unsigned int virq)
         struct spider_pic *pic = spider_virq_to_pic(virq);
         void __iomem *cfg = spider_get_irq_config(pic, irq_map[virq].hwirq);
 
-        /* We use no locking as we should be covered by the descriptor lock
-         * for access to invidual source configuration registers
-         */
         out_be32(cfg, in_be32(cfg) | 0x30000000u);
 }
 
@@ -96,9 +93,6 @@ static void spider_mask_irq(unsigned int virq)
         struct spider_pic *pic = spider_virq_to_pic(virq);
         void __iomem *cfg = spider_get_irq_config(pic, irq_map[virq].hwirq);
 
-        /* We use no locking as we should be covered by the descriptor lock
-         * for access to invidual source configuration registers
-         */
         out_be32(cfg, in_be32(cfg) & ~0x30000000u);
 }
 
@@ -120,26 +114,14 @@ static void spider_ack_irq(unsigned int virq)
         out_be32(pic->regs + TIR_EDC, 0x100 | (src & 0xf));
 }
 
-static struct irq_chip spider_pic = {
-        .typename = " SPIDER   ",
-        .unmask = spider_unmask_irq,
-        .mask = spider_mask_irq,
-        .ack = spider_ack_irq,
-};
-
-static int spider_host_match(struct irq_host *h, struct device_node *node)
-{
-        struct spider_pic *pic = h->host_data;
-        return node == pic->of_node;
-}
-
-static int spider_host_map(struct irq_host *h, unsigned int virq,
-                        irq_hw_number_t hw, unsigned int flags)
+static int spider_set_irq_type(unsigned int virq, unsigned int type)
 {
-        unsigned int sense = flags & IRQ_TYPE_SENSE_MASK;
-        struct spider_pic *pic = h->host_data;
+        unsigned int sense = type & IRQ_TYPE_SENSE_MASK;
+        struct spider_pic *pic = spider_virq_to_pic(virq);
+        unsigned int hw = irq_map[virq].hwirq;
         void __iomem *cfg = spider_get_irq_config(pic, hw);
-        int level = 0;
+        struct irq_desc *desc = get_irq_desc(virq);
+        u32 old_mask;
         u32 ic;
 
         /* Note that only level high is supported for most interrupts */
@@ -157,29 +139,57 @@ static int spider_host_map(struct irq_host *h, unsigned int virq,
                 break;
         case IRQ_TYPE_LEVEL_LOW:
                 ic = 0x0;
-                level = 1;
                 break;
         case IRQ_TYPE_LEVEL_HIGH:
         case IRQ_TYPE_NONE:
                 ic = 0x1;
-                level = 1;
                 break;
         default:
                 return -EINVAL;
         }
 
+        /* Update irq_desc */
+        desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
+        desc->status |= type & IRQ_TYPE_SENSE_MASK;
+        if (type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))
+                desc->status |= IRQ_LEVEL;
+
         /* Configure the source. One gross hack that was there before and
          * that I've kept around is the priority to the BE which I set to
          * be the same as the interrupt source number. I don't know wether
          * that's supposed to make any kind of sense however, we'll have to
          * decide that, but for now, I'm not changing the behaviour.
          */
-        out_be32(cfg, (ic << 24) | (0x7 << 16) | (pic->node_id << 4) | 0xe);
+        old_mask = in_be32(cfg) & 0x30000000u;
+        out_be32(cfg, old_mask | (ic << 24) | (0x7 << 16) |
+                 (pic->node_id << 4) | 0xe);
         out_be32(cfg + 4, (0x2 << 16) | (hw & 0xff));
 
-        if (level)
-                get_irq_desc(virq)->status |= IRQ_LEVEL;
+        return 0;
+}
+
+static struct irq_chip spider_pic = {
+        .typename = " SPIDER   ",
+        .unmask = spider_unmask_irq,
+        .mask = spider_mask_irq,
+        .ack = spider_ack_irq,
+        .set_type = spider_set_irq_type,
+};
+
+static int spider_host_match(struct irq_host *h, struct device_node *node)
+{
+        struct spider_pic *pic = h->host_data;
+        return node == pic->of_node;
+}
+
+static int spider_host_map(struct irq_host *h, unsigned int virq,
+                        irq_hw_number_t hw)
+{
         set_irq_chip_and_handler(virq, &spider_pic, handle_level_irq);
+
+        /* Set default irq type */
+        set_irq_type(virq, IRQ_TYPE_NONE);
+
         return 0;
 }
 
@@ -283,7 +293,7 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic)
         if (iic_host == NULL)
                 return NO_IRQ;
         /* Manufacture an IIC interrupt number of class 2 */
-        virq = irq_create_mapping(iic_host, 0x20 | unit, 0);
+        virq = irq_create_mapping(iic_host, 0x20 | unit);
         if (virq == NO_IRQ)
                 printk(KERN_ERR "spider_pic: failed to map cascade !");
         return virq;
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index 86d55675e1d2..3bd36d46ab4a 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -583,9 +583,9 @@ static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)
         spu->isrc = isrc = tmp[0];
 
         /* Now map interrupts of all 3 classes */
-        spu->irqs[0] = irq_create_mapping(host, 0x00 | isrc, 0);
-        spu->irqs[1] = irq_create_mapping(host, 0x10 | isrc, 0);
-        spu->irqs[2] = irq_create_mapping(host, 0x20 | isrc, 0);
+        spu->irqs[0] = irq_create_mapping(host, 0x00 | isrc);
+        spu->irqs[1] = irq_create_mapping(host, 0x10 | isrc);
+        spu->irqs[2] = irq_create_mapping(host, 0x20 | isrc);
 
         /* Right now, we only fail if class 2 failed */
         return spu->irqs[2] == NO_IRQ ? -EINVAL : 0;
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
index 2275e64f3152..e32446877e78 100644
--- a/arch/powerpc/platforms/iseries/irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -300,7 +300,7 @@ int __init iSeries_allocate_IRQ(HvBusNumber bus,
         realirq = (((((sub_bus << 8) + (bus - 1)) << 3) + (idsel - 1)) << 3)
                 + function;
 
-        return irq_create_mapping(NULL, realirq, IRQ_TYPE_NONE);
+        return irq_create_mapping(NULL, realirq);
 }
 
 #endif /* CONFIG_PCI */
@@ -341,7 +341,7 @@ unsigned int iSeries_get_irq(struct pt_regs *regs)
 }
 
 static int iseries_irq_host_map(struct irq_host *h, unsigned int virq,
-                                irq_hw_number_t hw, unsigned int flags)
+                                irq_hw_number_t hw)
 {
         set_irq_chip_and_handler(virq, &iseries_pic, handle_fasteoi_irq);
 
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index ecc764a3ff3a..fe6b9bff61b9 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -215,10 +215,17 @@ static void __init maple_init_IRQ(void)
          * in Maple device-tree where the type of the controller is
          * open-pic and not interrupt-controller
          */
-        for_each_node_by_type(np, "open-pic") {
-                mpic_node = np;
-                break;
-        }
+
+        for_each_node_by_type(np, "interrupt-controller")
+                if (device_is_compatible(np, "open-pic")) {
+                        mpic_node = np;
+                        break;
+                }
+        if (mpic_node == NULL)
+                for_each_node_by_type(np, "open-pic") {
+                        mpic_node = np;
+                        break;
+                }
         if (mpic_node == NULL) {
                 printk(KERN_ERR
                        "Failed to locate the MPIC interrupt controller\n");
@@ -245,6 +252,8 @@ static void __init maple_init_IRQ(void)
 
         /* XXX Maple specific bits */
         flags |= MPIC_BROKEN_U3 | MPIC_WANTS_RESET;
+        /* All U3/U4 are big-endian, older SLOF firmware doesn't encode this */
+        flags |= MPIC_BIG_ENDIAN;
 
         /* Setup the openpic driver. More device-tree junks, we hard code no
          * ISUs for now. I'll have to revisit some stuffs with the folks doing
diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c
index 205b4a392862..afa593a8544a 100644
--- a/arch/powerpc/platforms/powermac/backlight.c
+++ b/arch/powerpc/platforms/powermac/backlight.c
@@ -10,11 +10,33 @@
 #include <linux/kernel.h>
 #include <linux/fb.h>
 #include <linux/backlight.h>
+#include <linux/adb.h>
+#include <linux/pmu.h>
+#include <asm/atomic.h>
 #include <asm/prom.h>
 #include <asm/backlight.h>
 
 #define OLD_BACKLIGHT_MAX 15
 
+static void pmac_backlight_key_worker(void *data);
+static void pmac_backlight_set_legacy_worker(void *data);
+
+static DECLARE_WORK(pmac_backlight_key_work, pmac_backlight_key_worker, NULL);
+static DECLARE_WORK(pmac_backlight_set_legacy_work, pmac_backlight_set_legacy_worker, NULL);
+
+/* Although these variables are used in interrupt context, it makes no sense to
+ * protect them. No user is able to produce enough key events per second and
+ * notice the errors that might happen.
+ */
+static int pmac_backlight_key_queued;
+static int pmac_backlight_set_legacy_queued;
+
+/* The via-pmu code allows the backlight to be grabbed, in which case the
+ * in-kernel control of the brightness needs to be disabled. This should
+ * only be used by really old PowerBooks.
+ */
+static atomic_t kernel_backlight_disabled = ATOMIC_INIT(0);
+
 /* Protect the pmac_backlight variable */
 DEFINE_MUTEX(pmac_backlight_mutex);
 
@@ -72,8 +94,11 @@ int pmac_backlight_curve_lookup(struct fb_info *info, int value)
         return level;
 }
 
-static void pmac_backlight_key(int direction)
+static void pmac_backlight_key_worker(void *data)
 {
+        if (atomic_read(&kernel_backlight_disabled))
+                return;
+
         mutex_lock(&pmac_backlight_mutex);
         if (pmac_backlight) {
                 struct backlight_properties *props;
@@ -83,7 +108,8 @@ static void pmac_backlight_key(int direction)
                 props = pmac_backlight->props;
 
                 brightness = props->brightness +
-                        ((direction?-1:1) * (props->max_brightness / 15));
+                        ((pmac_backlight_key_queued?-1:1) *
+                         (props->max_brightness / 15));
 
                 if (brightness < 0)
                         brightness = 0;
@@ -98,17 +124,20 @@ static void pmac_backlight_key(int direction)
         mutex_unlock(&pmac_backlight_mutex);
 }
 
-void pmac_backlight_key_up()
+/* This function is called in interrupt context */
+void pmac_backlight_key(int direction)
 {
-        pmac_backlight_key(0);
+        if (atomic_read(&kernel_backlight_disabled))
+                return;
+
+        /* we can receive multiple interrupts here, but the scheduled work
+         * will run only once, with the last value
+         */
+        pmac_backlight_key_queued = direction;
+        schedule_work(&pmac_backlight_key_work);
 }
 
-void pmac_backlight_key_down()
-{
-        pmac_backlight_key(1);
-}
-
-int pmac_backlight_set_legacy_brightness(int brightness)
+static int __pmac_backlight_set_legacy_brightness(int brightness)
 {
         int error = -ENXIO;
 
@@ -137,6 +166,28 @@ int pmac_backlight_set_legacy_brightness(int brightness)
         return error;
 }
 
+static void pmac_backlight_set_legacy_worker(void *data)
+{
+        if (atomic_read(&kernel_backlight_disabled))
+                return;
+
+        __pmac_backlight_set_legacy_brightness(pmac_backlight_set_legacy_queued);
+}
+
+/* This function is called in interrupt context */
+void pmac_backlight_set_legacy_brightness_pmu(int brightness) {
+        if (atomic_read(&kernel_backlight_disabled))
+                return;
+
+        pmac_backlight_set_legacy_queued = brightness;
+        schedule_work(&pmac_backlight_set_legacy_work);
+}
+
+int pmac_backlight_set_legacy_brightness(int brightness)
+{
+        return __pmac_backlight_set_legacy_brightness(brightness);
+}
+
 int pmac_backlight_get_legacy_brightness()
 {
         int result = -ENXIO;
@@ -158,3 +209,17 @@ int pmac_backlight_get_legacy_brightness()
 
         return result;
 }
+
+void pmac_backlight_disable()
+{
+        atomic_inc(&kernel_backlight_disabled);
+}
+
+void pmac_backlight_enable()
+{
+        atomic_dec(&kernel_backlight_disabled);
+}
+
+EXPORT_SYMBOL_GPL(pmac_backlight);
+EXPORT_SYMBOL_GPL(pmac_backlight_mutex);
+EXPORT_SYMBOL_GPL(pmac_has_backlight_type);
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c
index c364c89adb4e..167cd3ce8a13 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_64.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_64.c
@@ -87,9 +87,9 @@ static int (*g5_query_freq)(void);
 static DEFINE_MUTEX(g5_switch_mutex);
 
 
-#ifdef CONFIG_PPC_SMU
+#ifdef CONFIG_PMAC_SMU
 
-static const u32 *g5_pmode_data;
+static u32 *g5_pmode_data;
 static int g5_pmode_max;
 
 static struct smu_sdbp_fvt *g5_fvt_table;       /* table of op. points */
@@ -216,7 +216,7 @@ static void g5_dummy_switch_volt(int speed_mode)
 {
 }
 
-#endif /* CONFIG_PPC_SMU */
+#endif /* CONFIG_PMAC_SMU */
 
 /*
  * Platform function based voltage switching for PowerMac7,2 & 7,3
@@ -383,7 +383,7 @@ static struct cpufreq_driver g5_cpufreq_driver = {
 };
 
 
-#ifdef CONFIG_PPC_SMU
+#ifdef CONFIG_PMAC_SMU
 
 static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
 {
@@ -535,7 +535,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
         return rc;
 }
 
-#endif /* CONFIG_PPC_SMU */
+#endif /* CONFIG_PMAC_SMU */
 
 
 static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
@@ -731,10 +731,10 @@ static int __init g5_cpufreq_init(void)
             machine_is_compatible("PowerMac7,3") ||
             machine_is_compatible("RackMac3,1"))
                 rc = g5_pm72_cpufreq_init(cpus);
-#ifdef CONFIG_PPC_SMU
+#ifdef CONFIG_PMAC_SMU
         else
                 rc = g5_neo2_cpufreq_init(cpus);
-#endif /* CONFIG_PPC_SMU */
+#endif /* CONFIG_PMAC_SMU */
 
         of_node_put(cpus);
         return rc;
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 787ffd999bc2..9923adc5248e 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -16,6 +16,7 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>
+#include <linux/irq.h>
 
 #include <asm/sections.h>
 #include <asm/io.h>
@@ -24,10 +25,7 @@
 #include <asm/machdep.h>
 #include <asm/pmac_feature.h>
 #include <asm/grackle.h>
-#ifdef CONFIG_PPC64
-//#include <asm/iommu.h>
 #include <asm/ppc-pci.h>
-#endif
 
 #undef DEBUG
 
@@ -46,7 +44,6 @@ static int has_uninorth;
 static struct pci_controller *u3_agp;
 static struct pci_controller *u4_pcie;
 static struct pci_controller *u3_ht;
-#define has_second_ohare 0
 #else
 static int has_second_ohare;
 #endif /* CONFIG_PPC64 */
@@ -996,6 +993,7 @@ void __init pmac_pcibios_fixup(void)
                 /* Read interrupt from the device-tree */
                 pci_read_irq_line(dev);
 
+#ifdef CONFIG_PPC32
                 /* Fixup interrupt for the modem/ethernet combo controller.
                  * on machines with a second ohare chip.
                  * The number in the device tree (27) is bogus (correct for
@@ -1005,8 +1003,11 @@ void __init pmac_pcibios_fixup(void)
                  */
                 if (has_second_ohare &&
                     dev->vendor == PCI_VENDOR_ID_DEC &&
-                    dev->device == PCI_DEVICE_ID_DEC_TULIP_PLUS)
-                        dev->irq = irq_create_mapping(NULL, 60, 0);
+                    dev->device == PCI_DEVICE_ID_DEC_TULIP_PLUS) {
+                        dev->irq = irq_create_mapping(NULL, 60);
+                        set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);
+                }
+#endif /* CONFIG_PPC32 */
         }
 }
 
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 3d328bc1f7e0..060789e31c67 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -291,7 +291,7 @@ static int pmac_pic_host_match(struct irq_host *h, struct device_node *node)
 }
 
 static int pmac_pic_host_map(struct irq_host *h, unsigned int virq,
-                             irq_hw_number_t hw, unsigned int flags)
+                             irq_hw_number_t hw)
 {
         struct irq_desc *desc = get_irq_desc(virq);
         int level;
@@ -318,6 +318,7 @@ static int pmac_pic_host_xlate(struct irq_host *h, struct device_node *ct,
                                unsigned int *out_flags)
 
 {
+        *out_flags = IRQ_TYPE_NONE;
         *out_hwirq = *intspec;
         return 0;
 }
@@ -434,7 +435,7 @@ static void __init pmac_pic_probe_oldstyle(void)
 
         printk(KERN_INFO "irq: System has %d possible interrupts\n", max_irqs);
 #ifdef CONFIG_XMON
-        setup_irq(irq_create_mapping(NULL, 20, 0), &xmon_action);
+        setup_irq(irq_create_mapping(NULL, 20), &xmon_action);
 #endif
 }
 #endif /* CONFIG_PPC32 */
@@ -579,9 +580,10 @@ void __init pmac_pic_init(void)
                 flags |= OF_IMAP_OLDWORLD_MAC;
         if (get_property(of_chosen, "linux,bootx", NULL) != NULL)
                 flags |= OF_IMAP_NO_PHANDLE;
-        of_irq_map_init(flags);
 #endif /* CONFIG_PPC_32 */
 
+        of_irq_map_init(flags);
+
         /* We first try to detect Apple's new Core99 chipset, since mac-io
          * is quite different on those machines and contains an IBM MPIC2.
          */
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index 0e6339ee45a1..903115d67fdc 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -93,8 +93,7 @@ static void request_ras_irqs(struct device_node *np,
                 for (i = 0; i < opicplen; i++) {
                         if (count > 15)
                                 break;
-                        virqs[count] = irq_create_mapping(NULL, *(opicprop++),
-                                                         IRQ_TYPE_NONE);
+                        virqs[count] = irq_create_mapping(NULL, *(opicprop++));
                         if (virqs[count] == NO_IRQ)
                                 printk(KERN_ERR "Unable to allocate interrupt "
                                        "number for %s\n", np->full_name);
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 927e0a423b87..de214d86ff44 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -501,7 +501,8 @@ static void pseries_dedicated_idle_sleep(void)
         }
 
         /*
-         * Cede if the other thread is not idle, so that it can
+         * If not SMT, cede processor.  If CPU is running SMT
+         * cede if the other thread is not idle, so that it can
          * go single-threaded.  If the other thread is idle,
          * we ask the hypervisor if it has pending work it
          * wants to do and cede if it does.  Otherwise we keep
@@ -514,7 +515,8 @@ 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 (!cpu_has_feature(CPU_FTR_SMT) || !lppaca[cpu ^ 1].idle
+            || poll_pending() == H_PENDING)
                 cede_processor();
 
 out:
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index 756421049441..1eab4688be17 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -502,16 +502,9 @@ static int xics_host_match(struct irq_host *h, struct device_node *node)
 }
 
 static int xics_host_map_direct(struct irq_host *h, unsigned int virq,
-                                irq_hw_number_t hw, unsigned int flags)
+                                irq_hw_number_t hw)
 {
-        unsigned int sense = flags & IRQ_TYPE_SENSE_MASK;
-
-        pr_debug("xics: map_direct virq %d, hwirq 0x%lx, flags: 0x%x\n",
-                 virq, hw, flags);
-
-        if (sense && sense != IRQ_TYPE_LEVEL_LOW)
-                printk(KERN_WARNING "xics: using unsupported sense 0x%x"
-                       " for irq %d (h: 0x%lx)\n", flags, virq, hw);
+        pr_debug("xics: map_direct virq %d, hwirq 0x%lx\n", virq, hw);
 
         get_irq_desc(virq)->status |= IRQ_LEVEL;
         set_irq_chip_and_handler(virq, &xics_pic_direct, handle_fasteoi_irq);
@@ -519,16 +512,9 @@ static int xics_host_map_direct(struct irq_host *h, unsigned int virq,
 }
 
 static int xics_host_map_lpar(struct irq_host *h, unsigned int virq,
-                              irq_hw_number_t hw, unsigned int flags)
+                              irq_hw_number_t hw)
 {
-        unsigned int sense = flags & IRQ_TYPE_SENSE_MASK;
-
-        pr_debug("xics: map_lpar virq %d, hwirq 0x%lx, flags: 0x%x\n",
-                 virq, hw, flags);
-
-        if (sense && sense != IRQ_TYPE_LEVEL_LOW)
-                printk(KERN_WARNING "xics: using unsupported sense 0x%x"
-                       " for irq %d (h: 0x%lx)\n", flags, virq, hw);
+        pr_debug("xics: map_direct virq %d, hwirq 0x%lx\n", virq, hw);
 
         get_irq_desc(virq)->status |= IRQ_LEVEL;
         set_irq_chip_and_handler(virq, &xics_pic_lpar, handle_fasteoi_irq);
@@ -757,7 +743,7 @@ void xics_request_IPIs(void)
 {
         unsigned int ipi;
 
-        ipi = irq_create_mapping(xics_host, XICS_IPI, 0);
+        ipi = irq_create_mapping(xics_host, XICS_IPI);
         BUG_ON(ipi == NO_IRQ);
 
         /*
@@ -783,6 +769,14 @@ void xics_teardown_cpu(int secondary)
         xics_set_cpu_priority(cpu, 0);
 
         /*
+         * Clear IPI
+         */
+        if (firmware_has_feature(FW_FEATURE_LPAR))
+                lpar_qirr_info(cpu, 0xff);
+        else
+                direct_qirr_info(cpu, 0xff);
+
+        /*
          * we need to EOI the IPI if we got here from kexec down IPI
          *
          * probably need to check all the other interrupts too
@@ -795,7 +789,7 @@ void xics_teardown_cpu(int secondary)
                 return;
         desc = get_irq_desc(ipi);
         if (desc->chip && desc->chip->eoi)
-                desc->chip->eoi(XICS_IPI);
+                desc->chip->eoi(ipi);
 
         /*
          * Some machines need to have at least one cpu in the GIQ,
diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c
index 72c73a6105cd..9855820b9548 100644
--- a/arch/powerpc/sysdev/i8259.c
+++ b/arch/powerpc/sysdev/i8259.c
@@ -169,7 +169,7 @@ static int i8259_host_match(struct irq_host *h, struct device_node *node)
 }
 
 static int i8259_host_map(struct irq_host *h, unsigned int virq,
-                          irq_hw_number_t hw, unsigned int flags)
+                          irq_hw_number_t hw)
 {
         pr_debug("i8259_host_map(%d, 0x%lx)\n", virq, hw);
 
@@ -177,7 +177,7 @@ static int i8259_host_map(struct irq_host *h, unsigned int virq,
         if (hw == 2)
                 get_irq_desc(virq)->status |= IRQ_NOREQUEST;
 
-        /* We use the level stuff only for now, we might want to
+        /* We use the level handler only for now, we might want to
          * be more cautious here but that works for now
          */
         get_irq_desc(virq)->status |= IRQ_LEVEL;
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 9cecebaa0360..6e0281afa6c3 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -204,7 +204,7 @@ static void mpic_startup_ht_interrupt(struct mpic *mpic, unsigned int source,
         if (fixup->base == NULL)
                 return;
 
-        DBG("startup_ht_interrupt(%u, %u) index: %d\n",
+        DBG("startup_ht_interrupt(0x%x, 0x%x) index: %d\n",
             source, irqflags, fixup->index);
         spin_lock_irqsave(&mpic->fixup_lock, flags);
         /* Enable and configure */
@@ -227,7 +227,7 @@ static void mpic_shutdown_ht_interrupt(struct mpic *mpic, unsigned int source,
         if (fixup->base == NULL)
                 return;
 
-        DBG("shutdown_ht_interrupt(%u, %u)\n", source, irqflags);
+        DBG("shutdown_ht_interrupt(0x%x, 0x%x)\n", source, irqflags);
 
         /* Disable */
         spin_lock_irqsave(&mpic->fixup_lock, flags);
@@ -337,6 +337,17 @@ static void __init mpic_scan_ht_pics(struct mpic *mpic)
         }
 }
 
+#else /* CONFIG_MPIC_BROKEN_U3 */
+
+static inline int mpic_is_ht_interrupt(struct mpic *mpic, unsigned int source)
+{
+        return 0;
+}
+
+static void __init mpic_scan_ht_pics(struct mpic *mpic)
+{
+}
+
 #endif /* CONFIG_MPIC_BROKEN_U3 */
 
 
@@ -405,11 +416,9 @@ static void mpic_unmask_irq(unsigned int irq)
         unsigned int loops = 100000;
         struct mpic *mpic = mpic_from_irq(irq);
         unsigned int src = mpic_irq_to_hw(irq);
-        unsigned long flags;
 
         DBG("%p: %s: enable_irq: %d (src %d)\n", mpic, mpic->name, irq, src);
 
-        spin_lock_irqsave(&mpic_lock, flags);
         mpic_irq_write(src, MPIC_IRQ_VECTOR_PRI,
                        mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI) &
                        ~MPIC_VECPRI_MASK);
@@ -420,7 +429,6 @@ static void mpic_unmask_irq(unsigned int irq)
                         break;
                 }
         } while(mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI) & MPIC_VECPRI_MASK);
-        spin_unlock_irqrestore(&mpic_lock, flags);
 }
 
 static void mpic_mask_irq(unsigned int irq)
@@ -428,11 +436,9 @@ static void mpic_mask_irq(unsigned int irq)
         unsigned int loops = 100000;
         struct mpic *mpic = mpic_from_irq(irq);
         unsigned int src = mpic_irq_to_hw(irq);
-        unsigned long flags;
 
         DBG("%s: disable_irq: %d (src %d)\n", mpic->name, irq, src);
 
-        spin_lock_irqsave(&mpic_lock, flags);
         mpic_irq_write(src, MPIC_IRQ_VECTOR_PRI,
                        mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI) |
                        MPIC_VECPRI_MASK);
@@ -444,7 +450,6 @@ static void mpic_mask_irq(unsigned int irq)
                         break;
                 }
         } while(!(mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI) & MPIC_VECPRI_MASK));
-        spin_unlock_irqrestore(&mpic_lock, flags);
 }
 
 static void mpic_end_irq(unsigned int irq)
@@ -512,8 +517,7 @@ static void mpic_end_ht_irq(unsigned int irq)
                 mpic_ht_end_irq(mpic, src);
         mpic_eoi(mpic);
 }
-
-#endif /* CONFIG_MPIC_BROKEN_U3 */
+#endif /* !CONFIG_MPIC_BROKEN_U3 */
 
 #ifdef CONFIG_SMP
 
@@ -560,47 +564,74 @@ static void mpic_set_affinity(unsigned int irq, cpumask_t cpumask)
                        mpic_physmask(cpus_addr(tmp)[0]));       
 }
 
-static unsigned int mpic_flags_to_vecpri(unsigned int flags, int *level)
+static unsigned int mpic_type_to_vecpri(unsigned int type)
 {
-        unsigned int vecpri;
-
         /* Now convert sense value */
-        switch(flags & IRQ_TYPE_SENSE_MASK) {
+        switch(type & IRQ_TYPE_SENSE_MASK) {
         case IRQ_TYPE_EDGE_RISING:
-                vecpri = MPIC_VECPRI_SENSE_EDGE |
-                        MPIC_VECPRI_POLARITY_POSITIVE;
-                *level = 0;
-                break;
+                return MPIC_VECPRI_SENSE_EDGE | MPIC_VECPRI_POLARITY_POSITIVE;
         case IRQ_TYPE_EDGE_FALLING:
-                vecpri = MPIC_VECPRI_SENSE_EDGE |
-                        MPIC_VECPRI_POLARITY_NEGATIVE;
-                *level = 0;
-                break;
+        case IRQ_TYPE_EDGE_BOTH:
+                return MPIC_VECPRI_SENSE_EDGE | MPIC_VECPRI_POLARITY_NEGATIVE;
         case IRQ_TYPE_LEVEL_HIGH:
-                vecpri = MPIC_VECPRI_SENSE_LEVEL |
-                        MPIC_VECPRI_POLARITY_POSITIVE;
-                *level = 1;
-                break;
+                return MPIC_VECPRI_SENSE_LEVEL | MPIC_VECPRI_POLARITY_POSITIVE;
         case IRQ_TYPE_LEVEL_LOW:
         default:
-                vecpri = MPIC_VECPRI_SENSE_LEVEL |
-                        MPIC_VECPRI_POLARITY_NEGATIVE;
-                *level = 1;
+                return MPIC_VECPRI_SENSE_LEVEL | MPIC_VECPRI_POLARITY_NEGATIVE;
         }
-        return vecpri;
+}
+
+static int mpic_set_irq_type(unsigned int virq, unsigned int flow_type)
+{
+        struct mpic *mpic = mpic_from_irq(virq);
+        unsigned int src = mpic_irq_to_hw(virq);
+        struct irq_desc *desc = get_irq_desc(virq);
+        unsigned int vecpri, vold, vnew;
+
+        DBG("mpic: set_irq_type(mpic:@%p,virq:%d,src:0x%x,type:0x%x)\n",
+            mpic, virq, src, flow_type);
+
+        if (src >= mpic->irq_count)
+                return -EINVAL;
+
+        if (flow_type == IRQ_TYPE_NONE)
+                if (mpic->senses && src < mpic->senses_count)
+                        flow_type = mpic->senses[src];
+        if (flow_type == IRQ_TYPE_NONE)
+                flow_type = IRQ_TYPE_LEVEL_LOW;
+
+        desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
+        desc->status |= flow_type & IRQ_TYPE_SENSE_MASK;
+        if (flow_type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))
+                desc->status |= IRQ_LEVEL;
+
+        if (mpic_is_ht_interrupt(mpic, src))
+                vecpri = MPIC_VECPRI_POLARITY_POSITIVE |
+                        MPIC_VECPRI_SENSE_EDGE;
+        else
+                vecpri = mpic_type_to_vecpri(flow_type);
+
+        vold = mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI);
+        vnew = vold & ~(MPIC_VECPRI_POLARITY_MASK | MPIC_VECPRI_SENSE_MASK);
+        vnew |= vecpri;
+        if (vold != vnew)
+                mpic_irq_write(src, MPIC_IRQ_VECTOR_PRI, vnew);
+
+        return 0;
 }
 
 static struct irq_chip mpic_irq_chip = {
-        .mask   = mpic_mask_irq,
-        .unmask = mpic_unmask_irq,
-        .eoi    = mpic_end_irq,
+        .mask           = mpic_mask_irq,
+        .unmask         = mpic_unmask_irq,
+        .eoi            = mpic_end_irq,
+        .set_type       = mpic_set_irq_type,
 };
 
 #ifdef CONFIG_SMP
 static struct irq_chip mpic_ipi_chip = {
-        .mask   = mpic_mask_ipi,
-        .unmask = mpic_unmask_ipi,
-        .eoi    = mpic_end_ipi,
+        .mask           = mpic_mask_ipi,
+        .unmask         = mpic_unmask_ipi,
+        .eoi            = mpic_end_ipi,
 };
 #endif /* CONFIG_SMP */
 
@@ -611,6 +642,7 @@ static struct irq_chip mpic_irq_ht_chip = {
         .mask           = mpic_mask_irq,
         .unmask         = mpic_unmask_ht_irq,
         .eoi            = mpic_end_ht_irq,
+        .set_type       = mpic_set_irq_type,
 };
 #endif /* CONFIG_MPIC_BROKEN_U3 */
 
@@ -624,26 +656,21 @@ static int mpic_host_match(struct irq_host *h, struct device_node *node)
 }
 
 static int mpic_host_map(struct irq_host *h, unsigned int virq,
-                         irq_hw_number_t hw, unsigned int flags)
+                         irq_hw_number_t hw)
 {
-        struct irq_desc *desc = get_irq_desc(virq);
-        struct irq_chip *chip;
         struct mpic *mpic = h->host_data;
-        u32 v, vecpri = MPIC_VECPRI_SENSE_LEVEL |
-                MPIC_VECPRI_POLARITY_NEGATIVE;
-        int level;
-        unsigned long iflags;
+        struct irq_chip *chip;
 
-        pr_debug("mpic: map virq %d, hwirq 0x%lx, flags: 0x%x\n",
-                 virq, hw, flags);
+        DBG("mpic: map virq %d, hwirq 0x%lx\n", virq, hw);
 
         if (hw == MPIC_VEC_SPURRIOUS)
                 return -EINVAL;
+
 #ifdef CONFIG_SMP
         else if (hw >= MPIC_VEC_IPI_0) {
                 WARN_ON(!(mpic->flags & MPIC_PRIMARY));
 
-                pr_debug("mpic: mapping as IPI\n");
+                DBG("mpic: mapping as IPI\n");
                 set_irq_chip_data(virq, mpic);
                 set_irq_chip_and_handler(virq, &mpic->hc_ipi,
                                          handle_percpu_irq);
@@ -654,44 +681,23 @@ static int mpic_host_map(struct irq_host *h, unsigned int virq,
         if (hw >= mpic->irq_count)
                 return -EINVAL;
 
-        /* If no sense provided, check default sense array */
-        if (((flags & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_NONE) &&
-            mpic->senses && hw < mpic->senses_count)
-                flags |= mpic->senses[hw];
-
-        vecpri = mpic_flags_to_vecpri(flags, &level);
-        if (level)
-                desc->status |= IRQ_LEVEL;
+        /* Default chip */
         chip = &mpic->hc_irq;
 
 #ifdef CONFIG_MPIC_BROKEN_U3
         /* Check for HT interrupts, override vecpri */
-        if (mpic_is_ht_interrupt(mpic, hw)) {
-                vecpri &= ~(MPIC_VECPRI_SENSE_MASK |
-                            MPIC_VECPRI_POLARITY_MASK);
-                vecpri |= MPIC_VECPRI_POLARITY_POSITIVE;
+        if (mpic_is_ht_interrupt(mpic, hw))
                 chip = &mpic->hc_ht_irq;
-        }
-#endif
+#endif /* CONFIG_MPIC_BROKEN_U3 */
 
-        /* Reconfigure irq. We must preserve the mask bit as we can be called
-         * while the interrupt is still active (This may change in the future
-         * but for now, it is the case).
-         */
-        spin_lock_irqsave(&mpic_lock, iflags);
-        v = mpic_irq_read(hw, MPIC_IRQ_VECTOR_PRI);
-        vecpri = (v &
-                ~(MPIC_VECPRI_POLARITY_MASK | MPIC_VECPRI_SENSE_MASK)) |
-                vecpri;
-        if (vecpri != v)
-                mpic_irq_write(hw, MPIC_IRQ_VECTOR_PRI, vecpri);
-        spin_unlock_irqrestore(&mpic_lock, iflags);
-
-        pr_debug("mpic: mapping as IRQ, vecpri = 0x%08x (was 0x%08x)\n",
-                 vecpri, v);
+        DBG("mpic: mapping to irq chip @%p\n", chip);
 
         set_irq_chip_data(virq, mpic);
         set_irq_chip_and_handler(virq, chip, handle_fasteoi_irq);
+
+        /* Set default irq type */
+        set_irq_type(virq, IRQ_TYPE_NONE);
+
         return 0;
 }
 
@@ -708,11 +714,28 @@ static int mpic_host_xlate(struct irq_host *h, struct device_node *ct,
         };
 
         *out_hwirq = intspec[0];
-        if (intsize > 1 && intspec[1] < 4)
-                *out_flags = map_mpic_senses[intspec[1]];
-        else
+        if (intsize > 1) {
+                u32 mask = 0x3;
+
+                /* Apple invented a new race of encoding on machines with
+                 * an HT APIC. They encode, among others, the index within
+                 * the HT APIC. We don't care about it here since thankfully,
+                 * it appears that they have the APIC already properly
+                 * configured, and thus our current fixup code that reads the
+                 * APIC config works fine. However, we still need to mask out
+                 * bits in the specifier to make sure we only get bit 0 which
+                 * is the level/edge bit (the only sense bit exposed by Apple),
+                 * as their bit 1 means something else.
+                 */
+                if (machine_is(powermac))
+                        mask = 0x1;
+                *out_flags = map_mpic_senses[intspec[1] & mask];
+        } else
                 *out_flags = IRQ_TYPE_NONE;
 
+        DBG("mpic: xlate (%d cells: 0x%08x 0x%08x) to line 0x%lx sense 0x%x\n",
+            intsize, intspec[0], intspec[1], *out_hwirq, *out_flags);
+
         return 0;
 }
 
@@ -906,41 +929,16 @@ void __init mpic_init(struct mpic *mpic)
         if (mpic->irq_count == 0)
                 mpic->irq_count = mpic->num_sources;
 
-#ifdef CONFIG_MPIC_BROKEN_U3
         /* Do the HT PIC fixups on U3 broken mpic */
         DBG("MPIC flags: %x\n", mpic->flags);
         if ((mpic->flags & MPIC_BROKEN_U3) && (mpic->flags & MPIC_PRIMARY))
                 mpic_scan_ht_pics(mpic);
-#endif /* CONFIG_MPIC_BROKEN_U3 */
 
         for (i = 0; i < mpic->num_sources; i++) {
                 /* start with vector = source number, and masked */
-                u32 vecpri = MPIC_VECPRI_MASK | i | (8 << MPIC_VECPRI_PRIORITY_SHIFT);
-                int level = 1;
+                u32 vecpri = MPIC_VECPRI_MASK | i |
+                        (8 << MPIC_VECPRI_PRIORITY_SHIFT);
                 
-                /* do senses munging */
-                if (mpic->senses && i < mpic->senses_count)
-                        vecpri |= mpic_flags_to_vecpri(mpic->senses[i],
-                                                       &level);
-                else
-                        vecpri |= MPIC_VECPRI_SENSE_LEVEL;
-
-                /* deal with broken U3 */
-                if (mpic->flags & MPIC_BROKEN_U3) {
-#ifdef CONFIG_MPIC_BROKEN_U3
-                        if (mpic_is_ht_interrupt(mpic, i)) {
-                                vecpri &= ~(MPIC_VECPRI_SENSE_MASK |
-                                            MPIC_VECPRI_POLARITY_MASK);
-                                vecpri |= MPIC_VECPRI_POLARITY_POSITIVE;
-                        }
-#else
-                        printk(KERN_ERR "mpic: BROKEN_U3 set, but CONFIG doesn't match\n");
-#endif
-                }
-
-                DBG("setup source %d, vecpri: %08x, level: %d\n", i, vecpri,
-                    (level != 0));
-
                 /* init hw */
                 mpic_irq_write(i, MPIC_IRQ_VECTOR_PRI, vecpri);
                 mpic_irq_write(i, MPIC_IRQ_DESTINATION,
@@ -1154,7 +1152,7 @@ void mpic_request_ipis(void)
 
         for (i = 0; i < 4; i++) {
                 unsigned int vipi = irq_create_mapping(mpic->irqhost,
-                                                       MPIC_VEC_IPI_0 + i, 0);
+                                                       MPIC_VEC_IPI_0 + i);
                 if (vipi == NO_IRQ) {
                         printk(KERN_ERR "Failed to map IPI %d\n", i);
                         break;