scsi: hisi_sas: modify hard reset for directed-attached disk

Correctly set registers in v2 for root PHY hardreset for directly
attached disk.

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

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index 93fcedaa583ff88a5dfe0b68281b5a70bb9b7333..2e776b70be8fd9d91ab809337daaf4259f6f8380 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)
@@ -1078,7 +1080,15 @@ 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);
 }