[src/netbsd-1-6]: src/sys/dev/i2o Pull up revision 1.27 (requested by ad in t...

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

details:   https://anonhg.NetBSD.org/src/rev/e1d1eb25d8b2
branches:  netbsd-1-6
changeset: 529187:e1d1eb25d8b2
user:      lukem <lukem%NetBSD.org@localhost>
date:      Wed Oct 23 12:22:35 2002 +0000

description:
Pull up revision 1.27 (requested by ad in ticket #939):
PR 18760: don't issue I2O_EXEC_IOP_CLEAR to AMI boards, since some
firmware revisions can't handle it.

diffstat:

 sys/dev/i2o/iop.c |  16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 7f353b5f1d9d -r e1d1eb25d8b2 sys/dev/i2o/iop.c
--- a/sys/dev/i2o/iop.c Wed Oct 23 12:21:24 2002 +0000
+++ b/sys/dev/i2o/iop.c Wed Oct 23 12:22:35 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iop.c,v 1.24 2002/04/05 18:27:48 bouyer Exp $  */
+/*     $NetBSD: iop.c,v 1.24.4.1 2002/10/23 12:22:35 lukem Exp $       */
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.24 2002/04/05 18:27:48 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.24.4.1 2002/10/23 12:22:35 lukem Exp $");
 
 #include "opt_i2o.h"
 #include "iop.h"
@@ -895,10 +895,18 @@
                        continue;
                if ((sc->sc_flags & IOP_ONLINE) == 0)
                        continue;
+
                iop_simple_cmd(sc, I2O_TID_IOP, I2O_EXEC_SYS_QUIESCE, IOP_ICTX,
                    0, 5000);
-               iop_simple_cmd(sc, I2O_TID_IOP, I2O_EXEC_IOP_CLEAR, IOP_ICTX,
-                   0, 1000);
+
+               if (le16toh(sc->sc_status.orgid) != I2O_ORG_AMI) {
+                       /*
+                        * Some AMI firmware revisions will go to sleep and
+                        * never come back after this.
+                        */
+                       iop_simple_cmd(sc, I2O_TID_IOP, I2O_EXEC_IOP_CLEAR,
+                           IOP_ICTX, 0, 1000);
+               }
        }
 
        /* Wait.  Some boards could still be flushing, stupidly enough. */