diff options
| author | jakllsch <jakllsch@NetBSD.org> | 2013-02-10 19:20:19 +0000 |
|---|---|---|
| committer | jakllsch <jakllsch@NetBSD.org> | 2013-02-10 19:20:19 +0000 |
| commit | 5cff5ae1967aa00adcb794429682cef554a747c8 (patch) | |
| tree | 452a9fa289aa4847a625dfda5d0b746368f2007a /sys/dev | |
| parent | 722fa22ce449de6c4e3deb9a96fedca1fd3b74eb (diff) | |
We can't (well, actually we can, but we still can't) assume that all
ata_bios are LBA.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/mvsata.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sys/dev/ic/mvsata.c b/sys/dev/ic/mvsata.c index 49fd3e56d02..350c8ee56b4 100644 --- a/sys/dev/ic/mvsata.c +++ b/sys/dev/ic/mvsata.c @@ -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_port *mvport, int erqqip, int quetag, 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 mvsata_port *mvport, int erqqip, int quetag, 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); |
