[src/netbsd-3-0]: src/sys/dev/ata Pull up revision 1.359 (requested by bouyer...

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

details:   https://anonhg.NetBSD.org/src/rev/b5861ada1c03
branches:  netbsd-3-0
changeset: 579477:b5861ada1c03
user:      jdc <jdc%NetBSD.org@localhost>
date:      Tue Apr 08 21:35:31 2008 +0000

description:
Pull up revision 1.359 (requested by bouyer in ticket #1910).

The Hitachi HDP725025GLA380 returns "aborted command" instead of
"id not found" when hitting the LBA48 bug, so also install the
LBA48 bug workaround on "aborted command" errors.

diffstat:

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

diffs (27 lines):

diff -r 172e4731d0c0 -r b5861ada1c03 sys/dev/ata/wd.c
--- a/sys/dev/ata/wd.c  Wed Mar 26 19:03:46 2008 +0000
+++ b/sys/dev/ata/wd.c  Tue Apr 08 21:35:31 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wd.c,v 1.298.2.7.2.7 2007/10/15 21:54:31 riz Exp $ */
+/*     $NetBSD: wd.c,v 1.298.2.7.2.8 2008/04/08 21:35:31 jdc Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.298.2.7.2.7 2007/10/15 21:54:31 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.298.2.7.2.8 2008/04/08 21:35:31 jdc Exp $");
 
 #ifndef ATADEBUG
 #define ATADEBUG
@@ -780,7 +780,7 @@
                        goto noerror;
                errmsg = "error";
                do_perror = 1;
-               if (wd->sc_wdc_bio.r_error & WDCE_IDNF &&
+               if ((wd->sc_wdc_bio.r_error & (WDCE_IDNF | WDCE_ABRT)) &&
                    (wd->sc_quirks & WD_QUIRK_FORCE_LBA48) == 0) {
                        nblks = wd->sc_wdc_bio.bcount /
                            wd->sc_dk.dk_label->d_secsize;