Number of luns supported for SCC-2 is actually really 16384- top

3 bits are lun address modifiers.

Remove code that (incorrectly) thought it was asking the f/w to only
PLOGI if not already PLOGI'd. The current f/w documentation tells us
that we have this backwards.
This commit is contained in:
mjacob 2002-04-20 05:05:56 +00:00
parent 377968bc08
commit acfd588eca
1 changed files with 4 additions and 8 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: isp.c,v 1.92 2002/04/11 02:32:03 mjacob Exp $ */ /* $NetBSD: isp.c,v 1.93 2002/04/20 05:05:56 mjacob Exp $ */
/* /*
* This driver, which is contained in NetBSD in the files: * This driver, which is contained in NetBSD in the files:
* *
@ -68,7 +68,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.92 2002/04/11 02:32:03 mjacob Exp $"); __KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.93 2002/04/20 05:05:56 mjacob Exp $");
#ifdef __NetBSD__ #ifdef __NetBSD__
#include <dev/ic/isp_netbsd.h> #include <dev/ic/isp_netbsd.h>
@ -804,7 +804,7 @@ again:
* of knowing how many luns we support. * of knowing how many luns we support.
* *
* Expanded lun firmware gives you 32 luns for SCSI cards and * Expanded lun firmware gives you 32 luns for SCSI cards and
* 65536 luns for Fibre Channel cards. * 16384 luns for Fibre Channel cards.
* *
* It turns out that even for QLogic 2100s with ROM 1.10 and above * It turns out that even for QLogic 2100s with ROM 1.10 and above
* we do get a firmware attributes word returned in mailbox register 6. * we do get a firmware attributes word returned in mailbox register 6.
@ -827,7 +827,7 @@ again:
} }
} else { } else {
if (FCPARAM(isp)->isp_fwattr & ISP_FW_ATTR_SCCLUN) { if (FCPARAM(isp)->isp_fwattr & ISP_FW_ATTR_SCCLUN) {
isp->isp_maxluns = 65536; isp->isp_maxluns = 16384;
} else { } else {
isp->isp_maxluns = 16; isp->isp_maxluns = 16;
} }
@ -1923,10 +1923,6 @@ isp_pdb_sync(struct ispsoftc *isp)
mbs.param[1] = loopid << 8; mbs.param[1] = loopid << 8;
mbs.param[2] = portid >> 16; mbs.param[2] = portid >> 16;
mbs.param[3] = portid & 0xffff; mbs.param[3] = portid & 0xffff;
if (IS_2200(isp) || IS_23XX(isp)) {
/* only issue a PLOGI if not logged in */
mbs.param[1] |= 0x1;
}
isp_mboxcmd(isp, &mbs, MBLOGALL & ~(MBOX_LOOP_ID_USED | isp_mboxcmd(isp, &mbs, MBLOGALL & ~(MBOX_LOOP_ID_USED |
MBOX_PORT_ID_USED | MBOX_COMMAND_ERROR)); MBOX_PORT_ID_USED | MBOX_COMMAND_ERROR));
if (fcp->isp_fwstate != FW_READY || if (fcp->isp_fwstate != FW_READY ||