Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / drivers / scsi / hisi_sas / hisi_sas_v2_hw.c

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index 6c787ebdebee52956b68849b5ac3730fd51f7705..1b214450dcb5df485c89ecfe723957b4d3ae55ae 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -207,6 +207,8 @@
 #define TXID_AUTO                      (PORT_BASE + 0xb8)
 #define TXID_AUTO_CT3_OFF              1
 #define TXID_AUTO_CT3_MSK              (0x1 << TXID_AUTO_CT3_OFF)
+#define TX_HARDRST_OFF          2
+#define TX_HARDRST_MSK          (0x1 << TX_HARDRST_OFF)
 #define RX_IDAF_DWORD0                 (PORT_BASE + 0xc4)
 #define RX_IDAF_DWORD1                 (PORT_BASE + 0xc8)
 #define RX_IDAF_DWORD2                 (PORT_BASE + 0xcc)
@@ -334,6 +336,11 @@
 #define ITCT_HDR_MCR_MSK               (0xf << ITCT_HDR_MCR_OFF)
 #define ITCT_HDR_VLN_OFF               9
 #define ITCT_HDR_VLN_MSK               (0xf << ITCT_HDR_VLN_OFF)
+#define ITCT_HDR_SMP_TIMEOUT_OFF       16
+#define ITCT_HDR_SMP_TIMEOUT_8US       1
+#define ITCT_HDR_SMP_TIMEOUT           (ITCT_HDR_SMP_TIMEOUT_8US * \
+                                        250) /* 2ms */
+#define ITCT_HDR_AWT_CONTINUE_OFF      25
 #define ITCT_HDR_PORT_ID_OFF           28
 #define ITCT_HDR_PORT_ID_MSK           (0xf << ITCT_HDR_PORT_ID_OFF)
 /* qw2 */
@@ -696,6 +703,8 @@ static void setup_itct_v2_hw(struct hisi_hba *hisi_hba,
        qw0 |= ((1 << ITCT_HDR_VALID_OFF) |
                (device->linkrate << ITCT_HDR_MCR_OFF) |
                (1 << ITCT_HDR_VLN_OFF) |
+               (ITCT_HDR_SMP_TIMEOUT << ITCT_HDR_SMP_TIMEOUT_OFF) |
+               (1 << ITCT_HDR_AWT_CONTINUE_OFF) |
                (port->id << ITCT_HDR_PORT_ID_OFF));
        itct->qw0 = cpu_to_le64(qw0);
 
@@ -705,7 +714,7 @@ static void setup_itct_v2_hw(struct hisi_hba *hisi_hba,
 
        /* qw2 */
        if (!dev_is_sata(device))
-               itct->qw2 = cpu_to_le64((500ULL << ITCT_HDR_INLT_OFF) |
+               itct->qw2 = cpu_to_le64((5000ULL << ITCT_HDR_INLT_OFF) |
                                        (0x1ULL << ITCT_HDR_BITLT_OFF) |
                                        (0x32ULL << ITCT_HDR_MCTLT_OFF) |
                                        (0x1ULL << ITCT_HDR_RTOLT_OFF));
@@ -714,7 +723,7 @@ static void setup_itct_v2_hw(struct hisi_hba *hisi_hba,
 static void free_device_v2_hw(struct hisi_hba *hisi_hba,
                              struct hisi_sas_device *sas_dev)
 {
-       u64 qw0, dev_id = sas_dev->device_id;
+       u64 dev_id = sas_dev->device_id;
        struct device *dev = &hisi_hba->pdev->dev;
        struct hisi_sas_itct *itct = &hisi_hba->itct[dev_id];
        u32 reg_val = hisi_sas_read32(hisi_hba, ENT_INT_SRC3);
@@ -738,8 +747,7 @@ static void free_device_v2_hw(struct hisi_hba *hisi_hba,
                        dev_dbg(dev, "got clear ITCT done interrupt\n");
 
                        /* invalid the itct state*/
-                       qw0 = cpu_to_le64(itct->qw0);
-                       qw0 &= ~(1 << ITCT_HDR_VALID_OFF);
+                       memset(itct, 0, sizeof(struct hisi_sas_itct));
                        hisi_sas_write32(hisi_hba, ENT_INT_SRC3,
                                         ENT_INT_SRC3_ITC_INT_MSK);
 
@@ -1072,14 +1080,21 @@ static void stop_phy_v2_hw(struct hisi_hba *hisi_hba, int phy_no)
 
 static void phy_hard_reset_v2_hw(struct hisi_hba *hisi_hba, int phy_no)
 {
+       struct hisi_sas_phy *phy = &hisi_hba->phy[phy_no];
+       u32 txid_auto;
+
        stop_phy_v2_hw(hisi_hba, phy_no);
+       if (phy->identify.device_type == SAS_END_DEVICE) {
+               txid_auto = hisi_sas_phy_read32(hisi_hba, phy_no, TXID_AUTO);
+               hisi_sas_phy_write32(hisi_hba, phy_no, TXID_AUTO,
+                                       txid_auto | TX_HARDRST_MSK);
+       }
        msleep(100);
        start_phy_v2_hw(hisi_hba, phy_no);
 }
 
-static void start_phys_v2_hw(unsigned long data)
+static void start_phys_v2_hw(struct hisi_hba *hisi_hba)
 {
-       struct hisi_hba *hisi_hba = (struct hisi_hba *)data;
        int i;
 
        for (i = 0; i < hisi_hba->n_phy; i++)
@@ -1088,10 +1103,7 @@ static void start_phys_v2_hw(unsigned long data)
 
 static void phys_init_v2_hw(struct hisi_hba *hisi_hba)
 {
-       struct timer_list *timer = &hisi_hba->timer;
-
-       setup_timer(timer, start_phys_v2_hw, (unsigned long)hisi_hba);
-       mod_timer(timer, jiffies + HZ);
+       start_phys_v2_hw(hisi_hba);
 }
 
 static void sl_notify_v2_hw(struct hisi_hba *hisi_hba, int phy_no)
@@ -1818,8 +1830,6 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot,
        }
 
 out:
-       if (sas_dev)
-               atomic64_dec(&sas_dev->running_req);
 
        hisi_sas_slot_task_free(hisi_hba, task, slot);
        sts = ts->stat;