From owner-p4-projects@FreeBSD.ORG  Tue Jan  2 18:23:28 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E519916A417; Tue,  2 Jan 2007 18:23:27 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BED7616A403
	for <perforce@freebsd.org>; Tue,  2 Jan 2007 18:23:27 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id B018613C457
	for <perforce@freebsd.org>; Tue,  2 Jan 2007 18:23:27 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l02INQie025033
	for <perforce@freebsd.org>; Tue, 2 Jan 2007 18:23:26 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l02INQaL025030
	for perforce@freebsd.org; Tue, 2 Jan 2007 18:23:26 GMT
	(envelope-from cognet@freebsd.org)
Date: Tue, 2 Jan 2007 18:23:26 GMT
Message-Id: <200701021823.l02INQaL025030@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 112427 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Jan 2007 18:23:28 -0000

http://perforce.freebsd.org/chv.cgi?CH=112427

Change 112427 by cognet@hulglah on 2007/01/02 18:22:41

	Ooops, revert the logic : don't disable the interrupt unless it's
	really needed.
	Suggested by:	jhb

Affected files ...

.. //depot/projects/soc2006/intr_filter/arm/arm/intr.c#11 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/arm/arm/intr.c#11 (text+ko) ====

@@ -123,12 +123,12 @@
 }
 
 static void
-intr_eoi_src(void *arg)
+intr_disab_eoi_src(void *arg)
 {
 	uintptr_t nb;
 
 	nb = (uintptr_t)arg;
-	arm_unmask_irq(nb);
+	arm_mask_irq(nb);
 }
 
 void
@@ -139,16 +139,14 @@
 
 	PCPU_LAZY_INC(cnt.v_intr);
 	while ((i = arm_get_next_irq()) != -1) {
-		arm_mask_irq(i);
 		intrcnt[intrcnt_tab[i]]++;
 		event = intr_events[i];
-		res = mi_handle_intr(event, frame, intr_eoi_src, 
-				     intr_disab_eoi_src_stub, (void *)i);
+		res = mi_handle_intr(event, frame, intr_eoi_src_stub, 
+				     intr_disab_eoi_src, (void *)i);
 		switch (res) {
 		case 0:
 			break;
 		case ECHILD:
-			arm_unmask_irq(i);
 			break;
 		case EFAULT:
 			/* FALLTHROUGH */