Various updates to sync with mainline code. Nothing of great significance

to NetBSD, yet.

sys/dev/ic/isp_target.c

@@ -1,4 +1,4 @@
-/* $NetBSD: isp_target.c,v 1.23 2003/03/03 20:54:12 mjacob Exp $ */
+/* $NetBSD: isp_target.c,v 1.24 2003/08/07 01:12:15 mjacob Exp $ */
 /*
  * This driver, which is contained in NetBSD in the files:
  *
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_target.c,v 1.23 2003/03/03 20:54:12 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_target.c,v 1.24 2003/08/07 01:12:15 mjacob Exp $");
 
 #ifdef	__NetBSD__
 #include <dev/ic/isp_netbsd.h>
@@ -570,6 +570,11 @@ isp_target_async(struct ispsoftc *isp, int bus, int event)
 		msg.nt_msg[0] = MSG_BUS_DEV_RESET;
 		(void) isp_async(isp, ISPASYNC_TARGET_MESSAGE, &msg);
 		break;
+	case ASYNC_CTIO_DONE:
+		evt.ev_bus = bus;
+		evt.ev_event = event;
+		(void) isp_async(isp, ISPASYNC_TARGET_EVENT, &evt);
+		return (0);
 	default:
 		isp_prt(isp, ISP_LOGERR,
 		    "isp_target_async: unknown event 0x%x", event);
@@ -1144,9 +1149,11 @@ isp_handle_ctio2(struct ispsoftc *isp, ct2_entry_t *ct)
 	case CT_PORTNOTAVAIL:
 		if (fmsg == NULL)
 			fmsg = "Port not available";
+		/*FALLTHROUGH*/
 	case CT_PORTCHANGED:
 		if (fmsg == NULL)
 			fmsg = "Port Changed";
+		/*FALLTHROUGH*/
 	case CT_NOACK:
 		if (fmsg == NULL)
 			fmsg = "unacknowledged Immediate Notify pending";

sys/dev/ic/isp_target.h

@@ -1,4 +1,4 @@
-/* $NetBSD: isp_target.h,v 1.19 2002/08/12 21:33:40 mjacob Exp $ */
+/* $NetBSD: isp_target.h,v 1.20 2003/08/07 01:12:16 mjacob Exp $ */
 /*
  * This driver, which is contained in NetBSD in the files:
  *
@@ -64,11 +64,8 @@
 #ifndef	_ISP_TARGET_H
 #define	_ISP_TARGET_H
 
-/*
+#define	QLTM_SENSELEN	18	/* non-FC cards only */
- * Defines for all entry types
- */
 #define QLTM_SVALID	0x80
-#define	QLTM_SENSELEN	18
 
 /*
  * Structure for Enable Lun and Modify Lun queue entries
@@ -302,7 +299,7 @@ typedef struct {
 	u_int16_t	at_rxid; 	/* response ID */
 	u_int16_t	at_flags;
 	u_int16_t	at_status;	/* firmware status */
-	u_int8_t	at_reserved1;
+	u_int8_t	at_crn;		/* command reference number */
 	u_int8_t	at_taskcodes;
 	u_int8_t	at_taskflags;
 	u_int8_t	at_execodes;
@@ -324,6 +321,9 @@ typedef struct {
 #define	ATIO2_TC_ATTR_ACAQ	4
 #define	ATIO2_TC_ATTR_UNTAGGED	5
 
+#define	ATIO2_EX_WRITE		0x1
+#define	ATIO2_EX_READ		0x2
+
 /*
  * Continue Target I/O Entry structure
  * Request from driver. The response from the
@@ -489,14 +489,6 @@ typedef struct {
 			u_int32_t ct_datalen;
 			ispds_t ct_fcp_rsp_iudata;
 		} m2;
-		/*
-		 * CTIO2 returned from F/W...
-		 */
-		struct {
-			u_int32_t _reserved[4];
-			u_int16_t ct_scsi_status;
-			u_int8_t  ct_sense[QLTM_SENSELEN];
-		} fw;
 	} rsp;
 } ct2_entry_t;
 
