From owner-p4-projects@FreeBSD.ORG  Fri Jun  1 22:10:19 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 0624116A478; Fri,  1 Jun 2007 22:10:19 +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 BFE0C16A475
	for <perforce@freebsd.org>; Fri,  1 Jun 2007 22:10:18 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id AF92B13C447
	for <perforce@freebsd.org>; Fri,  1 Jun 2007 22:10:18 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l51MAI0x065773
	for <perforce@freebsd.org>; Fri, 1 Jun 2007 22:10:18 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l51MAIGW065769
	for perforce@freebsd.org; Fri, 1 Jun 2007 22:10:18 GMT
	(envelope-from piso@freebsd.org)
Date: Fri, 1 Jun 2007 22:10:18 GMT
Message-Id: <200706012210.l51MAIGW065769@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 120736 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: Fri, 01 Jun 2007 22:10:19 -0000

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

Change 120736 by piso@piso_newluxor on 2007/06/01 22:09:18

	Clear the interrupt in case a filter is run, or do that after the
	ithread ran.

Affected files ...

.. //depot/projects/soc2006/intr_filter/sparc64/fhc/fhc.c#10 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/sparc64/fhc/fhc.c#10 (text+ko) ====

@@ -398,13 +398,13 @@
 	struct fhc_clr *fc = arg;
 	int res;
 
-	if (fc->fc_filter != NULL)
+	if (fc->fc_filter != NULL) {
 		res = fc->fc_filter(fc->fc_arg);
-	else 
-		res = FILTER_HANDLED | FILTER_SCHEDULE_THREAD;
+		bus_space_write_4(fc->fc_bt, fc->fc_bh, FHC_ICLR, 0x0);
+		bus_space_read_4(fc->fc_bt, fc->fc_bh, FHC_ICLR);
+	} else 
+		res = FILTER_SCHEDULE_THREAD;
 
-	bus_space_write_4(fc->fc_bt, fc->fc_bh, FHC_ICLR, 0x0);
-	bus_space_read_4(fc->fc_bt, fc->fc_bh, FHC_ICLR);
 	return (res);
 }
 
@@ -414,6 +414,10 @@
 	struct fhc_clr *fc = arg;
 
 	fc->fc_func(fc->fc_arg);
+	if (fc->fc_filter == NULL) {
+		bus_space_write_4(fc->fc_bt, fc->fc_bh, FHC_ICLR, 0x0);
+		bus_space_read_4(fc->fc_bt, fc->fc_bh, FHC_ICLR);
+	}
 }
 
 static struct resource *