- patches.fixes/patch-2.6.11-rc1: 2.6.11-rc1.

[linux-flexiantxendom0-3.2.10.git] / arch / ppc64 / kernel / xics.c

diff --git a/arch/ppc64/kernel/xics.c b/arch/ppc64/kernel/xics.c
index 674166e..eca025a 100644 (file)
--- a/arch/ppc64/kernel/xics.c
+++ b/arch/ppc64/kernel/xics.c
@@ -24,7 +24,6 @@
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/smp.h>
-#include <asm/naca.h>
 #include <asm/rtas.h>
 #include <asm/xics.h>
 #include <asm/hvcall.h>
@@ -92,6 +91,7 @@ static int xics_irq_8259_cascade_real = 0;
 static unsigned int default_server = 0xFF;
 /* also referenced in smp.c... */
 unsigned int default_distrib_server = 0;
+unsigned int interrupt_server_size = 8;
 
 /*
  * XICS only has a single IPI, so encode the messages per CPU
@@ -512,6 +512,10 @@ nextnode:
                                default_server = ireg[0];
                                default_distrib_server = ireg[i-1]; /* take last element */
                        }
+                       ireg = (uint *)get_property(np,
+                                       "ibm,interrupt-server#-size", NULL);
+                       if (ireg)
+                               interrupt_server_size = *ireg;
                        break;
                }
        }
@@ -575,7 +579,7 @@ nextnode:
  */
 static int __init xics_setup_i8259(void)
 {
-       if (naca->interrupt_controller == IC_PPC_XIC &&
+       if (ppc64_interrupt_controller == IC_PPC_XIC &&
            xics_irq_8259_cascade != -1) {
                if (request_irq(irq_offset_up(xics_irq_8259_cascade),
                                no_action, 0, "8259 cascade", NULL))
@@ -644,20 +648,16 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)
 /* Interrupts are disabled. */
 void xics_migrate_irqs_away(void)
 {
-       int set_indicator = rtas_token("set-indicator");
-       const unsigned int giqs = 9005UL; /* Global Interrupt Queue Server */
-       int status = 0;
+       int status;
        unsigned int irq, virq, cpu = smp_processor_id();
 
-       BUG_ON(set_indicator == RTAS_UNKNOWN_SERVICE);
-
        /* Reject any interrupt that was queued to us... */
        ops->cppr_info(cpu, 0);
        iosync();
 
-       /* Refuse any new interrupts... */
-       rtas_call(set_indicator, 3, 1, &status, giqs,
-                 hard_smp_processor_id(), 0);
+       /* remove ourselves from the global interrupt queue */
+       status = rtas_set_indicator(GLOBAL_INTERRUPT_QUEUE,
+               (1UL << interrupt_server_size) - 1 - default_distrib_server, 0);
        WARN_ON(status != 0);
 
        /* Allow IPIs again... */