@@ -513,6 +505,7 @@ typedef struct {
 #define CT2_DATAMASK	CT_DATAMASK
 #define	CT2_CCINCR	0x0100
 #define	CT2_FASTPOST	0x0200
+#define	CT2_TERMINATE	0x4000
 #define CT2_SENDSTATUS	0x8000
 
 /*

sys/dev/ic/isp_tpublic.h

@@ -1,4 +1,4 @@
-/* $NetBSD: isp_tpublic.h,v 1.9 2003/03/03 20:54:28 mjacob Exp $ */
+/* $NetBSD: isp_tpublic.h,v 1.10 2003/08/07 01:12:16 mjacob Exp $ */
 /*
  * This driver, which is contained in NetBSD in the files:
  *
@@ -74,16 +74,16 @@ typedef struct {
 	u_int64_t	nt_iid;			/* inititator id */
 	u_int64_t	nt_tgt;			/* target id */
 	u_int64_t	nt_lun;			/* logical unit */
+	u_int32_t	nt_tagval;		/* tag value */
 	u_int8_t	nt_bus;			/* bus */
 	u_int8_t	nt_tagtype;		/* tag type */
-	u_int16_t	nt_tagval;		/* tag value */
 	u_int8_t	nt_msg[IN_MSGLEN];	/* message content */
 } tmd_msg_t;
 
 typedef struct {
 	void *		ev_hba;			/* HBA tag */
-	u_int16_t	ev_bus;			/* bus */
+	u_int32_t	ev_bus;			/* bus */
-	u_int16_t	ev_event;		/* type of async event */
+	u_int32_t	ev_event;		/* type of async event */
 } tmd_event_t;
 
 /*
@@ -205,68 +205,89 @@ typedef struct {
  * The tag cd_error is to communicate between the MD layer and outer software
  * the current error conditions.
  *
- * The tag cd_reserved pads out the structure to 128 bytes. The first
+ * The tag cd_lreserved, cd_hreserved are scratch areas for use for the MD
- * half of the pad area is reserved to the MD layer, and the second half
+ * and outer layers respectively.
- * may be used by outer layers, for scratch purposes.
+ * 
  */
 
-#ifndef	_LP64
+#ifndef	TMD_CDBLEN
-#if	defined(__alpha__) || defined(__sparcv9cpu) || defined(__sparc_v9__) ||\
+#define	TMD_CDBLEN	16
-    defined(__ia64__)
-#define	_LP64
 #endif
+#ifndef	TMD_SENSELEN
+#define	TMD_SENSELEN	24
+#endif
+#ifndef	QCDS
+#define	QCDS	8
 #endif
 
-#ifndef	_TMD_PAD_LEN
-#ifdef	_LP64
-#define	_TMD_PAD_LEN	12
-#else
-#define	_TMD_PAD_LEN	24
-#endif
-#endif
-#ifndef	ATIO_CDBLEN
-#define	ATIO_CDBLEN	26
-#endif
-#ifndef	QLTM_SENSELEN
-#define	QLTM_SENSELEN	18
-#endif
 typedef struct tmd_cmd {
-	void *			cd_private;	/* layer private data */
+	void *			cd_private;	/* private data pointer */
 	void *			cd_hba;		/* HBA tag */
 	void *			cd_data;	/* 'pointer' to data */
 	u_int64_t		cd_iid;		/* initiator ID */
 	u_int64_t		cd_tgt;		/* target id */
 	u_int64_t		cd_lun;		/* logical unit */
-	u_int8_t		cd_bus;		/* bus */
-	u_int8_t		cd_tagtype;	/* tag type */
 	u_int32_t		cd_tagval;	/* tag value */
-	u_int8_t		cd_cdb[ATIO_CDBLEN];	/* Command */
+	u_int32_t		cd_lflags;	/* flags lower level sets */
-	u_int8_t		cd_lflags;	/* flags lower level sets */
+	u_int32_t		cd_hflags;	/* flags higher level sets */
-	u_int8_t		cd_hflags;	/* flags higher level sets */
 	u_int32_t		cd_totlen;	/* total data requirement */
 	u_int32_t		cd_resid;	/* total data residual */
 	u_int32_t		cd_xfrlen;	/* current data requirement */
 	int32_t			cd_error;	/* current error */
-	u_int8_t		cd_sense[QLTM_SENSELEN];
+	u_int32_t
-	u_int16_t		cd_scsi_status;	/* closing SCSI status */
+		cd_scsi_status	: 16,	/* closing SCSI status */
-	u_int8_t		cd_reserved[_TMD_PAD_LEN];
+				: 7,
+	    	cd_chan		: 1,	/* channel on card */
+				: 2,
+		cd_tagtype	: 6;	/* tag type */
+	u_int8_t		cd_senselen;
+	u_int8_t		cd_cdblen;
+	u_int8_t		cd_sense[TMD_SENSELEN];
+	u_int8_t		cd_cdb[TMD_CDBLEN];	/* Command */
+	union {
+		void *		ptrs[QCDS / sizeof (void *)];
+		u_int64_t	llongs[QCDS / sizeof (u_int64_t)];
+		u_int32_t	longs[QCDS / sizeof (u_int32_t)];
+		u_int16_t	shorts[QCDS / sizeof (u_int16_t)];
+		u_int8_t	bytes[QCDS];
+	} cd_lreserved[2], cd_hreserved[2];
 } tmd_cmd_t;
 
