From owner-p4-projects@FreeBSD.ORG  Tue Apr 27 12:20:17 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A5D6C1065672; Tue, 27 Apr 2010 12:20:17 +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 6AD80106566B
	for <perforce@freebsd.org>; Tue, 27 Apr 2010 12:20:17 +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 59B138FC15
	for <perforce@freebsd.org>; Tue, 27 Apr 2010 12:20:17 +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 o3RCKHW1006453
	for <perforce@freebsd.org>; Tue, 27 Apr 2010 12:20:17 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3RCKHth006451
	for perforce@freebsd.org; Tue, 27 Apr 2010 12:20:17 GMT
	(envelope-from mav@freebsd.org)
Date: Tue, 27 Apr 2010 12:20:17 GMT
Message-Id: <201004271220.o3RCKHth006451@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 177397 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: Tue, 27 Apr 2010 12:20:17 -0000

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

Change 177397 by mav@mav_mavtest on 2010/04/27 12:20:15

	Make sure EDMA disabled for ATAPI DMA commands.

Affected files ...

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

Differences ...

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

@@ -1111,6 +1111,7 @@
 			mvs_set_edma_mode(dev, MVS_EDMA_ON);
 		} else {
 			ch->numpslots++;
+			mvs_set_edma_mode(dev, MVS_EDMA_OFF);
 		}
 		if (ccb->ataio.cmd.flags &
 		    (CAM_ATAIO_CONTROL | CAM_ATAIO_NEEDRESULT)) {
@@ -1129,9 +1130,11 @@
 		     cdb[0] == 0x88 ||
 		     cdb[0] == 0x8a ||
 		     cdb[0] == 0xa8 ||
-		     cdb[0] == 0xaa)) {
+		     cdb[0] == 0xaa ||
+		     cdb[0] == 0xbe)) {
 			ch->basic_dma = 1;
 		}
+		mvs_set_edma_mode(dev, MVS_EDMA_OFF);
 	}
 	if (ch->numpslots == 0 || ch->basic_dma) {
 		void *buf;
@@ -1147,10 +1150,8 @@
 		}
 		bus_dmamap_load(ch->dma.data_tag, slot->dma.data_map,
 		    buf, size, mvs_dmasetprd, slot, 0);
-	} else {
-		mvs_set_edma_mode(dev, MVS_EDMA_OFF);
+	} else
 		mvs_legacy_execute_transaction(slot);
-	}
 }
 
 /* Locked by busdma engine. */