[POWERPC] Turn xics_setup_8259_cascade() into a generic pseries_setup_i8259_cascade()

[pandora-kernel.git] / arch / powerpc / platforms / pseries / setup.c

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index fdb9b1c..eb07952 100644 (file)
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -76,9 +76,6 @@
 #define DBG(fmt...)
 #endif
 
-/* move those away to a .h */
-extern void find_udbg_vterm(void);
-
 int fwnmi_active;  /* TRUE if an FWNMI handler is present */
 
 static void pseries_shared_idle_sleep(void);
@@ -127,6 +124,55 @@ void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc)
        desc->chip->eoi(irq);
 }
 
+static void __init pseries_setup_i8259_cascade(void)
+{
+       struct device_node *np, *old, *found = NULL;
+       unsigned int cascade;
+       const u32 *addrp;
+       unsigned long intack = 0;
+       int naddr;
+
+       for_each_node_by_type(np, "interrupt-controller") {
+               if (of_device_is_compatible(np, "chrp,iic")) {
+                       found = np;
+                       break;
+               }
+       }
+
+       if (found == NULL) {
+               printk(KERN_DEBUG "pic: no ISA interrupt controller\n");
+               return;
+       }
+
+       cascade = irq_of_parse_and_map(found, 0);
+       if (cascade == NO_IRQ) {
+               printk(KERN_ERR "pic: failed to map cascade interrupt");
+               return;
+       }
+       pr_debug("pic: cascade mapped to irq %d\n", cascade);
+
+       for (old = of_node_get(found); old != NULL ; old = np) {
+               np = of_get_parent(old);
+               of_node_put(old);
+               if (np == NULL)
+                       break;
+               if (strcmp(np->name, "pci") != 0)
+                       continue;
+               addrp = of_get_property(np, "8259-interrupt-acknowledge", NULL);
+               if (addrp == NULL)
+                       continue;
+               naddr = of_n_addr_cells(np);
+               intack = addrp[naddr-1];
+               if (naddr > 1)
+                       intack |= ((unsigned long)addrp[naddr-2]) << 32;
+       }
+       if (intack)
+               printk(KERN_DEBUG "pic: PCI 8259 intack at 0x%016lx\n", intack);
+       i8259_init(found, intack);
+       of_node_put(found);
+       set_irq_chained_handler(cascade, pseries_8259_cascade);
+}
+
 static void __init pseries_mpic_init_IRQ(void)
 {
        struct device_node *np, *old, *cascade = NULL;
@@ -206,6 +252,12 @@ static void __init pseries_mpic_init_IRQ(void)
        set_irq_chained_handler(cascade_irq, pseries_8259_cascade);
 }
 
+static void __init pseries_xics_init_IRQ(void)
+{
+       xics_init_IRQ();
+       pseries_setup_i8259_cascade();
+}
+
 static void pseries_lpar_enable_pmcs(void)
 {
        unsigned long set, reset;
@@ -235,7 +287,7 @@ static void __init pseries_discover_pic(void)
                        smp_init_pseries_mpic();
                        return;
                } else if (strstr(typep, "ppc-xicp")) {
-                       ppc_md.init_IRQ       = xics_init_IRQ;
+                       ppc_md.init_IRQ       = pseries_xics_init_IRQ;
                        setup_kexec_cpu_down_xics();
                        smp_init_pseries_xics();
                        return;
@@ -393,6 +445,7 @@ static void pseries_dedicated_idle_sleep(void)
 { 
        unsigned int cpu = smp_processor_id();
        unsigned long start_snooze;
+       unsigned long in_purr, out_purr;
 
        /*
         * Indicate to the HV that we are idle. Now would be
@@ -400,6 +453,7 @@ static void pseries_dedicated_idle_sleep(void)
         */
        get_lppaca()->idle = 1;
        get_lppaca()->donate_dedicated_cpu = 1;
+       in_purr = mfspr(SPRN_PURR);
 
        /*
         * We come in with interrupts disabled, and need_resched()
@@ -432,6 +486,8 @@ static void pseries_dedicated_idle_sleep(void)
 
 out:
        HMT_medium();
+       out_purr = mfspr(SPRN_PURR);
+       get_lppaca()->wait_state_cycles += out_purr - in_purr;
        get_lppaca()->donate_dedicated_cpu = 0;
        get_lppaca()->idle = 0;
 }