diff options
| author | Matthew R. Ochs <mrochs@linux.vnet.ibm.com> | 2015-10-21 15:14:24 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Odin.com> | 2015-10-30 17:16:05 +0900 |
| commit | ed486daad27afdcb24cee4ea0b1c9f44281e74fc (patch) | |
| tree | 2b7dd170fdc28f99b312553a90e20d34faa7604f /drivers/scsi/cxlflash/main.c | |
| parent | d804621d0275da84caedcf2d6cf03fbe3c9ac3aa (diff) | |
| download | linux-ed486daad27afdcb24cee4ea0b1c9f44281e74fc.tar.gz | |
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>
Diffstat (limited to 'drivers/scsi/cxlflash/main.c')
| -rw-r--r-- | drivers/scsi/cxlflash/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c index d0b99721c4f3..89bd4c3401bb 100644 --- a/drivers/scsi/cxlflash/main.c +++ b/drivers/scsi/cxlflash/main.c @@ -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; |