Commit 0d2836cb authored by Yihang Li's avatar Yihang Li Committed by JiangShui
Browse files

scsi: hisi_sas: Rollback some operations if FLR failed 

driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8IL6H


CVE: NA

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

We obtain the semaphore and set HISI_SAS_RESETTING_BIT in
hisi_sas_reset_prepare_v3_hw(), block the scsi host and set
HISI_SAS_REJECT_CMD_BIT in hisi_sas_controller_reset_prepare(),
released them in hisi_sas_controller_reset_done(). However, if the HW
reset failure in FLR results in early return, the semaphore and flag bits
will not be release.

Rollback some operations including clearing flags / releasing semaphore
when FLR is failed.

Fixes: e5ea4801 ("scsi: hisi_sas: Implement handlers of PCIe FLR for v3 hw")
Signed-off-by: default avatarYihang Li <liyihang9@huawei.com>
Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: default avatarxiabing <xiabing12@h-partners.com>
parent 85bbe13b

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+5 −0
Original line number Diff line number Diff line
@@ -5042,6 +5042,7 @@ static void hisi_sas_reset_done_v3_hw(struct pci_dev *pdev) 
{

	struct sas_ha_struct *sha = pci_get_drvdata(pdev);

	struct hisi_hba *hisi_hba = sha->lldd_ha;

	struct Scsi_Host *shost = hisi_hba->shost;

	struct device *dev = hisi_hba->dev;

	int rc;
@@ -5050,6 +5051,10 @@ static void hisi_sas_reset_done_v3_hw(struct pci_dev *pdev) 
	rc = hw_init_v3_hw(hisi_hba);

	if (rc) {

		dev_err(dev, "FLR: hw init failed rc=%d\n", rc);

		clear_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags);

		scsi_unblock_requests(shost);

		clear_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags);

		up(&hisi_hba->sem);

		return;

	}