Commit d1562dcc authored by Luo Jiaxing's avatar Luo Jiaxing Committed by Zheng Zengkai
Browse files

scsi: hisi_sas: Print SATA device SAS address for soft reset failure 

mainline inclusion
from mainline-master
commit f4df167a
category: bugfix
bugzilla: 175270
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f4df167ad5a2274c12680ba3e7d816d32d1fc375

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

Add (pseudo) SAS address for ATA software reset failure log to assist in
debugging.

Link: https://lore.kernel.org/r/1617709711-195853-7-git-send-email-john.garry@huawei.com


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>
Reviewed-by: default avatarOuyangdelong <ouyangdelong@huawei.com>
Signed-off-by: default avatarNifujia <nifujia1@hisilicon.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 5b667ffb

drivers/scsi/hisi_sas/hisi_sas_main.c

+4 −2
Original line number Diff line number Diff line
@@ -1341,10 +1341,12 @@ static int hisi_sas_softreset_ata_disk(struct domain_device *device) 
			rc = hisi_sas_exec_internal_tmf_task(device, fis,

							     s, NULL);

			if (rc != TMF_RESP_FUNC_COMPLETE)

				dev_err(dev, "ata disk de-reset failed\n");

				dev_err(dev, "ata disk %016llx de-reset failed\n",

					SAS_ADDR(device->sas_addr));

		}

	} else {

		dev_err(dev, "ata disk reset failed\n");

		dev_err(dev, "ata disk %016llx reset failed\n",

			SAS_ADDR(device->sas_addr));

	}



	if (rc == TMF_RESP_FUNC_COMPLETE)