| Message ID | dae9db6e4507011bffe3beef9528c3dd7ee363a9.camel@HansenPartnership.com |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL] SCSI fixes for 6.1-rc3 | expand |
The pull request you sent on Sat, 14 Jan 2023 08:48:52 -0500:
> git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8e768130857d08a6765f3287ad3f89c1b7d50e53
Thank you!
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index e9c2d306ed87..8c038ccf1c09 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -704,7 +704,7 @@ static int hisi_sas_init_device(struct domain_device *device) int_to_scsilun(0, &lun); while (retry-- > 0) { - rc = sas_clear_task_set(device, lun.scsi_lun); + rc = sas_abort_task_set(device, lun.scsi_lun); if (rc == TMF_RESP_FUNC_COMPLETE) { hisi_sas_release_task(hisi_hba, device); break; @@ -1316,7 +1316,7 @@ static void hisi_sas_refresh_port_id(struct hisi_hba *hisi_hba) device->linkrate = phy->sas_phy.linkrate; hisi_hba->hw->setup_itct(hisi_hba, sas_dev); - } else + } else if (!port->port_attached) port->id = 0xff; } }
Two minor fixes in the hisi_sas driver which only impact enterprise style multi-expander and shared disk situations and no core changes. The patch is available here: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes The short changelog is: Xingui Yang (1): scsi: hisi_sas: Use abort task set to reset SAS disks when discovered Yihang Li (1): scsi: hisi_sas: Set a port invalid only if there are no devices attached when refreshing port id And the diffstat: drivers/scsi/hisi_sas/hisi_sas_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) With full diff below James ---