-#define	CDFL_SNSVALID	0x01		/* sense data (from f/w) valid */
+#ifndef	TMD_SIZE
-#define	CDFL_NODISC	0x02		/* disconnects disabled */
+#define	TMD_SIZE	(sizeof (tmd_cmd_t))
-#define	CDFL_SENTSENSE	0x04		/* last action sent sense data */
+#endif
-#define	CDFL_SENTSTATUS	0x08		/* last action sent status */
-#define	CDFL_ERROR	0x10		/* last action ended in error */
-#define	CDFL_BUSY	0x40		/* this command is not on a free list */
-#define	CDFL_PRIVATE_0	0x80		/* private layer flags */
 
-#define	CDFH_SNSVALID	0x01		/* sense data valid */
+/*
+ * Note that NODISC (obviously) doesn't apply to non-SPI transport.
+ *
+ * Note that knowing the data direction and lengh at the time of receipt of
+ * a command from the initiator is a feature only of Fibre Channel.
+ *
+ * The CDFL_BIDIR is in anticipation of the adoption of some newer
+ * features required by OSD.
+ *
+ * The principle selector for MD layer to know whether data is to
+ * be transferred in any QOUT_TMD_CONT call is cd_xfrlen- the
+ * flags CDFH_DATA_IN and CDFH_DATA_OUT define which direction.
+ */
+#define	CDFL_SNSVALID	0x01		/* sense data (from f/w) good */
+#define	CDFL_SENTSTATUS	0x02		/* last action sent status */
+#define	CDFL_DATA_IN	0x04		/* target (us) -> initiator (them) */
+#define	CDFL_DATA_OUT	0x08		/* initiator (them) -> target (us) */
+#define	CDFL_BIDIR	0x0C		/* bidirectional data */
+#define	CDFL_ERROR	0x10		/* last action ended in error */
+#define	CDFL_NODISC	0x20		/* disconnects disabled */
+#define	CDFL_SENTSENSE	0x40		/* last action sent sense data */
+#define	CDFL_BUSY	0x80		/* this command is not on a free list */
+#define	CDFL_PRIVATE	0xFF000000	/* private layer flags */
+
+#define	CDFH_SNSVALID	0x01		/* sense data (from outer layer) good */
 #define	CDFH_STSVALID	0x02		/* status valid */
-#define	CDFH_NODATA	0x00		/* no data transfer expected */
 #define	CDFH_DATA_IN	0x04		/* target (us) -> initiator (them) */
 #define	CDFH_DATA_OUT	0x08		/* initiator (them) -> target (us) */
 #define	CDFH_DATA_MASK	0x0C		/* mask to cover data direction */
-#define	CDFH_PRIVATE_0	0x80		/* private layer flags */
+#define	CDFH_PRIVATE	0xFF000000	/* private layer flags */
+
 
 /*
  * Action codes set by the Qlogic MD target driver for
@@ -274,10 +295,13 @@ typedef struct tmd_cmd {
  */
 typedef enum {
 	QOUT_HBA_REG=0,	/* the argument is a pointer to a hba_register_t */
+	QOUT_ENABLE,	/* the argument is a pointer to a enadis_t */
+	QOUT_DISABLE,	/* the argument is a pointer to a enadis_t */
 	QOUT_TMD_START,	/* the argument is a pointer to a tmd_cmd_t */
 	QOUT_TMD_DONE,	/* the argument is a pointer to a tmd_cmd_t */
 	QOUT_TEVENT,	/* the argument is a pointer to a tmd_event_t */
 	QOUT_TMSG,	/* the argument is a pointer to a tmd_msg_t */
+	QOUT_IOCTL,	/* the argument is a pointer to a ioctl_cmd_t */
 	QOUT_HBA_UNREG	/* the argument is a pointer to a hba_register_t */
 } tact_e;
 
