cxlflash: Correct behavior in device reset handler following EEH
When the device reset handler is entered while a reset operation is taking place, the handler exits without actually sending a reset (TMF) to the targeted device. This behavior is incorrect as the device is not reset. Further complicating matters is the fact that a success is returned even when the TMF was not sent. To fix, the state is rechecked after coming out of the reset state. When the state is normal, a TMF will be sent out. Signed-off-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com> Signed-off-by: Manoj N. Kumar <manoj@linux.vnet.ibm.com> Reviewed-by: Brian King <brking@linux.vnet.ibm.com> Reviewed-by: Tomas Henzl <thenzl@redhat.com> Signed-off-by: James Bottomley <JBottomley@Odin.com>
This commit is contained in:
parent
d804621d02
commit
ed486daad2
|
@ -1920,6 +1920,7 @@ static int cxlflash_eh_device_reset_handler(struct scsi_cmnd *scp)
|
|||
get_unaligned_be32(&((u32 *)scp->cmnd)[2]),
|
||||
get_unaligned_be32(&((u32 *)scp->cmnd)[3]));
|
||||
|
||||
retry:
|
||||
switch (cfg->state) {
|
||||
case STATE_NORMAL:
|
||||
rcr = send_tmf(afu, scp, TMF_LUN_RESET);
|
||||
|
@ -1928,9 +1929,7 @@ static int cxlflash_eh_device_reset_handler(struct scsi_cmnd *scp)
|
|||
break;
|
||||
case STATE_RESET:
|
||||
wait_event(cfg->reset_waitq, cfg->state != STATE_RESET);
|
||||
if (cfg->state == STATE_NORMAL)
|
||||
break;
|
||||
/* fall through */
|
||||
goto retry;
|
||||
default:
|
||||
rc = FAILED;
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue