diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-02-10 21:45:42 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-02-10 21:45:42 +0000 |
| commit | 09a2ff51b5828572f0e19cfdaa8b69cb6a6ff4c0 (patch) | |
| tree | a775b627eedd69dcfd6da75044448513d7cf793c /sys/dev/ic/wdc.c | |
| parent | bd5c3bbd6c5540e95267d39fc4ec4baaed36b9c1 (diff) | |
Fix LBA48 access for ServerWorks SATA.
ok grange@
Diffstat (limited to 'sys/dev/ic/wdc.c')
| -rw-r--r-- | sys/dev/ic/wdc.c | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c index 62599e113bf..4a19590d8f6 100644 --- a/sys/dev/ic/wdc.c +++ b/sys/dev/ic/wdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc.c,v 1.88 2005/11/09 19:05:48 uwe Exp $ */ +/* $OpenBSD: wdc.c,v 1.89 2006/02/10 21:45:41 kettenis Exp $ */ /* $NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */ @@ -140,6 +140,7 @@ int wdc_ata_present(struct channel_softc *, int); struct channel_softc_vtbl wdc_default_vtbl = { wdc_default_read_reg, wdc_default_write_reg, + wdc_default_lba48_write_reg, wdc_default_read_raw_multi_2, wdc_default_write_raw_multi_2, wdc_default_read_raw_multi_4, @@ -334,6 +335,16 @@ wdc_default_write_reg(chp, reg, val) reg & _WDC_REGMASK, val); } +void +wdc_default_lba48_write_reg(chp, reg, val) + struct channel_softc *chp; + enum wdc_regs reg; + u_int16_t val; +{ + /* All registers are two byte deep FIFOs. */ + CHP_WRITE_REG(chp, reg, val >> 8); + CHP_WRITE_REG(chp, reg, val); +} void wdc_default_read_raw_multi_2(chp, data, nbytes) @@ -1956,15 +1967,14 @@ wdccommandext(chp, drive, command, blkno, count) /* Select drive and LBA mode. */ CHP_WRITE_REG(chp, wdr_sdh, (drive << 4) | WDSD_LBA); - /* Load parameters. All registers are two byte deep FIFOs. */ - CHP_WRITE_REG(chp, wdr_lba_hi, blkno >> 40); - CHP_WRITE_REG(chp, wdr_lba_hi, blkno >> 16); - CHP_WRITE_REG(chp, wdr_lba_mi, blkno >> 32); - CHP_WRITE_REG(chp, wdr_lba_mi, blkno >> 8); - CHP_WRITE_REG(chp, wdr_lba_lo, blkno >> 24); - CHP_WRITE_REG(chp, wdr_lba_lo, blkno); - CHP_WRITE_REG(chp, wdr_seccnt, count >> 8); - CHP_WRITE_REG(chp, wdr_seccnt, count); + /* Load parameters. */ + CHP_LBA48_WRITE_REG(chp, wdr_lba_hi, + ((blkno >> 32) & 0xff00) | ((blkno >> 16) & 0xff)); + CHP_LBA48_WRITE_REG(chp, wdr_lba_mi, + ((blkno >> 24) & 0xff00) | ((blkno >> 8) & 0xff)); + CHP_LBA48_WRITE_REG(chp, wdr_lba_lo, + ((blkno >> 16) & 0xff00) | (blkno & 0xff)); + CHP_LBA48_WRITE_REG(chp, wdr_seccnt, count); /* Send command. */ CHP_WRITE_REG(chp, wdr_command, command); |