Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update from mainline: add ISP_NO_ZIO option. constify a few items.

Browse Source 
LINT/ProPolice fixes from OpenBSD.

In isp_reinit, clear the port database.
This commit is contained in:
mjacob 2003-08-07 01:08:10 +00:00
parent 543f393343
commit 03782491e6
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/dev/ic/isp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isp.c,v 1.102 2003/05/03 18:11:19 wiz Exp $ */ /* $NetBSD: isp.c,v 1.103 2003/08/07 01:08:10 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.102 2003/05/03 18:11:19 wiz Exp $"); __KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.103 2003/08/07 01:08:10 mjacob Exp $");
#ifdef __NetBSD__ #ifdef __NetBSD__
#include <dev/ic/isp_netbsd.h> #include <dev/ic/isp_netbsd.h>
@ -1315,7 +1315,11 @@ isp_fibre_init(struct ispsoftc *isp)
* If we set ZIO, it will disable fast posting, * If we set ZIO, it will disable fast posting,
* so we don't need to clear it in fwoptions. * so we don't need to clear it in fwoptions.
*/ */
#ifndef ISP_NO_ZIO
icbp->icb_xfwoptions |= ICBXOPT_ZIO; icbp->icb_xfwoptions |= ICBXOPT_ZIO;
#else
icbp->icb_fwoptions |= ICBOPT_FAST_POST;
#endif
#if 0 #if 0
/* /*
* Values, in 100us increments. The default * Values, in 100us increments. The default
@ -4808,7 +4812,7 @@ isp_mbox_continue(struct ispsoftc *isp)
#define HIBYT(x) ((x) >> 0x8) #define HIBYT(x) ((x) >> 0x8)
#define LOBYT(x) ((x) & 0xff) #define LOBYT(x) ((x) & 0xff)
#define ISPOPMAP(a, b) (((a) << 8) | (b)) #define ISPOPMAP(a, b) (((a) << 8) | (b))
static u_int16_t mbpscsi[] = { static const u_int16_t mbpscsi[] = {
ISPOPMAP(0x01, 0x01), /* 0x00: MBOX_NO_OP */ ISPOPMAP(0x01, 0x01), /* 0x00: MBOX_NO_OP */
ISPOPMAP(0x1f, 0x01), /* 0x01: MBOX_LOAD_RAM */ ISPOPMAP(0x1f, 0x01), /* 0x01: MBOX_LOAD_RAM */
ISPOPMAP(0x03, 0x01), /* 0x02: MBOX_EXEC_FIRMWARE */ ISPOPMAP(0x03, 0x01), /* 0x02: MBOX_EXEC_FIRMWARE */
@ -5004,7 +5008,7 @@ static char *scsi_mbcmd_names[] = {
}; };
#endif #endif
static u_int16_t mbpfc[] = { static const u_int16_t mbpfc[] = {
ISPOPMAP(0x01, 0x01), /* 0x00: MBOX_NO_OP */ ISPOPMAP(0x01, 0x01), /* 0x00: MBOX_NO_OP */
ISPOPMAP(0x1f, 0x01), /* 0x01: MBOX_LOAD_RAM */ ISPOPMAP(0x1f, 0x01), /* 0x01: MBOX_LOAD_RAM */
ISPOPMAP(0x03, 0x01), /* 0x02: MBOX_EXEC_FIRMWARE */ ISPOPMAP(0x03, 0x01), /* 0x02: MBOX_EXEC_FIRMWARE */
@ -5276,15 +5280,13 @@ static char *fc_mbcmd_names[] = {
static void static void
isp_mboxcmd_qnw(struct ispsoftc *isp, mbreg_t *mbp, int nodelay) isp_mboxcmd_qnw(struct ispsoftc *isp, mbreg_t *mbp, int nodelay)
{ {
unsigned int lim, ibits, obits, box, opcode; unsigned int ibits, obits, box, opcode;
u_int16_t *mcp; const u_int16_t *mcp;
if (IS_FC(isp)) { if (IS_FC(isp)) {
mcp = mbpfc; mcp = mbpfc;
lim = (sizeof (mbpfc) / sizeof (mbpfc[0]));
} else { } else {
mcp = mbpscsi; mcp = mbpscsi;
lim = (sizeof (mbpscsi) / sizeof (mbpscsi[0]));
} }
opcode = mbp->param[0]; opcode = mbp->param[0];
ibits = HIBYT(mcp[opcode]) & NMBOX_BMASK(isp); ibits = HIBYT(mcp[opcode]) & NMBOX_BMASK(isp);
@ -5318,7 +5320,7 @@ isp_mboxcmd(struct ispsoftc *isp, mbreg_t *mbp, int logmask)
{ {
char *cname, *xname, tname[16], mname[16]; char *cname, *xname, tname[16], mname[16];
unsigned int lim, ibits, obits, box, opcode; unsigned int lim, ibits, obits, box, opcode;
u_int16_t *mcp; const u_int16_t *mcp;
if (IS_FC(isp)) { if (IS_FC(isp)) {
mcp = mbpfc; mcp = mbpfc;
@ -5842,6 +5844,9 @@ isp_reinit(struct ispsoftc *isp)
XS_T *xs; XS_T *xs;
u_int16_t handle; u_int16_t handle;
if (IS_FC(isp)) {
isp_mark_getpdb_all(isp);
}
isp_reset(isp); isp_reset(isp);
if (isp->isp_state != ISP_RESETSTATE) { if (isp->isp_state != ISP_RESETSTATE) {
isp_prt(isp, ISP_LOGERR, "isp_reinit cannot reset card"); isp_prt(isp, ISP_LOGERR, "isp_reinit cannot reset card");