[src/trunk]: src/sys/arch Fix hangup to interrupt on cascading PIC.

[kiyohara <kiyohara%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1d5e653a213b
branches:  trunk
changeset: 786242:1d5e653a213b
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Sun Apr 21 15:42:11 2013 +0000

description:
Fix hangup to interrupt on cascading PIC.
tested on bebox and evbppc/OPENBLOCKS600.

diffstat:

 sys/arch/bebox/bebox/machdep.c         |   6 +++---
 sys/arch/evbppc/ev64260/gt_mainbus.c   |  12 ++++++------
 sys/arch/macppc/macppc/pic_ohare.c     |   6 +++---
 sys/arch/ofppc/ofppc/mainbus.c         |   6 +++---
 sys/arch/prep/prep/machdep.c           |   6 +++---
 sys/arch/sandpoint/sandpoint/machdep.c |   6 +++---
 6 files changed, 21 insertions(+), 21 deletions(-)

diffs (171 lines):

diff -r eb9d8e33141e -r 1d5e653a213b sys/arch/bebox/bebox/machdep.c
--- a/sys/arch/bebox/bebox/machdep.c    Sun Apr 21 08:47:28 2013 +0000
+++ b/sys/arch/bebox/bebox/machdep.c    Sun Apr 21 15:42:11 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.106 2012/10/13 17:58:54 jdc Exp $        */
+/*     $NetBSD: machdep.c,v 1.107 2013/04/21 15:42:11 kiyohara Exp $   */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.106 2012/10/13 17:58:54 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.107 2013/04/21 15:42:11 kiyohara Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -164,7 +164,7 @@
        /*
         * set up i8259 as a cascade on BeInterruptController irq 26.
         */
-       intr_establish(16 + 26, IST_LEVEL, IPL_NONE, pic_handle_intr, isa_pic);
+       intr_establish(16 + 26, IST_LEVEL, IPL_HIGH, pic_handle_intr, isa_pic);
 
        oea_install_extint(pic_ext_intr);
 
diff -r eb9d8e33141e -r 1d5e653a213b sys/arch/evbppc/ev64260/gt_mainbus.c
--- a/sys/arch/evbppc/ev64260/gt_mainbus.c      Sun Apr 21 08:47:28 2013 +0000
+++ b/sys/arch/evbppc/ev64260/gt_mainbus.c      Sun Apr 21 15:42:11 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gt_mainbus.c,v 1.17 2011/07/01 20:46:39 dyoung Exp $   */
+/*     $NetBSD: gt_mainbus.c,v 1.18 2013/04/21 15:42:11 kiyohara Exp $ */
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt_mainbus.c,v 1.17 2011/07/01 20:46:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt_mainbus.c,v 1.18 2013/04/21 15:42:11 kiyohara Exp $");
 
 #include "opt_ev64260.h"
 #include "opt_pci.h"
@@ -203,13 +203,13 @@
            GPP_EXTERNAL_INTERRUPS);
 
        discovery_pic->pic_cookie = sc;
