Update OpenBSD with respect to Solaris/FreeBSD/NetBSD/Linux versions.

Major rewrite of a lot of internals- far too many to list. Cleaner
locking, more paramaterization, an isp_prt logging function that
handles debugging as well as error printouts. We also should no
longer hang if there is no Loop for Fibre Channel when booting.

The file ispvar.h now contains a list of all platform required macros
and explanation as to what they're for. This should make maintenance
easier.

1 files changed, 54 insertions, 126 deletions

diff --git a/sys/dev/ic/isp_inline.h b/sys/dev/ic/isp_inline.h
index 08dbbbbfc4b..00eea381150 100644
--- a/sys/dev/ic/isp_inline.h
+++ b/sys/dev/ic/isp_inline.h
@@ -1,13 +1,11 @@
-/*	$OpenBSD: isp_inline.h,v 1.4 2000/07/06 05:31:48 mjacob Exp $ */
+/*	$OpenBSD: isp_inline.h,v 1.5 2000/10/16 01:01:59 mjacob Exp $ */
 /*
- * Qlogic Inline Functions
+ * Qlogic Host Adapter Inline Functions
  *
- *---------------------------------------
- * Copyright (c) 1999 by Matthew Jacob
+ * Copyright (c) 1999, 2000 by Matthew Jacob
  * Feral Software
  * All rights reserved.
  * mjacob@feral.com
- *---------------------------------------
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,10 +13,7 @@
  * 1. Redistributions of source code must retain the above copyright
  *    notice immediately at the beginning of the file, without modification,
  *    this list of conditions, and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
+ * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
@@ -37,109 +32,6 @@
 #ifndef	_ISP_INLINE_H
 #define	_ISP_INLINE_H
 
-static INLINE void isp_prtstst __P((ispstatusreq_t *));
-static INLINE char *isp2100_fw_statename __P((int));
-static INLINE char *isp2100_pdb_statename __P((int));
-
-
-static INLINE void
-isp_prtstst(sp)
-	ispstatusreq_t *sp;
-{
-	char buf[172];
-	buf[0] = 0;
-	STRNCAT(buf, "states=>", sizeof buf);
-	if (sp->req_state_flags & RQSF_GOT_BUS) {
-		STRNCAT(buf, " GOT_BUS", sizeof buf);
-	}
-	if (sp->req_state_flags & RQSF_GOT_TARGET) {
-		STRNCAT(buf, " GOT_TGT", sizeof buf);
-	}
-	if (sp->req_state_flags & RQSF_SENT_CDB) {
-		STRNCAT(buf, " SENT_CDB", sizeof buf);
-	}
-	if (sp->req_state_flags & RQSF_XFRD_DATA) {
-		STRNCAT(buf, " XFRD_DATA", sizeof buf);
-	}
-	if (sp->req_state_flags & RQSF_GOT_STATUS) {
-		STRNCAT(buf, " GOT_STS", sizeof buf);
-	}
-	if (sp->req_state_flags & RQSF_GOT_SENSE) {
-		STRNCAT(buf, " GOT_SNS", sizeof buf);
-	}
-	if (sp->req_state_flags & RQSF_XFER_COMPLETE) {
-		STRNCAT(buf, " XFR_CMPLT", sizeof buf);
-	}
-	STRNCAT(buf, "\nstatus=>", sizeof buf);
-	if (sp->req_status_flags & RQSTF_DISCONNECT) {
-		STRNCAT(buf, " Disconnect", sizeof buf);
-	}
-	if (sp->req_status_flags & RQSTF_SYNCHRONOUS) {
-		STRNCAT(buf, " Sync_xfr", sizeof buf);
-	}
-	if (sp->req_status_flags & RQSTF_PARITY_ERROR) {
-		STRNCAT(buf, " Parity", sizeof buf);
-	}
-	if (sp->req_status_flags & RQSTF_BUS_RESET) {
-		STRNCAT(buf, " Bus_Reset", sizeof buf);
-	}
-	if (sp->req_status_flags & RQSTF_DEVICE_RESET) {
-		STRNCAT(buf, " Device_Reset", sizeof buf);
-	}
-	if (sp->req_status_flags & RQSTF_ABORTED) {
-		STRNCAT(buf, " Aborted", sizeof buf);
-	}
-	if (sp->req_status_flags & RQSTF_TIMEOUT) {
-		STRNCAT(buf, " Timeout", sizeof buf);
-	}
-	if (sp->req_status_flags & RQSTF_NEGOTIATION) {
-		STRNCAT(buf, " Negotiation", sizeof buf);
-	}
-	PRINTF(buf, "%s\n", buf);
-}
-
-static INLINE char *
-isp2100_fw_statename(state)
-	int state;
-{
-	static char buf[16];
-	switch(state) {
-	case FW_CONFIG_WAIT:	return "Config Wait";
-	case FW_WAIT_AL_PA:	return "Waiting for AL_PA";
-	case FW_WAIT_LOGIN:	return "Wait Login";
-	case FW_READY:		return "Ready";
-	case FW_LOSS_OF_SYNC:	return "Loss Of Sync";
-	case FW_ERROR:		return "Error";
-	case FW_REINIT:		return "Re-Init";
-	case FW_NON_PART:	return "Nonparticipating";
-	default:
-		sprintf(buf, "0x%x", state);
-		return buf;
-	}
-}
-
-static INLINE char *isp2100_pdb_statename(int pdb_state)
-{
-	static char buf[16];
-	switch(pdb_state) {
-	case PDB_STATE_DISCOVERY:	return "Port Discovery";
-	case PDB_STATE_WDISC_ACK:	return "Waiting Port Discovery ACK";
-	case PDB_STATE_PLOGI:		return "Port Login";
-	case PDB_STATE_PLOGI_ACK:	return "Wait Port Login ACK";
-	case PDB_STATE_PRLI:		return "Process Login";
-	case PDB_STATE_PRLI_ACK:	return "Wait Process Login ACK";
-	case PDB_STATE_LOGGED_IN:	return "Logged In";
-	case PDB_STATE_PORT_UNAVAIL:	return "Port Unavailable";
-	case PDB_STATE_PRLO:		return "Process Logout";
-	case PDB_STATE_PRLO_ACK:	return "Wait Process Logout ACK";
-	case PDB_STATE_PLOGO:		return "Port Logout";
-	case PDB_STATE_PLOG_ACK:	return "Wait Port Logout ACK";
-	default:
-		sprintf(buf, "0x%x", pdb_state);
-		return buf;
-	}
-}
-
 /*
  * Handle Functions.
  * For each outstanding command there will be a non-zero handle.
@@ -148,13 +40,13 @@ static INLINE char *isp2100_pdb_statename(int pdb_state)
  */
 
 static INLINE int
