CVS commit: src/sys/dev/ic

[Jonathan A. Kollasch]

Module Name:    src
Committed By:   jakllsch
Date:           Sun Feb 10 19:20:20 UTC 2013

Modified Files:
        src/sys/dev/ic: mvsata.c

Log Message:
We can't (well, actually we can, but we still can't) assume that all
ata_bios are LBA.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/mvsata.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/ic/mvsata.c
diff -u src/sys/dev/ic/mvsata.c:1.25 src/sys/dev/ic/mvsata.c:1.26
--- src/sys/dev/ic/mvsata.c:1.25	Sun Feb  3 20:13:28 2013
+++ src/sys/dev/ic/mvsata.c	Sun Feb 10 19:20:19 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: mvsata.c,v 1.25 2013/02/03 20:13:28 jakllsch Exp $	*/
+/*	$NetBSD: mvsata.c,v 1.26 2013/02/10 19:20:19 jakllsch Exp $	*/
 /*
  * Copyright (c) 2008 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.25 2013/02/03 20:13:28 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.26 2013/02/10 19:20:19 jakllsch Exp $");
 
 #include "opt_mvsata.h"
 
@@ -3379,7 +3379,11 @@ mvsata_edma_setup_crqb(struct mvsata_por
 	    mvport->port_reqtbl[quetag].eprd_offset;
 	rw = (ata_bio->flags & ATA_READ) ? CRQB_CDIR_READ : CRQB_CDIR_WRITE;
 	cmd = (ata_bio->flags & ATA_READ) ? WDCC_READDMA : WDCC_WRITEDMA;
-	head = WDSD_LBA;
+	if (ata_bio->flags & (ATA_LBA|ATA_LBA48)) {
+		head = WDSD_LBA;
+	} else {
+		head = 0;
+	}
 	blkno = ata_bio->blkno;
 	if (ata_bio->flags & ATA_LBA48)
 		cmd = atacmd_to48(cmd);
@@ -3625,7 +3629,11 @@ mvsata_edma_setup_crqb_gen2e(struct mvsa
 	ctrlflg = (rw | CRQB_CDEVICEQUETAG(quetag) | CRQB_CPMPORT(drive) |
 	    CRQB_CPRDMODE_EPRD | CRQB_CHOSTQUETAG_GEN2(quetag));
 	cmd = (ata_bio->flags & ATA_READ) ? WDCC_READDMA : WDCC_WRITEDMA;
-	head = WDSD_LBA;
+	if (ata_bio->flags & (ATA_LBA|ATA_LBA48)) {
+		head = WDSD_LBA;
+	} else {
+		head = 0;
+	}
 	blkno = ata_bio->blkno;
 	if (ata_bio->flags & ATA_LBA48)
 		cmd = atacmd_to48(cmd);