Mote that how the pad bytes can be divided in half and used by either

the target mode code or outer layers.

Increase cd_tagval to be 32 bits since it will have to now carry 16
bits of parallel SCSI ATIO handle as well as a normal tag (if any).

1 files changed, 8 insertions, 4 deletions

diff --git a/sys/dev/isp/isp_tpublic.h b/sys/dev/isp/isp_tpublic.h
index d5e886f..a497077 100644
--- a/sys/dev/isp/isp_tpublic.h
+++ b/sys/dev/isp/isp_tpublic.h
@@ -101,7 +101,9 @@ typedef struct {
  * layer maintains a port database, for example).
  *
  * The cd_tagtype field specifies what kind of command tag has been
- * sent with the command. The cd_tagval is the tag's value.
+ * sent with the command. The cd_tagval is the tag's value (low 16
+ * bits). It also contains (in the upper 16 bits) any command handle.
+ *
  *
  * N.B.: when the MD layer sends this command to outside software
  * the outside software likely *MUST* return the same cd_tagval that
@@ -175,7 +177,9 @@ 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 tag cd_reserved pads out the structure to 128 bytes. The first
+ * half of the pad area is reserved to the MD layer, and the second half
+ * may be used by outer layers, for scratch purposes.
  */
 
 #ifndef	_LP64
@@ -206,7 +210,7 @@ typedef struct tmd_cmd {
 	u_int64_t		cd_lun;		/* logical unit */
 	u_int8_t		cd_bus;		/* bus */
 	u_int8_t		cd_tagtype;	/* tag type */
-	u_int16_t		cd_tagval;	/* tag value */
+	u_int32_t		cd_tagval;	/* tag value */
 	u_int8_t		cd_cdb[ATIO_CDBLEN];	/* Command */
 	u_int8_t		cd_lflags;	/* flags lower level sets */
 	u_int8_t		cd_hflags;	/* flags higher level sets */
@@ -266,7 +270,7 @@ typedef enum {
  *	When the HBA is enabled for receiving commands, one may	show up
  *	without notice. When that happens, the Qlogic target mode driver
  *	gets a tmd_cmd_t, fills it with the info that just arrived, and
- *	calls the outer layer with a QIN_TMD_START code and pointer to
+ *	calls the outer layer with a QOUT_TMD_START code and pointer to
  *	the tmd_cmd_t.
  *
  *	The outer layer decodes the command, fetches data, prepares stuff,