hisi_sas: add v2 phy down handler

Signed-off-by: John Garry <john.garry@huawei.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

1 files changed, 49 insertions, 0 deletions

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index a7b83bd8759e..35ce7b6230d2 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -628,6 +628,29 @@ static void sl_notify_v2_hw(struct hisi_hba *hisi_hba, int phy_no)
         hisi_sas_phy_write32(hisi_hba, phy_no, SL_CONTROL, sl_control);
 }
 
+static int get_wideport_bitmap_v2_hw(struct hisi_hba *hisi_hba, int port_id)
+{
+        int i, bitmap = 0;
+        u32 phy_port_num_ma = hisi_sas_read32(hisi_hba, PHY_PORT_NUM_MA);
+        u32 phy_state = hisi_sas_read32(hisi_hba, PHY_STATE);
+
+        for (i = 0; i < (hisi_hba->n_phy < 9 ? hisi_hba->n_phy : 8); i++)
+                if (phy_state & 1 << i)
+                        if (((phy_port_num_ma >> (i * 4)) & 0xf) == port_id)
+                                bitmap |= 1 << i;
+
+        if (hisi_hba->n_phy == 9) {
+                u32 port_state = hisi_sas_read32(hisi_hba, PORT_STATE);
+
+                if (phy_state & 1 << 8)
+                        if (((port_state & PORT_STATE_PHY8_PORT_NUM_MSK) >>
+                             PORT_STATE_PHY8_PORT_NUM_OFF) == port_id)
+                                bitmap |= 1 << 9;
+        }
+
+        return bitmap;
+}
+
 static int phy_up_v2_hw(int phy_no, struct hisi_hba *hisi_hba)
 {
         int i, res = 0;
@@ -705,6 +728,25 @@ end:
         return res;
 }
 
+static int phy_down_v2_hw(int phy_no, struct hisi_hba *hisi_hba)
+{
+        int res = 0;
+        u32 phy_cfg, phy_state;
+
+        hisi_sas_phy_write32(hisi_hba, phy_no, PHYCTRL_NOT_RDY_MSK, 1);
+
+        phy_cfg = hisi_sas_phy_read32(hisi_hba, phy_no, PHY_CFG);
+
+        phy_state = hisi_sas_read32(hisi_hba, PHY_STATE);
+
+        hisi_sas_phy_down(hisi_hba, phy_no, (phy_state & 1 << phy_no) ? 1 : 0);
+
+        hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT0, CHL_INT0_NOT_RDY_MSK);
+        hisi_sas_phy_write32(hisi_hba, phy_no, PHYCTRL_NOT_RDY_MSK, 0);
+
+        return res;
+}
+
 static irqreturn_t int_phy_updown_v2_hw(int irq_no, void *p)
 {
         struct hisi_hba *hisi_hba = p;
@@ -726,6 +768,12 @@ static irqreturn_t int_phy_updown_v2_hw(int irq_no, void *p)
                                         goto end;
                                 }
 
+                        if (irq_value & CHL_INT0_NOT_RDY_MSK)
+                                /* phy down */
+                                if (phy_down_v2_hw(phy_no, hisi_hba)) {
+                                        res = IRQ_NONE;
+                                        goto end;
+                                }
                 }
                 irq_msk >>= 1;
                 phy_no++;
@@ -796,6 +844,7 @@ static int hisi_sas_v2_init(struct hisi_hba *hisi_hba)
 static const struct hisi_sas_hw hisi_sas_v2_hw = {
         .hw_init = hisi_sas_v2_init,
         .sl_notify = sl_notify_v2_hw,
+        .get_wideport_bitmap = get_wideport_bitmap_v2_hw,
         .max_command_entries = HISI_SAS_COMMAND_ENTRIES_V2_HW,
         .complete_hdr_size = sizeof(struct hisi_sas_complete_v2_hdr),
 };