@@ -286,14 +310,16 @@ typedef enum {
  * MD Qlogic driver to figure out what to do with.
  */
 typedef enum {
-	QIN_HBA_REG=6,	/* the argument is a pointer to a hba_register_t */
+	QIN_HBA_REG=99,	/* the argument is a pointer to a hba_register_t */
-	QIN_ENABLE,	/* the argument is a pointer to a tmd_cmd_t */
+	QIN_ENABLE,	/* the argument is a pointer to a enadis_t */
-	QIN_DISABLE,	/* the argument is a pointer to a tmd_cmd_t */
+	QIN_DISABLE,	/* the argument is a pointer to a enadis_t */
 	QIN_TMD_CONT,	/* the argument is a pointer to a tmd_cmd_t */
-	QIN_TMD_FIN,	/* the argument is a pointer to a done tmd_cmd_t */
+	QIN_TMD_FIN,	/* the argument is a pointer to a tmd_cmd_t */
-	QIN_HBA_UNREG	/* the argument is a pointer to a hba_register_t */
+	QIN_IOCTL,	/* the argument is a pointer to a ioctl_cmd_t */
+	QIN_HBA_UNREG,	/* the argument is a pointer to a hba_register_t */
 } qact_e;
 
+
 /*
  * A word about the START/CONT/DONE/FIN dance:
  *
@@ -322,26 +348,23 @@ typedef enum {
  */
 
 /*
- * A word about ENABLE/DISABLE: the argument is a pointer to a tmd_cmd_t
+ * A word about ENABLE/DISABLE: the argument is a pointer to a enadis_t
- * with cd_hba, cd_bus, cd_tgt and cd_lun filled out. If an error occurs
+ * with cd_hba, cd_iid, cd_chan, cd_tgt and cd_lun filled out.
- * in either enabling or disabling the described lun, cd_lflags is set
+ *
- * with CDFL_ERROR.
+ * If an error occurs in either enabling or disabling the described lun
+ * cd_error is set with an appropriate non-zero value.
  *
  * Logical unit zero must be the first enabled and the last disabled.
  */
-
+typedef struct {
-/*
+	void *			cd_private;	/* for outer layer usage */
- * Target handler functions.
+	void *			cd_hba;		/* HBA tag */
- * The MD target handler function (the outer layer calls this)
+	u_int64_t		cd_iid;		/* initiator ID */
- * should be be prototyped like:
+	u_int64_t		cd_tgt;		/* target id */
- *
+	u_int64_t		cd_lun;		/* logical unit */
- *	void target_action(qact_e, void *arg)
+	u_int8_t		cd_chan;	/* channel on card */
- *
+	int32_t			cd_error;
- * The outer layer target handler function (the MD layer calls this)
+} enadis_t;
- * should be be prototyped like:
- *
- *	void system_action(tact_e, void *arg)
- */
 
 /*
  * This structure is used to register to other software modules the
@@ -353,11 +376,54 @@ typedef enum {
  * in, and the external module to call back with a QIN_HBA_REG that
  * passes back the corresponding information.
  */
+#define	QR_VERSION	1
 typedef struct {
 	void *	r_identity;
+	void   (*r_action)(qact_e, void *);
 	char	r_name[8];
 	int	r_inst;
-	int	r_lunwidth;
+	int	r_version;
-	int	r_buswidth;
+	enum { R_FC, R_SCSI } r_type;
-	void   (*r_action)(int, void *);
 } hba_register_t;
+
+/*
+ * This structure is used to pass an encapsulated ioctl through to the
+ * MD layer. In many implementations it's often convenient to open just
+ * one device, but actions you want to take need to be taken on the
+ * underlying HBA. Rather than invent a separate protocol for each action,
+ * an ioctl passthrough seems simpler.
+ *
+ * In order to avoid cross domain copy problems, though, the caller will
+ * be responsible for allocating and providing a staging area for all ioctl
+ * related data. This, unavoidably, requires some ioctl decode capability
+ * in the outer layer code.`
+ *
+ * And also, albeit being cheesy, we'll define a few internal ioctls here.
+ */
+typedef struct {
+	void *	i_identity;	/* HBA tag */
+	void *	i_syncptr;	/* synchronization pointer */
+	int	i_cmd;		/* ioctl command */
+	void *	i_arg;		/* ioctl argument area */
+	int	i_errno;	/* ioctl error return */
+} ioctl_cmd_t;
+
+#define	QI_IOC	('Q' << 8)
+#define	QI_SCSI_TINI	QI_IOC|0
+#define	QI_SCSI_CMD	QI_IOC|1
+#define	QI_WWPN_XLT	QI_IOC|2
+
+/*
+ * Target handler functions.
+ *
+ * The MD target handler function (the outer layer calls this)
+ * should be be prototyped like:
+ *
+ *	void target_action(qact_e, void *arg)
+ *
+ * The outer layer target handler function (the MD layer calls this)
+ * should be be prototyped like:
+ *
+ *	void system_target_handler(tact_e, void *arg)
+ */
+