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

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

details:   https://anonhg.NetBSD.org/src/rev/eef7ca349df7
branches:  netbsd-2-0
changeset: 561168:eef7ca349df7
user:      tron <tron%NetBSD.org@localhost>
date:      Sat May 29 14:06:01 2004 +0000

description:
Pull up revision 1.54 (requested by bouyer in ticket #396):
Add a delay(10) after re-enabling interrupts in the control register.
Some controllers/drives (e.g. SataLink 3114 with WD Raptor) require
it. Should fix kern/23808 by Chris Gilbert, patch suplied by Chris Gilbert
on tech-kern, extended to all places enabling interrupts by me.

diffstat:

 sys/dev/ata/ata_wdc.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 0582d376f15b -r eef7ca349df7 sys/dev/ata/ata_wdc.c
--- a/sys/dev/ata/ata_wdc.c     Sat May 29 14:05:54 2004 +0000
+++ b/sys/dev/ata/ata_wdc.c     Sat May 29 14:06:01 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ata_wdc.c,v 1.53 2004/03/02 13:13:57 fvdl Exp $        */
+/*     $NetBSD: ata_wdc.c,v 1.53.2.1 2004/05/29 14:06:01 tron Exp $    */
 
 /*
  * Copyright (c) 1998, 2001, 2003 Manuel Bouyer.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.53 2004/03/02 13:13:57 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.53.2.1 2004/05/29 14:06:01 tron Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
@@ -303,6 +303,7 @@
                 */
                bus_space_write_1(chp->ctl_iot, chp->ctl_ioh, wd_aux_ctlr,
                    WDCTL_4BIT);
+               delay(10); /* some drives need a little delay here */
        }
 
        _wdc_ata_bio_start(chp, xfer);