-isp_save_xs __P((struct ispsoftc *, ISP_SCSI_XFER_T *, u_int32_t *));
+isp_save_xs __P((struct ispsoftc *, XS_T *, u_int32_t *));
 
-static INLINE ISP_SCSI_XFER_T *
+static INLINE XS_T *
 isp_find_xs __P((struct ispsoftc *, u_int32_t));
 
 static INLINE u_int32_t
-isp_find_handle __P((struct ispsoftc *, ISP_SCSI_XFER_T *));
+isp_find_handle __P((struct ispsoftc *, XS_T *));
 
 static INLINE int
 isp_handle_index __P((u_int32_t));
@@ -163,12 +55,12 @@ static INLINE void
 isp_destroy_handle __P((struct ispsoftc *, u_int32_t));
 
 static INLINE void
-isp_remove_handle __P((struct ispsoftc *, ISP_SCSI_XFER_T *));
+isp_remove_handle __P((struct ispsoftc *, XS_T *));
 
 static INLINE int
 isp_save_xs(isp, xs, handlep)
 	struct ispsoftc *isp;
-	ISP_SCSI_XFER_T *xs;
+	XS_T *xs;
 	u_int32_t *handlep;
 {
 	int i, j;
@@ -188,11 +80,11 @@ isp_save_xs(isp, xs, handlep)
 	*handlep = j+1;
 	if (++j == isp->isp_maxcmds)
 		j = 0;
-	isp->isp_lasthdls = j;
+	isp->isp_lasthdls = (u_int16_t)j;
 	return (0);
 }
 
