scsi: hisi_sas: Rename HISI_SAS_{RESET -> RESETTING}_BIT

[ Upstream commit b5a9fa20e3bf59d89b5f48315a0c0c32963796ed ]

HISI_SAS_RESET_BIT means that the controller is being reset, and so the
name is a bit vague. Rename it to HISI_SAS_RESETTING_BIT.

Link: https://lore.kernel.org/r/1629799260-120116-4-git-send-email-john.garry@huawei.com
Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Stable-dep-of: d34ee535705e ("scsi: hisi_sas: Replace with standard error code return value")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index 436d174f2194bc793c4912556b75b77e76bba0ec..57be32ba0109f486315b149027b5d50450a38a51 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -35,7 +35,7 @@
 #define HISI_SAS_QUEUE_SLOTS   4096
 #define HISI_SAS_MAX_ITCT_ENTRIES 1024
 #define HISI_SAS_MAX_DEVICES HISI_SAS_MAX_ITCT_ENTRIES
-#define HISI_SAS_RESET_BIT     0
+#define HISI_SAS_RESETTING_BIT 0
 #define HISI_SAS_REJECT_CMD_BIT        1
 #define HISI_SAS_PM_BIT                2
 #define HISI_SAS_HW_FAULT_BIT  3

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 7d93783c09a508535f164fd8e21c6320eeeaf99b..7744594cd3e31e3b6a9d055d938ec6e3f539079f 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -724,7 +724,7 @@ static int hisi_sas_init_device(struct domain_device *device)
                 */
                local_phy = sas_get_local_phy(device);
                if (!scsi_is_sas_phy_local(local_phy) &&
-                   !test_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags)) {
+                   !test_bit(HISI_SAS_RESETTING_BIT, &hisi_hba->flags)) {
                        unsigned long deadline = ata_deadline(jiffies, 20000);
                        struct sata_device *sata_dev = &device->sata_dev;
                        struct ata_host *ata_host = sata_dev->ata_host;
@@ -1072,7 +1072,7 @@ static void hisi_sas_dev_gone(struct domain_device *device)
                 sas_dev->device_id, sas_dev->dev_type);
 
        down(&hisi_hba->sem);
-       if (!test_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags)) {
+       if (!test_bit(HISI_SAS_RESETTING_BIT, &hisi_hba->flags)) {
                hisi_sas_internal_task_abort(hisi_hba, device,
                                             HISI_SAS_INT_ABT_DEV, 0, true);
 
@@ -1576,7 +1576,7 @@ void hisi_sas_controller_reset_done(struct hisi_hba *hisi_hba)
        hisi_sas_reset_init_all_devices(hisi_hba);
        up(&hisi_hba->sem);
        scsi_unblock_requests(shost);
-       clear_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags);
+       clear_bit(HISI_SAS_RESETTING_BIT, &hisi_hba->flags);
 
        hisi_sas_rescan_topology(hisi_hba, hisi_hba->phy_state);
 }
@@ -1587,7 +1587,7 @@ static int hisi_sas_controller_prereset(struct hisi_hba *hisi_hba)
        if (!hisi_hba->hw->soft_reset)
                return -1;
 
-       if (test_and_set_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags))
+       if (test_and_set_bit(HISI_SAS_RESETTING_BIT, &hisi_hba->flags))
                return -1;
 
        if (hisi_sas_debugfs_enable && hisi_hba->debugfs_itct[0].itct)
@@ -1611,7 +1611,7 @@ static int hisi_sas_controller_reset(struct hisi_hba *hisi_hba)
                clear_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags);
                up(&hisi_hba->sem);
                scsi_unblock_requests(shost);
-               clear_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags);
+               clear_bit(HISI_SAS_RESETTING_BIT, &hisi_hba->flags);
                return rc;
        }
 
