[src/trunk]: src/sys/dev/ata Correctly issue port multiplier register access ...

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

details:   https://anonhg.NetBSD.org/src/rev/5315b76f2c79
branches:  trunk
changeset: 780402:5315b76f2c79
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sun Jul 22 18:12:01 2012 +0000

description:
Correctly issue port multiplier register access commands as LBA48 now that the
FIS code doesn't get in the way of doing that.

diffstat:

 sys/dev/ata/satapmp_subr.c |  15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diffs (57 lines):

diff -r 2f7af663e748 -r 5315b76f2c79 sys/dev/ata/satapmp_subr.c
--- a/sys/dev/ata/satapmp_subr.c        Sun Jul 22 18:09:16 2012 +0000
+++ b/sys/dev/ata/satapmp_subr.c        Sun Jul 22 18:12:01 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: satapmp_subr.c,v 1.3 2012/07/22 18:03:34 jakllsch Exp $        */
+/*     $NetBSD: satapmp_subr.c,v 1.4 2012/07/22 18:12:01 jakllsch Exp $        */
 
 /*
  * Copyright (c) 2012 Manuel Bouyer.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: satapmp_subr.c,v 1.3 2012/07/22 18:03:34 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: satapmp_subr.c,v 1.4 2012/07/22 18:12:01 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -64,11 +64,11 @@
 
        ata_c.r_command = PMPC_READ_PORT;
        ata_c.r_features = reg;
-       ata_c.r_lba = (port & 0xf) << 24;
+       ata_c.r_device = port;
        ata_c.timeout = 3000; /* 3s */
        ata_c.r_st_bmask = WDCS_DRDY;
        ata_c.r_st_pmask = 0;
-       ata_c.flags = AT_READREG | AT_WAIT;
+       ata_c.flags = AT_LBA48 | AT_READREG | AT_WAIT;
 
        if ((*atac->atac_bustype_ata->ata_exec_command)(drvp,
            &ata_c) != ATACMD_COMPLETE) {
@@ -92,7 +92,6 @@
        return 0;
 }
 
-static int satapmp_write(struct ata_channel *chp, int, int, uint32_t) __unused;
 static int
 satapmp_write(struct ata_channel *chp, int port, int reg, uint32_t value)
 {
@@ -110,13 +109,13 @@
 
        ata_c.r_command = PMPC_WRITE_PORT;
        ata_c.r_features = reg;
-       ata_c.r_lba = (port & 0xf) << 24;
-       ata_c.r_lba |= (value & 0xffffff00) >> 8;
+       ata_c.r_device = port;
+       ata_c.r_lba = (value & 0xffffff00) >> 8;
        ata_c.r_count = value & 0xff;
        ata_c.timeout = 3000; /* 3s */
        ata_c.r_st_bmask = WDCS_DRDY;
        ata_c.r_st_pmask = 0;
-       ata_c.flags = AT_WAIT;
+       ata_c.flags = AT_LBA48 | AT_WAIT;
 
        if ((*atac->atac_bustype_ata->ata_exec_command)(drvp,
            &ata_c) != ATACMD_COMPLETE) {