[src/trunk]: src/sys/dev/ata Wait for DRDY after the PMP commands and don't w...

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

details:   https://anonhg.NetBSD.org/src/rev/f3ba786e6ca4
branches:  trunk
changeset: 786618:f3ba786e6ca4
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Fri May 03 20:02:08 2013 +0000

description:
Wait for DRDY after the PMP commands and don't wait before.
Should fix the worst part of PR kern/47793.

diffstat:

 sys/dev/ata/satapmp_subr.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r 387d6ac2c65e -r f3ba786e6ca4 sys/dev/ata/satapmp_subr.c
--- a/sys/dev/ata/satapmp_subr.c        Fri May 03 19:34:54 2013 +0000
+++ b/sys/dev/ata/satapmp_subr.c        Fri May 03 20:02:08 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: satapmp_subr.c,v 1.11 2013/04/17 12:22:43 jakllsch Exp $       */
+/*     $NetBSD: satapmp_subr.c,v 1.12 2013/05/03 20:02:08 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.11 2013/04/17 12:22:43 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: satapmp_subr.c,v 1.12 2013/05/03 20:02:08 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -66,8 +66,8 @@
        ata_c.r_features = reg;
        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.r_st_bmask = 0;
+       ata_c.r_st_pmask = WDCS_DRDY;
        ata_c.flags = AT_LBA48 | AT_READREG | AT_WAIT;
 
        if ((*atac->atac_bustype_ata->ata_exec_command)(drvp,
@@ -134,8 +134,8 @@
        ata_c.r_count = (((value >> 32) & 0xff) << 8) |
                        (((value >>  0) & 0xff) << 0);
        ata_c.timeout = 3000; /* 3s */
-       ata_c.r_st_bmask = WDCS_DRDY;
-       ata_c.r_st_pmask = 0;
+       ata_c.r_st_bmask = 0;
+       ata_c.r_st_pmask = WDCS_DRDY;
        ata_c.flags = AT_LBA48 | AT_WAIT;
 
        if ((*atac->atac_bustype_ata->ata_exec_command)(drvp,