@@ -2251,7 +2251,7 @@ void hisi_sas_phy_down(struct hisi_hba *hisi_hba, int phy_no, int rdy,
        } else {
                struct hisi_sas_port *port  = phy->port;
 
-               if (test_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags) ||
+               if (test_bit(HISI_SAS_RESETTING_BIT, &hisi_hba->flags) ||
                    phy->in_reset) {
                        dev_info(dev, "ignore flutter phy%d down\n", phy_no);
                        return;

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
index afe639994f3dd9435cadd9b3843c340c33aea54a..862f4e8b7eb58e0907f932b256f7ec07b39bfcaa 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
@@ -1422,7 +1422,7 @@ static irqreturn_t int_bcast_v1_hw(int irq, void *p)
                goto end;
        }
 
-       if (!test_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags))
+       if (!test_bit(HISI_SAS_RESETTING_BIT, &hisi_hba->flags))
                sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD,
                                      GFP_ATOMIC);
 

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index c40588ed68a54c80b20e934247016431bb192179..a6d89a1495461923afb21ee453ff0a7c67227868 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -2831,7 +2831,7 @@ static void phy_bcast_v2_hw(int phy_no, struct hisi_hba *hisi_hba)
        hisi_sas_phy_write32(hisi_hba, phy_no, SL_RX_BCAST_CHK_MSK, 1);
        bcast_status = hisi_sas_phy_read32(hisi_hba, phy_no, RX_PRIMS_STATUS);
        if ((bcast_status & RX_BCAST_CHG_MSK) &&
-           !test_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags))
+           !test_bit(HISI_SAS_RESETTING_BIT, &hisi_hba->flags))
                sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD,
                                      GFP_ATOMIC);
        hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT0,

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index d1c07e7cb60df9d1c35e72d516dfff50e5bcdbb4..2ed787956fa80c4aa3826940cca9cc9b38f3d3ba 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -1622,7 +1622,7 @@ static irqreturn_t phy_bcast_v3_hw(int phy_no, struct hisi_hba *hisi_hba)
        hisi_sas_phy_write32(hisi_hba, phy_no, SL_RX_BCAST_CHK_MSK, 1);
        bcast_status = hisi_sas_phy_read32(hisi_hba, phy_no, RX_PRIMS_STATUS);
        if ((bcast_status & RX_BCAST_CHG_MSK) &&
-           !test_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags))
+           !test_bit(HISI_SAS_RESETTING_BIT, &hisi_hba->flags))
                sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD,
                                      GFP_ATOMIC);
        hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT0,
@@ -4935,7 +4935,7 @@ static void hisi_sas_reset_prepare_v3_hw(struct pci_dev *pdev)
        int rc;
 
        dev_info(dev, "FLR prepare\n");
-       set_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags);
+       set_bit(HISI_SAS_RESETTING_BIT, &hisi_hba->flags);
        hisi_sas_controller_reset_prepare(hisi_hba);
 
        rc = disable_host_v3_hw(hisi_hba);
@@ -4981,7 +4981,7 @@ static int _suspend_v3_hw(struct device *device)
                return -ENODEV;
        }
 
-       if (test_and_set_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags))
+       if (test_and_set_bit(HISI_SAS_RESETTING_BIT, &hisi_hba->flags))
                return -1;
 
        scsi_block_requests(shost);
@@ -4992,7 +4992,7 @@ static int _suspend_v3_hw(struct device *device)
        if (rc) {
                dev_err(dev, "PM suspend: disable host failed rc=%d\n", rc);
                clear_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags);
-               clear_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags);
+               clear_bit(HISI_SAS_RESETTING_BIT, &hisi_hba->flags);
                scsi_unblock_requests(shost);
                return rc;
        }
@@ -5031,7 +5031,7 @@ static int _resume_v3_hw(struct device *device)
        }
        phys_init_v3_hw(hisi_hba);
        sas_resume_ha(sha);
-       clear_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags);
+       clear_bit(HISI_SAS_RESETTING_BIT, &hisi_hba->flags);
 
        return 0;
 }