Catch up with mainline of code development.

Add support for 2 Gigabit cards (2300/2312). This necessitated a change
in how interrupts are down- the 23XX has not only a different place to check
for an interrupt, but unlike all other QLogic cards, you have to read the
status as a 32 bit word- not 16 bit words. Rather than have device specific
functions as called from the core module (in isp_intr), it makes more sense
to have the platform/bus modules do the gruntwork of splitting out the
isr, semaphore register and the first outgoing mailbox register (if needed)
*prior* to calling isp_intr (if calling isp_intr is necessary at all).

Rearchitect how regular SCSI parameters are stored or used.

1 files changed, 109 insertions, 18 deletions

diff --git a/sys/dev/ic/ispmbox.h b/sys/dev/ic/ispmbox.h
index f1be68c9d3c..180f0a5e139 100644
--- a/sys/dev/ic/ispmbox.h
+++ b/sys/dev/ic/ispmbox.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ispmbox.h,v 1.13 2001/04/04 22:09:16 mjacob Exp $ */
+/*	$OpenBSD: ispmbox.h,v 1.14 2001/09/01 07:16:40 mjacob Exp $ */
 /*
  * Mailbox and Queue Entry Definitions for for Qlogic ISP SCSI adapters.
  *
@@ -33,7 +33,6 @@
 /*
  * Mailbox Command Opcodes
  */
-
 #define MBOX_NO_OP			0x0000
 #define MBOX_LOAD_RAM			0x0001
 #define MBOX_EXEC_FIRMWARE		0x0002
@@ -74,6 +73,7 @@
 #define MBOX_GET_ACT_NEG_STATE		0x0025
 #define MBOX_GET_ASYNC_DATA_SETUP_TIME	0x0026
 #define MBOX_GET_SBUS_PARAMS		0x0027
+#define		MBOX_GET_PCI_PARAMS	MBOX_GET_SBUS_PARAMS
 #define MBOX_GET_TARGET_PARAMS		0x0028
 #define MBOX_GET_DEV_QUEUE_PARAMS	0x0029
 #define	MBOX_GET_RESET_DELAY_PARAMS	0x002a
@@ -115,7 +115,10 @@
 
 /* These are for the ISP2100 FC cards */
 #define	MBOX_GET_LOOP_ID		0x20
+#define	MBOX_GET_FIRMWARE_OPTIONS	0x28
+#define	MBOX_SET_FIRMWARE_OPTIONS	0x38
 #define	MBOX_GET_RESOURCE_COUNT		0x42
+#define	MBOX_ENHANCED_GET_PDB		0x47
 #define	MBOX_EXEC_COMMAND_IOCB_A64	0x54
 #define	MBOX_INIT_FIRMWARE		0x60
 #define	MBOX_GET_INIT_CONTROL_BLOCK	0x61
@@ -176,25 +179,56 @@ typedef struct {
 #define	ASYNC_HUNG_SCSI			0x800C
 #define	ASYNC_KILLED_BUS		0x800D
 #define	ASYNC_BUS_TRANSIT		0x800E	/* LVD -> HVD, eg. */
-#define	ASYNC_CMD_CMPLT			0x8020
-#define	ASYNC_CTIO_DONE			0x8021
-
-/* for ISP2100 only */
 #define	ASYNC_LIP_OCCURRED		0x8010
 #define	ASYNC_LOOP_UP			0x8011
 #define	ASYNC_LOOP_DOWN			0x8012
 #define	ASYNC_LOOP_RESET		0x8013
 #define	ASYNC_PDB_CHANGED		0x8014
 #define	ASYNC_CHANGE_NOTIFY		0x8015
-
-/* for ISP2200 only */
+#define	ASYNC_LIP_F8			0x8016
+#define	ASYNC_CMD_CMPLT			0x8020
+#define	ASYNC_CTIO_DONE			0x8021
+#define	ASYNC_IP_XMIT_DONE		0x8022
+#define	ASYNC_IP_RECV_DONE		0x8023
+#define	ASYNC_IP_BROADCAST		0x8024
+#define	ASYNC_IP_RCVQ_LOW		0x8025
+#define	ASYNC_IP_RCVQ_EMPTY		0x8026
+#define	ASYNC_IP_RECV_DONE_ALIGNED	0x8027
 #define	ASYNC_PTPMODE			0x8030
+#define	ASYNC_RIO1			0x8031
+#define	ASYNC_RIO2			0x8032
+#define	ASYNC_RIO3			0x8033
+#define	ASYNC_RIO4			0x8034
+#define	ASYNC_RIO5			0x8035
 #define	ASYNC_CONNMODE			0x8036
 #define		ISP_CONN_LOOP		1
 #define		ISP_CONN_PTP		2
 #define		ISP_CONN_BADLIP		3
 #define		ISP_CONN_FATAL		4
 #define		ISP_CONN_LOOPBACK	5
+#define	ASYNC_RIO_RESP			0x8040
+#define	ASYNC_RIO_COMP			0x8042
+/*
+ * 2.01.31 2200 Only. Need Bit 13 in Mailbox 1 for Set Firmware Options
+ * mailbox command to enable this.
+ */
+#define	ASYNC_QFULL_SENT		0x8049
+
+/*
+ * Mailbox Usages
+ */
+
+#define	WRITE_REQUEST_QUEUE_IN_POINTER(isp, value)	\
+	ISP_WRITE(isp, isp->isp_rqstinrp, value)
+
+#define	READ_REQUEST_QUEUE_OUT_POINTER(isp)		\
+	ISP_READ(isp, isp->isp_rqstoutrp)
+
+#define	READ_RESPONSE_QUEUE_IN_POINTER(isp)		\
+	ISP_READ(isp, isp->isp_respinrp)
+
+#define	WRITE_RESPONSE_QUEUE_OUT_POINTER(isp, value)	\
+	ISP_WRITE(isp, isp->isp_respoutrp, value)
 
 /*
  * Command Structure Definitions
@@ -205,16 +239,28 @@ typedef struct {
 	u_int32_t	ds_count;
 } ispds_t;
 
+typedef struct {
+	u_int32_t	ds_base;
+	u_int32_t	ds_basehi;
+	u_int32_t	ds_count;
+} ispds64_t;
+
+typedef struct {
+	u_int16_t	ds_type;	/* 0-> ispds_t, 1-> ispds64_t */
+	u_int32_t	ds_segment;	/* unused */
+	u_int32_t	ds_base;	/* 32 bit address of DSD list */
+} ispdslist_t;
+
+
+/*
+ * These elements get swizzled around for SBus instances.
+ */
 #define	_ISP_SWAP8(a, b)	{	\
 	u_int8_t tmp;			\
 	tmp = a;			\
 	a = b;				\
 	b = tmp;			\
 }
