From owner-p4-projects@FreeBSD.ORG  Fri Nov 14 11:10:56 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5226116A4D0; Fri, 14 Nov 2003 11:10:56 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2BE1816A4CE
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 11:10:56 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A0B3943FAF
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 11:10:55 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAEJAtXJ060046
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 11:10:55 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAEJAtIt060043
	for perforce@freebsd.org; Fri, 14 Nov 2003 11:10:55 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Fri, 14 Nov 2003 11:10:55 -0800 (PST)
Message-Id: <200311141910.hAEJAtIt060043@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 42358 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 14 Nov 2003 19:10:56 -0000

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

Change 42358 by peter@peter_daintree on 2003/11/14 11:10:16

	re-add spurious interrupt detection

Affected files ...

.. //depot/projects/hammer/sys/amd64/isa/atpic.c#20 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/isa/atpic.c#20 (text+ko) ====

@@ -304,6 +304,22 @@
 
 	KASSERT(vec < ICU_LEN, ("unknown int %d\n", vec));
 	isrc = &atintrs[vec].at_intsrc;
+	if (vec == 7 || vec == 15) {
+		int port, isr;
+
+		/*
+		 * Read the ISR register to see if IRQ 7/15 is really
+		 * pending.  Reset read register back to IRR when done.
+		 */
+		port = ((struct atpic *)isrc->is_pic)->at_ioaddr;
+		mtx_lock_spin(&icu_lock);
+		outb(port, OCW3_SEL | OCW3_RR | OCW3_RIS);
+		isr = inb(port);
+		outb(port, OCW3_SEL | OCW3_RR);
+		mtx_unlock_spin(&icu_lock);
+		if ((isr & IRQ7) == 0)
+			return;
+	}
 	intr_execute_handlers(isrc, &iframe);
 }