scsi: aacraid: Fix I/O drop during reset

Prasad B Munirathnam · martinkpetersen · commit 5771cfffdffe · 2017-12-14T22:34:28.000-05:00
"FIB_CONTEXT_FLAG_TIMEDOUT" flag is set in aac_eh_abort to indicate
command timeout. Using the same flag in reset handler causes the command
to time out and the I/Os were dropped.

Define a new flag "FIB_CONTEXT_FLAG_EH_RESET" to make sure I/O is
properly handled in eh_reset handler.

[mkp: tweaked commit message]

Signed-off-by: Prasad B Munirathnam &lt;prasad.munirathnam@microsemi.com&gt;
Reviewed-by: Raghava Aditya Renukunta &lt;RaghavaAditya.Renukunta@microsemi.com&gt;
Signed-off-by: Martin K. Petersen &lt;martin.petersen@oracle.com&gt;
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
@@ -1725,6 +1725,7 @@ struct aac_dev
 #define FIB_CONTEXT_FLAG_NATIVE_HBA		(0x00000010)
 #define FIB_CONTEXT_FLAG_NATIVE_HBA_TMF	(0x00000020)
 #define FIB_CONTEXT_FLAG_SCSI_CMD	(0x00000040)
+#define FIB_CONTEXT_FLAG_EH_RESET	(0x00000080)
 
 /*
  *	Define the command values
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
@@ -1037,7 +1037,7 @@ static int aac_eh_bus_reset(struct scsi_cmnd* cmd)
 			info = &aac->hba_map[bus][cid];
 			if (bus >= AAC_MAX_BUSES || cid >= AAC_MAX_TARGETS ||
 			    info->devtype != AAC_DEVTYPE_NATIVE_RAW) {
-				fib->flags |= FIB_CONTEXT_FLAG_TIMED_OUT;
+				fib->flags |= FIB_CONTEXT_FLAG_EH_RESET;
 				cmd->SCp.phase = AAC_OWNER_ERROR_HANDLER;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -1037,7 +1037,7 @@ static int aac_eh_bus_reset(struct scsi_cmnd* cmd)`
`1037`	`1037`	`info = &aac->hba_map[bus][cid];`
`1038`	`1038`	`if (bus >= AAC_MAX_BUSES \|\| cid >= AAC_MAX_TARGETS \|\|`
`1039`	`1039`	`info->devtype != AAC_DEVTYPE_NATIVE_RAW) {`
`1040`		`- fib->flags \|= FIB_CONTEXT_FLAG_TIMED_OUT;`
	`1040`	`+ fib->flags \|= FIB_CONTEXT_FLAG_EH_RESET;`
`1041`	`1041`	`cmd->SCp.phase = AAC_OWNER_ERROR_HANDLER;`
`1042`	`1042`	`}`
`1043`	`1043`	`}`