Commit fec3e16d authored by Luo Jiaxing's avatar Luo Jiaxing Committed by Yongqiang Liu
Browse files

scsi: hisi_sas: Don't fail IT nexus reset for Open Reject timeout 

mainline inclusion
from mainline-v5.2-rc1
commit 246ea3c0
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I538BF


CVE: NA

---------------------------------------------------------

Currently we call hisi_sas_softreset_ata_disk() in
hisi_sas_I_T_nexus_reset().

If this fails for open reject reason, there is no reason to fail the IT
nexus reset, so only fail for TMF_RESP_FUNC_FAILED.

Some other strings spilled over multiple lines are reunited.

Signed-off-by: default avatarLuo Jiaxing <luojiaxing@huawei.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarXingui Yang <yangxingui@huawei.com>
Reviewed-by: default avatarkang fenglong <kangfenglong@huawei.com>
Signed-off-by: default avatarYongqiang Liu <liuyongqiang13@huawei.com>
parent da51b55e

drivers/scsi/hisi_sas/hisi_sas_main.c

+15 −11
Original line number Diff line number Diff line
@@ -1277,8 +1277,7 @@ static int hisi_sas_exec_internal_tmf_task(struct domain_device *device, 
			/* no error, but return the number of bytes of

			 * underrun

			 */

			dev_warn(dev, "abort tmf: task to dev %016llx "

				 "resp: 0x%x sts 0x%x underrun\n",

			dev_warn(dev, "abort tmf: task to dev %016llx resp: 0x%x sts 0x%x underrun\n",

				 SAS_ADDR(device->sas_addr),

				 task->task_status.resp,

				 task->task_status.stat);
@@ -1293,10 +1292,16 @@ static int hisi_sas_exec_internal_tmf_task(struct domain_device *device, 
			break;

		}



		dev_warn(dev, "abort tmf: task to dev "

			 "%016llx resp: 0x%x status 0x%x\n",

			 SAS_ADDR(device->sas_addr), task->task_status.resp,

		if (task->task_status.resp == SAS_TASK_COMPLETE &&

		    task->task_status.stat == SAS_OPEN_REJECT) {

			dev_warn(dev, "abort tmf: open reject failed\n");

			res = -EIO;

		} else {

			dev_warn(dev, "abort tmf: task to dev %016llx resp: 0x%x status 0x%x\n",

				 SAS_ADDR(device->sas_addr),

				 task->task_status.resp,

				 task->task_status.stat);

		}

		sas_free_task(task);

		task = NULL;

	}
@@ -1840,7 +1845,8 @@ static int hisi_sas_I_T_nexus_reset(struct domain_device *device) 
	if (dev_is_sata(device)) {

		rc = hisi_sas_softreset_ata_disk(device);

		if (rc)

			return TMF_RESP_FUNC_FAILED;

			dev_err(dev, "I_T nexus reset: softreset failed  (%d)\n",

				rc);

	}



	rc = hisi_sas_debug_I_T_nexus_reset(device);
@@ -2124,10 +2130,8 @@ _hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba, 
	}



exit:

	dev_dbg(dev, "internal task abort: task to dev %016llx task=%pK "

		"resp: 0x%x sts 0x%x\n",

		SAS_ADDR(device->sas_addr),

		task,

	dev_dbg(dev, "internal task abort: task to dev %016llx task=%p resp: 0x%x sts 0x%x\n",

		SAS_ADDR(device->sas_addr), task,

		task->task_status.resp, /* 0 is complete, -1 is undelivered */

		task->task_status.stat);

	sas_free_task(task);