From owner-p4-projects@FreeBSD.ORG  Tue Dec 19 06:43:42 2006
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 2D06216A4AB; Tue, 19 Dec 2006 06:43:42 +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 B9BC916A494
	for <perforce@freebsd.org>; Tue, 19 Dec 2006 06:43:41 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2DFF043CA4
	for <perforce@freebsd.org>; Tue, 19 Dec 2006 06:43:41 +0000 (GMT)
	(envelope-from mjacob@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 kBJ6hbN2045352
	for <perforce@freebsd.org>; Tue, 19 Dec 2006 06:43:37 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ6hbhF045347
	for perforce@freebsd.org; Tue, 19 Dec 2006 06:43:37 GMT
	(envelope-from mjacob@freebsd.org)
Date: Tue, 19 Dec 2006 06:43:37 GMT
Message-Id: <200612190643.kBJ6hbhF045347@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111924 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, 19 Dec 2006 06:43:42 -0000

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

Change 111924 by mjacob@mjexp on 2006/12/19 06:43:17

	Hmm. If we find RISC paused in a 23XX interrupt, clear interrupt
	enables. The one or two times I've ever seen this, we got
	completely stuck on it.

Affected files ...

.. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#5 edit

Differences ...

==== //depot/projects/mjexp/sys/dev/isp/isp_pci.c#5 (text+ko) ====

@@ -1372,8 +1372,9 @@
 		if (hccr & HCCR_PAUSE) {
 			ISP_WRITE(isp, HCCR, HCCR_RESET);
 			isp_prt(isp, ISP_LOGERR,
-			    "RISC paused at interrupt (%x->%x\n", hccr,
+			    "RISC paused at interrupt (%x->%x)", hccr,
 			    ISP_READ(isp, HCCR));
+			ISP_WRITE(isp, BIU_ICR, 0);
 		} else {
 			isp_prt(isp, ISP_LOGERR, "unknown interrupt 0x%x\n",
 			    r2hisr);