-
-/*
- * These elements get swizzled around for SBus instances.
- */
 typedef struct {
 	u_int8_t	rqs_entry_type;
 	u_int8_t	rqs_entry_count;
@@ -258,14 +304,19 @@ typedef struct {
 #define	RQSTYPE_CTIO1		0x0f	/* Target Mode */
 #define	RQSTYPE_STATUS_CONT	0x10
 #define	RQSTYPE_T2RQS		0x11
-
+#define	RQSTYPE_IP_XMIT		0x13
 #define	RQSTYPE_T4RQS		0x15
-#define	RQSTYPE_ATIO2		0x16
-#define	RQSTYPE_CTIO2		0x17
+#define	RQSTYPE_ATIO2		0x16	/* Target Mode */
+#define	RQSTYPE_CTIO2		0x17	/* Target Mode */
 #define	RQSTYPE_CSET0		0x18
 #define	RQSTYPE_T3RQS		0x19
-
-#define	RQSTYPE_CTIO3		0x1f
+#define	RQSTYPE_IP_XMIT_64	0x1b
+#define	RQSTYPE_CTIO4		0x1e	/* Target Mode */
+#define	RQSTYPE_CTIO3		0x1f	/* Target Mode */
+#define	RQSTYPE_RIO1		0x21
+#define	RQSTYPE_RIO2		0x22
+#define	RQSTYPE_IP_RECV		0x23
+#define	RQSTYPE_IP_RECV_CONT	0x24
 
 
 #define	ISP_RQDSEG	4
@@ -303,7 +354,7 @@ typedef struct {
 #define	ISP_SBUSIFY_ISPREQ(a, b)
 #endif
 
-#define	ISP_RQDSEG_T2	3
+#define	ISP_RQDSEG_T2		3
 typedef struct {
 	isphdr_t	req_header;
 	u_int32_t	req_handle;
@@ -319,6 +370,22 @@ typedef struct {
 	ispds_t		req_dataseg[ISP_RQDSEG_T2];
 } ispreqt2_t;
 
+#define	ISP_RQDSEG_T3		2
+typedef struct {
+	isphdr_t	req_header;
+	u_int32_t	req_handle;
+	u_int8_t	req_lun_trn;
+	u_int8_t	req_target;
+	u_int16_t	req_scclun;
+	u_int16_t	req_flags;
+	u_int16_t	_res2;
+	u_int16_t	req_time;
+	u_int16_t	req_seg_count;
+	u_int32_t	req_cdb[4];
+	u_int32_t	req_totalcnt;
+	ispds64_t	req_dataseg[ISP_RQDSEG_T3];
+} ispreqt3_t;
+
 /* req_flag values */
 #define	REQFLAG_NODISCON	0x0001
 #define	REQFLAG_HTAG		0x0002
@@ -360,6 +427,12 @@ typedef struct {
 	ispds_t		req_dataseg[ISP_CDSEG];
 } ispcontreq_t;
 
+#define	ISP_CDSEG64	5
+typedef struct {
+	isphdr_t	req_header;
+	ispds64_t	req_dataseg[ISP_CDSEG64];
+} ispcontreq64_t;
+
 typedef struct {
 	isphdr_t	req_header;
 	u_int32_t	req_handle;
@@ -495,6 +568,20 @@ typedef struct {
 #define	ISP_FW_ATTR_IP		0x20
 
 /*
+ * Reduced Interrupt Operation Response Queue Entreis
+ */
+
+typedef struct {
+	isphdr_t	req_header;
+	u_int32_t	req_handles[15];
+} isp_rio1_t;
+
+typedef struct {
+	isphdr_t	req_header;
+	u_int16_t	req_handles[30];
+} isp_rio2_t;
+
+/*
  * FC (ISP2100) specific data structures
  */
 
@@ -566,6 +653,10 @@ typedef struct isp_icb {
 #define	ICBXOPT_RIO_16BIT_DELAY	3
 #define	ICBXOPT_RIO_32BIT_DELAY	4
 
+/* These 3 only apply to the 2300 */
+#define	ICBXOPT_RATE_ONEGB	(0 << 14)
+#define	ICBXOPT_RATE_TWOGB	(1 << 14)
+#define	ICBXOPT_RATE_AUTO	(2 << 14)
 
 
 #define	ICB_MIN_FRMLEN		256