[src/trunk]: src/sys/dev/ic We can't (well, actually we can, but we still can...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a518ae8683d9
branches:  trunk
changeset: 784822:a518ae8683d9
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sun Feb 10 19:20:19 2013 +0000

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

diffstat:

 sys/dev/ic/mvsata.c |  16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r 5382c3c8997e -r a518ae8683d9 sys/dev/ic/mvsata.c
--- a/sys/dev/ic/mvsata.c       Sun Feb 10 16:56:38 2013 +0000
+++ b/sys/dev/ic/mvsata.c       Sun Feb 10 19:20:19 2013 +0000
@@ -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 @@
            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 @@
        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);