PERFORCE change 110003 for review

[Matt Jacob]

http://perforce.freebsd.org/chv.cgi?CH=110003

Change 110003 by mjacob at newisp on 2006/11/15 05:17:26

	A slight bit more cleanup on printouts.

Affected files ...

.. //depot/projects/newisp/dev/isp/isp.c#33 edit
.. //depot/projects/newisp/dev/isp/isp_library.c#18 edit

Differences ...

==== //depot/projects/newisp/dev/isp/isp.c#33 (text+ko) ====

@@ -2231,9 +2231,8 @@
 	}
 	mbs.param[2] = portid >> 16;
 	mbs.param[3] = portid;
-
 	mbs.logval = MBLOGNONE;
-	mbs.timeout = 250000;
+	mbs.timeout = 500000;
 	isp_mboxcmd(isp, &mbs);
 
 	switch (mbs.param[0]) {
@@ -2286,6 +2285,7 @@
 		mbs.param[1] = handle << 8;
 	}
 	mbs.logval = MBLOGNONE;
+	mbs.timeout = 100000;
 	isp_mboxcmd(isp, &mbs);
 }
 
@@ -2314,6 +2314,7 @@
 	mbs.param[3] = DMA_WD0(fcp->isp_scdma);
 	mbs.param[6] = DMA_WD3(fcp->isp_scdma);
 	mbs.param[7] = DMA_WD2(fcp->isp_scdma);
+	mbs.timeout = 250000;
 	mbs.logval = MBLOGALL & ~MBOX_COMMAND_PARAM_ERROR;
 	if (dolock) {
 		FC_SCRATCH_ACQUIRE(isp);
@@ -2368,7 +2369,6 @@
 		}
 	}
 	mbs.logval = MBLOGALL & ~MBOX_COMMAND_PARAM_ERROR;
-	mbs.timeout = 30000;
 	isp_mboxcmd(isp, &mbs);
 	if (mbs.param[0] != MBOX_COMMAND_COMPLETE) {
 		return (wwn);
@@ -2928,7 +2928,13 @@
 		 * which shift on a loop.
 		 */
 		if (tmp.node_wwn == 0 || tmp.port_wwn == 0 || tmp.portid == 0) {
-			isp_prt(isp, ISP_LOGWARN, "bad pdb @ loop %d", handle);
+			int a, b, c;
+			a = (tmp.node_wwn == 0);
+			b = (tmp.port_wwn == 0);
+			c = (tmp.portid == 0);
+			isp_prt(isp, ISP_LOGWARN,
+			    "bad pdb (%1d%1d%1d) @ handle 0x%x", a, b, c,
+			    handle);
 			isp_dump_portdb(isp);
 			continue;
 		}
@@ -2980,7 +2986,7 @@
 				lp->new_roles = tmp.roles;
 				lp->state = FC_PORTDB_STATE_PENDING_VALID;
 				isp_prt(isp, ISP_LOGSANCFG,
-				    "Loop Port 0x%06x at 0x%x Pending Valid",
+				    "Loop Port 0x%02x at 0x%x Pending Valid",
 				    tmp.portid, tmp.handle);
 				break;
 			}
@@ -2996,7 +3002,7 @@
 			 * decide what to do.
 			 */
 			isp_prt(isp, ISP_LOGSANCFG,
-			    "Loop Port 0x%06x at 0x%x changed",
+			    "Loop Port 0x%02x at 0x%x changed",
 			    tmp.portid, tmp.handle);
 			lp->state = FC_PORTDB_STATE_CHANGED;
 			lp->new_portid = tmp.portid;
@@ -3035,7 +3041,7 @@
 		lp->port_wwn = tmp.port_wwn;
 		lp->node_wwn = tmp.node_wwn;
 		isp_prt(isp, ISP_LOGSANCFG,
-		    "Loop Port 0x%06x at 0x%x is New Entry",
+		    "Loop Port 0x%02x at 0x%x is New Entry",
 		    tmp.portid, tmp.handle);
 	}
 	fcp->isp_loopstate = LOOP_LSCAN_DONE;
@@ -6796,7 +6802,6 @@
 		MEMZERO(&mbs, sizeof (mbs));
 		mbs.param[0] = MBOX_GET_FW_STATE;
 		mbs.logval = MBLOGALL;
-		mbs.timeout = 100000;
 		isp_mboxcmd(isp, &mbs);
 		if (mbs.param[0] == MBOX_COMMAND_COMPLETE) {
 			fcp->isp_fwstate = mbs.param[1];

==== //depot/projects/newisp/dev/isp/isp_library.c#18 (text) ====

@@ -268,9 +268,9 @@
 		} else {
 			SNPRINTF(mb, sizeof (mb), "---");
 		}
-		isp_prt(isp, ISP_LOGALL, "%d: %s al%d tgt %s %s 0x%06x =>%s"
-		    " 0x%06x; WWNN 0x%08x%08x WWPN 0x%08x%08x", i,
-		    dbs[lp->state], lp->autologin, mb,
+		isp_prt(isp, ISP_LOGALL, "%d: hdl 0x%x %s al%d tgt %s %s "
+		    "0x%06x =>%s 0x%06x; WWNN 0x%08x%08x WWPN 0x%08x%08x", i,
+		    lp->handle, dbs[lp->state], lp->autologin, mb,
 		    roles[lp->roles], lp->portid,
 		    roles[lp->new_roles], lp->new_portid,
 		    (uint32_t) (lp->node_wwn >> 32),