scsi: hisi_sas: modify hisi_sas_dev_gone() for reset

Do a couple of changes for when HISI_SAS_RESET_BIT is set for HBA:

 - Clearing ITCT is not necessary

 - Remove internal abort as it will fail during reset

Flag sas_dev->dev_type is kept as SAS_PHY_UNUSED.

Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 64d51a839187a57d6b7d9c01aac251e1faf035d0..e4b30922a75d3292c376d4fb20ba7db2b65e3d12 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -738,17 +738,19 @@ static void hisi_sas_dev_gone(struct domain_device *device)
        dev_info(dev, "found dev[%d:%x] is gone\n",
                 sas_dev->device_id, sas_dev->dev_type);
 
-       hisi_sas_internal_task_abort(hisi_hba, device,
+       if (!test_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags)) {
+               hisi_sas_internal_task_abort(hisi_hba, device,
                                     HISI_SAS_INT_ABT_DEV, 0);
 
-       hisi_sas_dereg_device(hisi_hba, device);
+               hisi_sas_dereg_device(hisi_hba, device);
+
+               hisi_hba->hw->clear_itct(hisi_hba, sas_dev);
+               device->lldd_dev = NULL;
+               memset(sas_dev, 0, sizeof(*sas_dev));
+       }
 
-       hisi_hba->hw->clear_itct(hisi_hba, sas_dev);
        if (hisi_hba->hw->free_device)
                hisi_hba->hw->free_device(sas_dev);
-
-       device->lldd_dev = NULL;
-       memset(sas_dev, 0, sizeof(*sas_dev));
        sas_dev->dev_type = SAS_PHY_UNUSED;
 }