Sun Jan 4 15:34:18 2009 UTC ()

Account ci->ci_idepth on calling handlers in ext_intr() as well as
powerpc/pic/intr.c:pic_handle_intr().  Closes PR port-evbppc/40288.

Should be pulled up to netbsd-5.


(tsutsui)

diff -r1.20 -r1.21 src/sys/arch/powerpc/ibm4xx/intr.c

--- src/sys/arch/powerpc/ibm4xx/Attic/intr.c 2008/01/02 11:48:27	1.20
+++ src/sys/arch/powerpc/ibm4xx/Attic/intr.c 2009/01/04 15:34:18	1.21

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intr.c,v 1.20 2008/01/02 11:48:27 ad Exp $	*/
+/*	$NetBSD: intr.c,v 1.21 2009/01/04 15:34:18 tsutsui Exp $	*/
 /*
  * Copyright 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -26,27 +26,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.20 2008/01/02 11:48:27 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.21 2009/01/04 15:34:18 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/evcnt.h>
 #include <uvm/uvm_extern.h>
 #include <machine/intr.h>
 #include <machine/psl.h>
 #include <powerpc/cpu.h>
 #include <powerpc/spr.h>
 @@ -241,47 +241,49 @@ ext_intr(void)
 	bits_to_clear = int_state;
 	while (int_state) {
 		i = IRQ_OF_MASK(int_state);
 		r_imen = IRQ_TO_MASK(i);
 		int_state &= ~r_imen;
 		if ((pcpl & r_imen) != 0) {
 			/* Masked! Mark as pending */
 			ci->ci_ipending |= r_imen;
 			disable_irq(i);
  		} else {
 			ci->ci_idepth++;
 			splraise(intrs[i].is_mask);
 			if (intrs[i].is_type == IST_LEVEL)
 				disable_irq(i);
 			wrteei(1);
 			ih = intrs[i].is_head;
 			while (ih) {
 				if (ih->ih_level == IPL_VM)
 					KERNEL_LOCK(1, NULL);
 				(*ih->ih_fun)(ih->ih_arg);
 				ih = ih->ih_next;
 				if (ih->ih_level == IPL_VM)
 					KERNEL_UNLOCK_ONE(NULL);
+			}
 			mtmsr(msr);
 			if (intrs[i].is_type == IST_LEVEL)
 				enable_irq(i);
 			ci->ci_cpl = pcpl;
 			uvmexp.intrs++;
 			intrs[i].is_evcnt.ev_count++;
 			ci->ci_idepth--;
+		}
+	}
 	mtdcr(INTR_ACK, bits_to_clear);	/* Acknowledge all pending interrupts */
 	wrteei(1);
 	splx(pcpl);
 	mtmsr(msr);
+}
 static inline void
 disable_irq(int irq)
+{
 	int mask, omask;