scsi: hisi_sas: Wait for phyup in hisi_sas_control_phy()

When issuing a hardreset/linkreset/phy_set_linkrate from sysfs, the phy
will be disabled and re-enabled for the directly attached scenario.

It takes some time for the phy to come back up after re-enabling the phy.
If the controller becomes suspended while waiting for the phy to come back,
the phy up may be lost (along with the disk).

To solve this problem, wait for the phy up to occur with a timeout. Indeed
this is already done in hisi_sas_debug_I_T_nexus_reset() for local phys, so
just relocate the functionality to hisi_sas_control_phy().

Since the HA workqueue is drained when suspending the controller, and the
phy control function is called from the same workqueue, we can guarantee
that the controller will not be suspended during this period.

Link: https://lore.kernel.org/r/1634041588-74824-3-git-send-email-john.garry@huawei.com
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 0835ba7c0ac21c1070772256aa29296f34db1eb8..5b091388c0955e43d6a2284c5607d5d7fbd79dfc 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -1146,9 +1146,17 @@ static int hisi_sas_phy_set_linkrate(struct hisi_hba *hisi_hba, int phy_no,
 static int hisi_sas_control_phy(struct asd_sas_phy *sas_phy, enum phy_func func,
                                void *funcdata)
 {
+       struct hisi_sas_phy *phy = container_of(sas_phy,
+                       struct hisi_sas_phy, sas_phy);
        struct sas_ha_struct *sas_ha = sas_phy->ha;
        struct hisi_hba *hisi_hba = sas_ha->lldd_ha;
+       struct device *dev = hisi_hba->dev;
+       DECLARE_COMPLETION_ONSTACK(completion);
        int phy_no = sas_phy->id;
+       u8 sts = phy->phy_attached;
+       int ret = 0;
+
+       phy->reset_completion = &completion;
 
        switch (func) {
        case PHY_FUNC_HARD_RESET:
@@ -1163,21 +1171,35 @@ static int hisi_sas_control_phy(struct asd_sas_phy *sas_phy, enum phy_func func,
 
        case PHY_FUNC_DISABLE:
                hisi_sas_phy_enable(hisi_hba, phy_no, 0);
-               break;
+               goto out;
 
        case PHY_FUNC_SET_LINK_RATE:
-               return hisi_sas_phy_set_linkrate(hisi_hba, phy_no, funcdata);
+               ret = hisi_sas_phy_set_linkrate(hisi_hba, phy_no, funcdata);
+               break;
+
        case PHY_FUNC_GET_EVENTS:
                if (hisi_hba->hw->get_events) {
                        hisi_hba->hw->get_events(hisi_hba, phy_no);
-                       break;
+                       goto out;
                }
                fallthrough;
        case PHY_FUNC_RELEASE_SPINUP_HOLD:
        default:
-               return -EOPNOTSUPP;
+               ret = -EOPNOTSUPP;
+               goto out;
        }
-       return 0;
+
+       if (sts && !wait_for_completion_timeout(&completion, 2 * HZ)) {
+               dev_warn(dev, "phy%d wait phyup timed out for func %d\n",
+                        phy_no, func);
+               if (phy->in_reset)
+                       ret = -ETIMEDOUT;
+       }
+
+out:
+       phy->reset_completion = NULL;
+
+       return ret;
 }
 
 static void hisi_sas_task_done(struct sas_task *task)
@@ -1783,7 +1805,6 @@ static int hisi_sas_debug_I_T_nexus_reset(struct domain_device *device)
        struct hisi_sas_device *sas_dev = device->lldd_dev;
        struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);
        struct sas_ha_struct *sas_ha = &hisi_hba->sha;
-       DECLARE_COMPLETION_ONSTACK(phyreset);
        int rc, reset_type;
 
        if (!local_phy->enabled) {
@@ -1796,8 +1817,11 @@ static int hisi_sas_debug_I_T_nexus_reset(struct domain_device *device)
                        sas_ha->sas_phy[local_phy->number];
                struct hisi_sas_phy *phy =
                        container_of(sas_phy, struct hisi_sas_phy, sas_phy);
+               unsigned long flags;
+
+               spin_lock_irqsave(&phy->lock, flags);
                phy->in_reset = 1;
-               phy->reset_completion = &phyreset;
+               spin_unlock_irqrestore(&phy->lock, flags);
        }
 
        reset_type = (sas_dev->dev_status == HISI_SAS_DEV_INIT ||
@@ -1811,17 +1835,14 @@ static int hisi_sas_debug_I_T_nexus_reset(struct domain_device *device)
                        sas_ha->sas_phy[local_phy->number];
                struct hisi_sas_phy *phy =
                        container_of(sas_phy, struct hisi_sas_phy, sas_phy);
-               int ret = wait_for_completion_timeout(&phyreset,
-                                               I_T_NEXUS_RESET_PHYUP_TIMEOUT);
                unsigned long flags;
 
                spin_lock_irqsave(&phy->lock, flags);
-               phy->reset_completion = NULL;
                phy->in_reset = 0;
                spin_unlock_irqrestore(&phy->lock, flags);
 
                /* report PHY down if timed out */
-               if (!ret)
+               if (rc == -ETIMEDOUT)
                        hisi_sas_phy_down(hisi_hba, sas_phy->id, 0, GFP_KERNEL);
        } else if (sas_dev->dev_status != HISI_SAS_DEV_INIT) {
                /*

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
index 51e7d12f5053c290edaba01ad0ff112d47f4dd04..b4951ff9ca51c596ef7770079a70f9cfd7fde548 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
@@ -1327,7 +1327,6 @@ static irqreturn_t int_phyup_v1_hw(int irq_no, void *p)
        u32 *frame_rcvd = (u32 *)sas_phy->frame_rcvd;
        struct sas_identify_frame *id = (struct sas_identify_frame *)frame_rcvd;
        irqreturn_t res = IRQ_HANDLED;
-       unsigned long flags;
 
        irq_value = hisi_sas_phy_read32(hisi_hba, phy_no, CHL_INT2);
        if (!(irq_value & CHL_INT2_SL_PHY_ENA_MSK)) {
@@ -1380,15 +1379,9 @@ static irqreturn_t int_phyup_v1_hw(int irq_no, void *p)
                phy->identify.target_port_protocols =
                        SAS_PROTOCOL_SMP;
        hisi_sas_notify_phy_event(phy, HISI_PHYE_PHY_UP);
-
-       spin_lock_irqsave(&phy->lock, flags);
-       if (phy->reset_completion) {
-               phy->in_reset = 0;
-               complete(phy->reset_completion);
-       }
-       spin_unlock_irqrestore(&phy->lock, flags);
-
 end:
+       if (phy->reset_completion)
+               complete(phy->reset_completion);
        hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT2,
                             CHL_INT2_SL_PHY_ENA_MSK);
 

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index 741a62e6bf77d67c4a8596414b54b25f53265489..45eb0b98d00bf6efc883b0c4e79ca1463faf1123 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -2641,7 +2641,6 @@ static int phy_up_v2_hw(int phy_no, struct hisi_hba *hisi_hba)
        struct device *dev = hisi_hba->dev;
        u32 *frame_rcvd = (u32 *)sas_phy->frame_rcvd;
        struct sas_identify_frame *id = (struct sas_identify_frame *)frame_rcvd;
-       unsigned long flags;
 
        hisi_sas_phy_write32(hisi_hba, phy_no, PHYCTRL_PHY_ENA_MSK, 1);
 
@@ -2696,14 +2695,9 @@ static int phy_up_v2_hw(int phy_no, struct hisi_hba *hisi_hba)
                        set_link_timer_quirk(hisi_hba);
        }
        hisi_sas_notify_phy_event(phy, HISI_PHYE_PHY_UP);
-       spin_lock_irqsave(&phy->lock, flags);
-       if (phy->reset_completion) {
-               phy->in_reset = 0;
-               complete(phy->reset_completion);
-       }
-       spin_unlock_irqrestore(&phy->lock, flags);
-
 end:
+       if (phy->reset_completion)
+               complete(phy->reset_completion);
        hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT0,
                             CHL_INT0_SL_PHY_ENABLE_MSK);
        hisi_sas_phy_write32(hisi_hba, phy_no, PHYCTRL_PHY_ENA_MSK, 0);
@@ -3204,7 +3198,6 @@ static irqreturn_t sata_int_v2_hw(int irq_no, void *p)
        u32 ent_tmp, ent_msk, ent_int, port_id, link_rate, hard_phy_linkrate;
        irqreturn_t res = IRQ_HANDLED;
        u8 attached_sas_addr[SAS_ADDR_SIZE] = {0};
-       unsigned long flags;
        int phy_no, offset;
 
        del_timer(&phy->timer);
@@ -3280,12 +3273,8 @@ static irqreturn_t sata_int_v2_hw(int irq_no, void *p)
        phy->identify.target_port_protocols = SAS_PROTOCOL_SATA;
        hisi_sas_notify_phy_event(phy, HISI_PHYE_PHY_UP);
 
-       spin_lock_irqsave(&phy->lock, flags);
-       if (phy->reset_completion) {
-               phy->in_reset = 0;
+       if (phy->reset_completion)
                complete(phy->reset_completion);
-       }
-       spin_unlock_irqrestore(&phy->lock, flags);
 end:
        hisi_sas_write32(hisi_hba, ENT_INT_SRC1 + offset, ent_tmp);
        hisi_sas_write32(hisi_hba, ENT_INT_SRC_MSK1 + offset, ent_msk);

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 114a596545252f1605bb284150b0193e044d8797..2082b066aca7b31f5001231cb42ac28e49115135 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -1482,7 +1482,6 @@ static irqreturn_t phy_up_v3_hw(int phy_no, struct hisi_hba *hisi_hba)
        struct hisi_sas_phy *phy = &hisi_hba->phy[phy_no];
        struct asd_sas_phy *sas_phy = &phy->sas_phy;
        struct device *dev = hisi_hba->dev;
-       unsigned long flags;
 
        del_timer(&phy->timer);
        hisi_sas_phy_write32(hisi_hba, phy_no, PHYCTRL_PHY_ENA_MSK, 1);
@@ -1564,13 +1563,9 @@ static irqreturn_t phy_up_v3_hw(int phy_no, struct hisi_hba *hisi_hba)
        phy->phy_attached = 1;
        hisi_sas_notify_phy_event(phy, HISI_PHYE_PHY_UP);
        res = IRQ_HANDLED;
-       spin_lock_irqsave(&phy->lock, flags);
-       if (phy->reset_completion) {
-               phy->in_reset = 0;
-               complete(phy->reset_completion);
-       }
-       spin_unlock_irqrestore(&phy->lock, flags);
 end:
+       if (phy->reset_completion)
+               complete(phy->reset_completion);
        hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT0,
                             CHL_INT0_SL_PHY_ENABLE_MSK);
        hisi_sas_phy_write32(hisi_hba, phy_no, PHYCTRL_PHY_ENA_MSK, 0);