-static INLINE ISP_SCSI_XFER_T *
+static INLINE XS_T *
 isp_find_xs(isp, handle)
 	struct ispsoftc *isp;
 	u_int32_t handle;
@@ -207,7 +99,7 @@ isp_find_xs(isp, handle)
 static INLINE u_int32_t
 isp_find_handle(isp, xs)
 	struct ispsoftc *isp;
-	ISP_SCSI_XFER_T *xs;
+	XS_T *xs;
 {
 	int i;
 	if (xs != NULL) {
@@ -240,7 +132,7 @@ isp_destroy_handle(isp, handle)
 static INLINE void
 isp_remove_handle(isp, xs)
 	struct ispsoftc *isp;
-	ISP_SCSI_XFER_T *xs;
+	XS_T *xs;
 {
 	isp_destroy_handle(isp, isp_find_handle(isp, xs));
 }
@@ -260,7 +152,7 @@ isp_getrqentry(isp, iptrp, optrp, resultp)
 	optr = isp->isp_reqodx = ISP_READ(isp, OUTMAILBOX4);
 	iptr = isp->isp_reqidx;
 	*resultp = ISP_QUEUE_ENTRY(isp->isp_rquest, iptr);
-	iptr = ISP_NXT_QENTRY(iptr, RQUEST_QUEUE_LEN);
+	iptr = ISP_NXT_QENTRY(iptr, RQUEST_QUEUE_LEN(isp));
 	if (iptr == optr) {
 		return (1);
 	}
@@ -274,6 +166,8 @@ isp_getrqentry(isp, iptrp, optrp, resultp)
 static INLINE void
 isp_print_qentry __P((struct ispsoftc *, char *, int, void *));
 
+
+#define	TBA	(4 * (((QENTRY_LEN >> 2) * 3) + 1) + 1)
 static INLINE void
 isp_print_qentry(isp, msg, idx, arg)
 	struct ispsoftc *isp;
@@ -281,14 +175,48 @@ isp_print_qentry(isp, msg, idx, arg)
 	int idx;
 	void *arg;
 {
+	char buf[TBA];
 	int amt, i, j;
 	u_int8_t *ptr = arg;
-	PRINTF("%s %s index %d:\n", isp->isp_name, msg, idx);
-	for (amt = i = 0; i < 4; i++) {
+
+	for (buf[0] = 0, amt = i = 0; i < 4; i++) {
+		buf[0] = 0;
 		for (j = 0; j < (QENTRY_LEN >> 2); j++) {
-			PRINTF(" %02x", ptr[amt++] & 0xff);
+			SNPRINTF(buf, TBA, "%s %02x", buf, ptr[amt++] & 0xff);
+		}
+		STRNCAT(buf, "\n", TBA);
+	}
+	isp_prt(isp, ISP_LOGALL, "%s index %d:%s", msg, idx, buf);
+}
+
+static INLINE void
+isp_print_bytes __P((struct ispsoftc *, char *, int, void *));
+
+static INLINE void
+isp_print_bytes(isp, msg, amt, arg)
+	struct ispsoftc *isp;
+	char *msg;
+	int amt;
+	void *arg;
+{
+	char buf[128];
+	u_int8_t *ptr = arg;
+	int off;
+
+	if (msg)
+		isp_prt(isp, ISP_LOGALL, "%s:", msg);
+	off = 0;
+	buf[0] = 0;
+	while (off < amt) {
+		int j, to;
+		to = off;
+		for (j = 0; j < 16; j++) {
+			SNPRINTF(buf, 128, "%s %02x", buf, ptr[off++] & 0xff);
+			if (off == amt)
+				break;
 		}
-		PRINTF("\n");
+		isp_prt(isp, ISP_LOGALL, "0x%08x:%s", to, buf);
+		buf[0] = 0;
 	}
 }
 #endif	/* _ISP_INLINE_H */