[XenPPC] [PATCH] Fix Maple SMP spurious interrupts assert

[Amos Waterland <apw@xxxxxxxxxx>]

This lets Xen with the SMP patch boot reliably on the Maple-D platform I
have access to.

I believe that the long-term strategy for Xen/PPC is to completely
virtualize the PIC, but until that happens, this patch will I believe
allow the SMP patch to go in.

Signed-off-by: Amos Waterland <apw@xxxxxxxxxx>

---

 Makefile |    4 ++++
 mpic.c   |    2 ++
 2 files changed, 6 insertions(+)

diff -r b9e38b262f64 arch/powerpc/sysdev/Makefile
--- a/arch/powerpc/sysdev/Makefile      Sun Oct 08 14:22:12 2006 -0400
+++ b/arch/powerpc/sysdev/Makefile      Wed Oct 11 19:35:53 2006 -0400
@@ -1,5 +1,9 @@ ifeq ($(CONFIG_PPC64),y)
 ifeq ($(CONFIG_PPC64),y)
 EXTRA_CFLAGS                   += -mno-minimal-toc
+endif
+
+ifeq ($(CONFIG_PPC_XEN),y)
+EXTRA_CFLAGS                   += -DCONFIG_PPC_XEN
 endif
 
 obj-$(CONFIG_MPIC)             += mpic.o
diff -r b9e38b262f64 arch/powerpc/sysdev/mpic.c
--- a/arch/powerpc/sysdev/mpic.c        Sun Oct 08 14:22:12 2006 -0400
+++ b/arch/powerpc/sysdev/mpic.c        Wed Oct 11 19:40:07 2006 -0400
@@ -619,6 +619,7 @@ struct mpic * __init mpic_alloc(unsigned
        mpic->tmregs = mpic->gregs + ((MPIC_TIMER_BASE - MPIC_GREG_BASE) >> 2);
        BUG_ON(mpic->gregs == NULL);
 
+#ifndef CONFIG_PPC_XEN
        /* Reset */
        if (flags & MPIC_WANTS_RESET) {
                mpic_write(mpic->gregs, MPIC_GREG_GLOBAL_CONF_0,
@@ -628,6 +629,7 @@ struct mpic * __init mpic_alloc(unsigned
                       & MPIC_GREG_GCONF_RESET)
                        mb();
        }
+#endif
 
        /* Read feature register, calculate num CPUs and, for non-ISU
         * MPICs, num sources as well. On ISU MPICs, sources are counted

_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel