[src/netbsd-6]: src/sys/dev/ic Pull up following revision(s) (requested by ma...

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

details:   https://anonhg.NetBSD.org/src/rev/ba243550f18c
branches:  netbsd-6
changeset: 775729:ba243550f18c
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Mar 14 21:52:10 2013 +0000

description:
Pull up following revision(s) (requested by martin in ticket #838):
        sys/dev/ic/isp.c: revision 1.123
Disable ICBOPT_FAST_POST for ISP 2100.
Fixes PR kern/47302. From Matthew Jacob.

diffstat:

 sys/dev/ic/isp.c |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 0db8c6f2a40c -r ba243550f18c sys/dev/ic/isp.c
--- a/sys/dev/ic/isp.c  Thu Mar 14 19:56:24 2013 +0000
+++ b/sys/dev/ic/isp.c  Thu Mar 14 21:52:10 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isp.c,v 1.122 2011/02/28 17:17:55 mjacob Exp $ */
+/* $NetBSD: isp.c,v 1.122.10.1 2013/03/14 21:52:10 riz Exp $ */
 /*
  * Machine and OS Independent (well, as best as possible)
  * code for the Qlogic ISP SCSI adapters.
@@ -43,7 +43,7 @@
  */
 #ifdef __NetBSD__
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.122 2011/02/28 17:17:55 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.122.10.1 2013/03/14 21:52:10 riz Exp $");
 #include <dev/ic/isp_netbsd.h>
 #endif
 #ifdef __FreeBSD__
@@ -1580,7 +1580,13 @@
         *
         * NB: for the 2300, ICBOPT_EXTENDED is required.
         */
-       if (IS_2200(isp) || IS_23XX(isp)) {
+       if (IS_2100(isp)) {
+               /*
+                * We can't have Fast Posting any more- we now
+                * have 32 bit handles.
+                */
+               icbp->icb_fwoptions &= ~ICBOPT_FAST_POST;
+       } else if (IS_2200(isp) || IS_23XX(isp)) {
                icbp->icb_fwoptions |= ICBOPT_EXTENDED;
                /*
                 * Prefer or force Point-To-Point instead Loop?