Skip to content

Commit

Permalink
scsi: aacraid: Disabling TM path and only processing IOP reset
Browse files Browse the repository at this point in the history 
[ Upstream commit bef18d3 ]

Fixes the occasional adapter panic when sg_reset is issued with -d, -t, -b
and -H flags.  Removal of command type HBA_IU_TYPE_SCSI_TM_REQ in
aac_hba_send since iu_type, request_id and fib_flags are not populated.
Device and target reset handlers are made to send TMF commands only when
reset_state is 0.

Link: https://lore.kernel.org/r/1581553771-25796-1-git-send-email-Sagar.Biradar@microchip.com
Reviewed-by: Sagar Biradar <Sagar.Biradar@microchip.com>
Signed-off-by: Sagar Biradar <Sagar.Biradar@microchip.com>
Signed-off-by: Balsundar P <balsundar.p@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
@gregkh
Sagar Biradar authored and gregkh committed Oct 1, 2020
1 parent 6260277 commit ae3dffd
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 10 deletions.
2 changes: 1 addition & 1 deletion drivers/scsi/aacraid/commsup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ int aac_hba_send(u8 command, struct fib *fibptr, fib_callback callback,
hbacmd->request_id =
cpu_to_le32((((u32)(fibptr - dev->fibs)) << 2) + 1);
fibptr->flags |= FIB_CONTEXT_FLAG_SCSI_CMD;
} else if (command != HBA_IU_TYPE_SCSI_TM_REQ)
} else
return -EINVAL;


Expand Down
34 changes: 25 additions & 9 deletions drivers/scsi/aacraid/linit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,11 @@ static int aac_eh_abort(struct scsi_cmnd* cmd)
status = aac_hba_send(HBA_IU_TYPE_SCSI_TM_REQ, fib,
(fib_callback) aac_hba_callback,
(void *) cmd);

if (status != -EINPROGRESS) {
aac_fib_complete(fib);
aac_fib_free(fib);
return ret;
}
/* Wait up to 15 secs for completion */
for (count = 0; count < 15; ++count) {
if (cmd->SCp.sent_command) {
Expand Down Expand Up @@ -902,11 +906,11 @@ static int aac_eh_dev_reset(struct scsi_cmnd *cmd)

info = &aac->hba_map[bus][cid];

if (info->devtype != AAC_DEVTYPE_NATIVE_RAW &&
info->reset_state > 0)
if (!(info->devtype == AAC_DEVTYPE_NATIVE_RAW &&
!(info->reset_state > 0)))
return FAILED;

pr_err("%s: Host adapter reset request. SCSI hang ?\n",
pr_err("%s: Host device reset request. SCSI hang ?\n",
AAC_DRIVERNAME);

fib = aac_fib_alloc(aac);
Expand All @@ -921,7 +925,12 @@ static int aac_eh_dev_reset(struct scsi_cmnd *cmd)
status = aac_hba_send(command, fib,
(fib_callback) aac_tmf_callback,
(void *) info);

if (status != -EINPROGRESS) {
info->reset_state = 0;
aac_fib_complete(fib);
aac_fib_free(fib);
return ret;
}
/* Wait up to 15 seconds for completion */
for (count = 0; count < 15; ++count) {
if (info->reset_state == 0) {
Expand Down Expand Up @@ -960,11 +969,11 @@ static int aac_eh_target_reset(struct scsi_cmnd *cmd)

info = &aac->hba_map[bus][cid];

if (info->devtype != AAC_DEVTYPE_NATIVE_RAW &&
info->reset_state > 0)
if (!(info->devtype == AAC_DEVTYPE_NATIVE_RAW &&
!(info->reset_state > 0)))
return FAILED;

pr_err("%s: Host adapter reset request. SCSI hang ?\n",
pr_err("%s: Host target reset request. SCSI hang ?\n",
AAC_DRIVERNAME);

fib = aac_fib_alloc(aac);
Expand All @@ -981,6 +990,13 @@ static int aac_eh_target_reset(struct scsi_cmnd *cmd)
(fib_callback) aac_tmf_callback,
(void *) info);

if (status != -EINPROGRESS) {
info->reset_state = 0;
aac_fib_complete(fib);
aac_fib_free(fib);
return ret;
}

/* Wait up to 15 seconds for completion */
for (count = 0; count < 15; ++count) {
if (info->reset_state <= 0) {
Expand Down Expand Up @@ -1033,7 +1049,7 @@ static int aac_eh_bus_reset(struct scsi_cmnd* cmd)
}
}

pr_err("%s: Host adapter reset request. SCSI hang ?\n", AAC_DRIVERNAME);
pr_err("%s: Host bus reset request. SCSI hang ?\n", AAC_DRIVERNAME);

/*
* Check the health of the controller
Expand Down

0 comments on commit ae3dffd

Please sign in to comment.