-       intr_establish(IRQ_GPP7_0, IST_LEVEL, IPL_NONE,
+       intr_establish(IRQ_GPP7_0, IST_LEVEL, IPL_HIGH,
            pic_handle_intr, discovery_gpp_pic[0]);
-       intr_establish(IRQ_GPP15_8, IST_LEVEL, IPL_NONE,
+       intr_establish(IRQ_GPP15_8, IST_LEVEL, IPL_HIGH,
            pic_handle_intr, discovery_gpp_pic[1]);
-       intr_establish(IRQ_GPP23_16, IST_LEVEL, IPL_NONE,
+       intr_establish(IRQ_GPP23_16, IST_LEVEL, IPL_HIGH,
            pic_handle_intr, discovery_gpp_pic[2]);
-       intr_establish(IRQ_GPP31_24, IST_LEVEL, IPL_NONE,
+       intr_establish(IRQ_GPP31_24, IST_LEVEL, IPL_HIGH,
            pic_handle_intr, discovery_gpp_pic[3]);
 
        cpumstr = bus_space_read_4(sc->sc_iot, sc->sc_ioh, GT_CPU_Master_Ctl);
diff -r eb9d8e33141e -r 1d5e653a213b sys/arch/macppc/macppc/pic_ohare.c
--- a/sys/arch/macppc/macppc/pic_ohare.c        Sun Apr 21 08:47:28 2013 +0000
+++ b/sys/arch/macppc/macppc/pic_ohare.c        Sun Apr 21 15:42:11 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pic_ohare.c,v 1.11 2012/03/13 18:24:54 macallan Exp $ */
+/*     $NetBSD: pic_ohare.c,v 1.12 2013/04/21 15:42:11 kiyohara Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_ohare.c,v 1.11 2012/03/13 18:24:54 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_ohare.c,v 1.12 2013/04/21 15:42:11 kiyohara Exp $");
 
 #include "opt_interrupt.h"
 
@@ -160,7 +160,7 @@
 
        pic = setup_ohare(addr, 0);
        strcpy(pic->pic.pic_name, "ohare2");
-       intr_establish(irq, IST_LEVEL, IPL_NONE, pic_handle_intr, pic);
+       intr_establish(irq, IST_LEVEL, IPL_HIGH, pic_handle_intr, pic);
 }
 
 static void
diff -r eb9d8e33141e -r 1d5e653a213b sys/arch/ofppc/ofppc/mainbus.c
--- a/sys/arch/ofppc/ofppc/mainbus.c    Sun Apr 21 08:47:28 2013 +0000
+++ b/sys/arch/ofppc/ofppc/mainbus.c    Sun Apr 21 15:42:11 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mainbus.c,v 1.28 2011/06/30 00:52:58 matt Exp $        */
+/*     $NetBSD: mainbus.c,v 1.29 2013/04/21 15:42:11 kiyohara Exp $    */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.28 2011/06/30 00:52:58 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.29 2013/04/21 15:42:11 kiyohara Exp $");
 
 #include "opt_interrupt.h"
 #include "opt_multiprocessor.h"
@@ -343,7 +343,7 @@
        }
        if (isa_cascade) {
                primary_pic = 1;
-               intr_establish(16, IST_LEVEL, IPL_NONE, pic_handle_intr,
+               intr_establish(16, IST_LEVEL, IPL_HIGH, pic_handle_intr,
                    isa_pic);
        }
 }
diff -r eb9d8e33141e -r 1d5e653a213b sys/arch/prep/prep/machdep.c
--- a/sys/arch/prep/prep/machdep.c      Sun Apr 21 08:47:28 2013 +0000
+++ b/sys/arch/prep/prep/machdep.c      Sun Apr 21 15:42:11 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.73 2011/06/30 00:53:00 matt Exp $        */
+/*     $NetBSD: machdep.c,v 1.74 2013/04/21 15:42:11 kiyohara Exp $    */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.73 2011/06/30 00:53:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.74 2013/04/21 15:42:11 kiyohara Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_openpic.h"
@@ -361,7 +361,7 @@
                openpic_write(OPENPIC_TIMER_FREQ, busfreq/8);
                primary_pic = 1;
                /* set up the IVR as a cascade on openpic 0 */
-               intr_establish(16, IST_LEVEL, IPL_NONE, pic_handle_intr,
+               intr_establish(16, IST_LEVEL, IPL_HIGH, pic_handle_intr,
                    isa_pic);
                oea_install_extint(pic_ext_intr);
 #ifdef MULTIPROCESSOR
diff -r eb9d8e33141e -r 1d5e653a213b sys/arch/sandpoint/sandpoint/machdep.c
--- a/sys/arch/sandpoint/sandpoint/machdep.c    Sun Apr 21 08:47:28 2013 +0000
+++ b/sys/arch/sandpoint/sandpoint/machdep.c    Sun Apr 21 15:42:11 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.62 2012/02/10 12:02:33 phx Exp $ */
+/*     $NetBSD: machdep.c,v 1.63 2013/04/21 15:42:12 kiyohara Exp $    */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.62 2012/02/10 12:02:33 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.63 2013/04/21 15:42:12 kiyohara Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -257,7 +257,7 @@
         * set up i8259 as a cascade on EPIC irq 0.
         * XXX exceptional SP2 has 17
         */
-       intr_establish(16, IST_LEVEL, IPL_NONE, pic_handle_intr, isa_pic);
+       intr_establish(16, IST_LEVEL, IPL_HIGH, pic_handle_intr, isa_pic);
 #else
        mpcpic_reserv16();
        (void)setup_mpcpic(baseaddr);