[XenPPC] [pushed] [ppc] fix open pic initalization for g5.

[jimix@xxxxxxxxxxxxxx]

changeset:   10378:e103e54a3f343b8c222d337554f427dc5e6cf63a
tag:         tip
user:        jimix@xxxxxxxxxxxxxxxxxxxxx
date:        Mon May 22 16:08:01 2006 -0400
files:       xen/arch/ppc/mpic_init.c
description:
[ppc] fix open pic initalization for g5.

Signed-off-by: Maria Butrico <butrico@xxxxxxxxxxxxxx>

summary:    fix open pic initalization for g5.

        Initialization of open pic should not, by default, use the
        broken u3 flag.  Currently the flag is set for those
        platform where initializitng with this flag does not break.
        On g5's this flag should not be set.

        Other minor cleanup.


diff -r a0fa2ce45bae053363bbf0e205a1438ed3db3add -r 
e103e54a3f343b8c222d337554f427dc5e6cf63a xen/arch/ppc/mpic_init.c
--- a/xen/arch/ppc/mpic_init.c  Mon May 22 11:01:31 2006 -0400
+++ b/xen/arch/ppc/mpic_init.c  Mon May 22 16:08:01 2006 -0400
@@ -9,15 +9,8 @@
 #include "oftree.h"
 
 #undef DEBUG
-#undef NOSERIAL
 #ifdef DEBUG
-#ifdef NOSERIAL
-int of_printf(const char *fmt, ...)
-    __attribute__ ((format (printf, 1, 2)));
-#define DBG(fmt...) of_printf(fmt)
-#else
 #define DBG(fmt...) printk(fmt)
-#endif  /* #ifdef NOSERIAL */
 #else
 #define DBG(fmt...)
 #endif
@@ -234,7 +227,7 @@ static int find_mpic_simple_probe(void *
     }
     DBG("%s: found OpenPIC at: 0x%lx\n", __func__, opic_addr);
     /* we did not really find the pic device, only its address. 
-     * We use big endian by default
+     * We use big endian and broken u3 by default.
      */
     opic_flags |= MPIC_BIG_ENDIAN | MPIC_BROKEN_U3;
     return 0;
@@ -338,9 +331,7 @@ struct hw_interrupt_type *xen_mpic_init(
     }
 
     mpic = mpic_alloc(opic_addr,
-                      MPIC_PRIMARY |
-                      MPIC_BROKEN_U3 | MPIC_WANTS_RESET |
-                      opic_flags,
+                      opic_flags | MPIC_PRIMARY | MPIC_WANTS_RESET,
                       isu_size, irq_offset, irq_count,
                       ipi_offset, senses, senses_count, "Xen-U3-MPIC");
 



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