From owner-p4-projects@FreeBSD.ORG  Wed Apr 21 13:49:48 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5E4AD1065670; Wed, 21 Apr 2010 13:49:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 22E53106566B
	for <perforce@freebsd.org>; Wed, 21 Apr 2010 13:49:48 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 115088FC16
	for <perforce@freebsd.org>; Wed, 21 Apr 2010 13:49:48 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3LDnlc4021520
	for <perforce@freebsd.org>; Wed, 21 Apr 2010 13:49:47 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3LDnl1k021518
	for perforce@freebsd.org; Wed, 21 Apr 2010 13:49:47 GMT
	(envelope-from mav@freebsd.org)
Date: Wed, 21 Apr 2010 13:49:47 GMT
Message-Id: <201004211349.o3LDnl1k021518@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 177177 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 21 Apr 2010 13:49:48 -0000

http://p4web.freebsd.org/@@177177?ac=10

Change 177177 by mav@mav_mavtest on 2010/04/21 13:49:12

	Arm timeout for PIO commands.
	Fix crash on stray interrupt.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#5 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#5 (text+ko) ====

@@ -306,7 +306,7 @@
 mvs_setup_interrupt(device_t dev)
 {
 	struct mvs_controller *ctlr = device_get_softc(dev);
-	int msi = 0;
+	int msi = 1;
 
 	/* Process hints. */
 	resource_int_value(device_get_name(dev),
@@ -352,7 +352,7 @@
 	u_int32_t ic, aic;
 
 	ic = ATA_INL(ctlr->r_mem, CHIP_MIC);
-//device_printf(ctlr->dev, "irq MIC:%08x\n", ic);
+device_printf(ctlr->dev, "irq MIC:%08x\n", ic);
 	if (ic & IC_ALL_PORTS_COAL_DONE)
 		ATA_OUTL(ctlr->r_mem, CHIP_MIC, ~IC_ALL_PORTS_COAL_DONE);
 	for (p = 0; p < ctlr->channels; p++) {
@@ -1106,7 +1106,7 @@
 	struct mvs_slot *slot = &ch->slot[0]; /* PIO is always in slot 0. */
 	union ccb *ccb = slot->ccb;
 	enum mvs_err_type et = MVS_ERR_NONE;
-	int port = ccb->ccb_h.target_id & 0x0f;
+	int port;
 	u_int length;
 	uint8_t status, ireason;
 
@@ -1115,9 +1115,10 @@
 //	device_printf(dev, "Legacy intr status %02x\n",
 //	    status);
 	if (slot->state < MVS_SLOT_RUNNING) {
-//	    device_printf(dev, "Stray irq\n");
+	    device_printf(dev, "Stray irq\n");
 	    return;
 	}
+	port = ccb->ccb_h.target_id & 0x0f;
 	/* Wait a bit for late !BUSY status update. */
 	if (status & ATA_S_BUSY) {
 		DELAY(100);
@@ -1582,6 +1583,9 @@
 			ch->fake_busy = 1;
 		DELAY(10);
 	}
+	/* Start command execution timeout */
+	callout_reset(&slot->timeout, (int)ccb->ccb_h.timeout * hz / 1000,
+	    (timeout_t*)mvs_timeout, slot);
 }
 
 /* Locked by busdma engine. */