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

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

details:   https://anonhg.NetBSD.org/src/rev/0582d376f15b
branches:  netbsd-2-0
changeset: 561167:0582d376f15b
user:      tron <tron%NetBSD.org@localhost>
date:      Sat May 29 14:05:54 2004 +0000

description:
Pull up revision 1.173 (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/ic/wdc.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r be8065fc061d -r 0582d376f15b sys/dev/ic/wdc.c
--- a/sys/dev/ic/wdc.c  Sat May 29 14:05:46 2004 +0000
+++ b/sys/dev/ic/wdc.c  Sat May 29 14:05:54 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc.c,v 1.172 2004/03/25 19:45:09 bouyer Exp $ */
+/*     $NetBSD: wdc.c,v 1.172.2.1 2004/05/29 14:05:54 tron Exp $ */
 
 /*
  * Copyright (c) 1998, 2001, 2003 Manuel Bouyer.  All rights reserved.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.172 2004/03/25 19:45:09 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.172.2.1 2004/05/29 14:05:54 tron Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
@@ -1699,6 +1699,7 @@
                /* enable interrupts */
                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_free_xfer(chp, xfer);
        if (wdc_c->flags & AT_WAIT)