[src/trunk]: src/sys/arch/arm/pic Fix lost interrupt. (1/2)

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

details:   https://anonhg.NetBSD.org/src/rev/7c15f799ea76
branches:  trunk
changeset: 757470:7c15f799ea76
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Tue Aug 31 14:23:27 2010 +0000

description:
Fix lost interrupt. (1/2)
 + Change blocked_irqs that dispach if change pending_irqs in the loop.

diffstat:

 sys/arch/arm/pic/pic.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 22d0d4b74310 -r 7c15f799ea76 sys/arch/arm/pic/pic.c
--- a/sys/arch/arm/pic/pic.c    Tue Aug 31 12:12:48 2010 +0000
+++ b/sys/arch/arm/pic/pic.c    Tue Aug 31 14:23:27 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pic.c,v 1.4 2008/12/30 05:43:14 matt Exp $     */
+/*     $NetBSD: pic.c,v 1.5 2010/08/31 14:23:27 kiyohara Exp $ */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.4 2008/12/30 05:43:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.5 2010/08/31 14:23:27 kiyohara Exp $");
 
 #define _INTR_PRIVATE
 #include <sys/param.h>
@@ -229,7 +229,7 @@
 #endif
                }
                progress = true;
-               blocked_irqs = pending_irqs;
+               blocked_irqs = 0;
                do {
                        irq = ffs(pending_irqs) - 1;
                        KASSERT(irq >= 0);
@@ -240,9 +240,9 @@
                                cpsie(I32_bit);
                                pic_dispatch(is, frame);
                                cpsid(I32_bit);
+                               blocked_irqs |= __BIT(irq);
                        } else {
                                KASSERT(0);
-                               blocked_irqs &= ~__BIT(irq);
                        }
                        pending_irqs = pic_find_pending_irqs_by_ipl(pic,
                            irq_base, *ipending, ipl);