scsi: hisi_sas: fix phy8 linkrate calculation in phy_up_v2_hw()
authorJohn Garry <john.garry@huawei.com>
Tue, 6 Sep 2016 15:36:17 +0000 (23:36 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 14 Sep 2016 16:54:17 +0000 (12:54 -0400)
In function phy_up_v2_hw(), we needlessly recalculate the phy linkrate
for all phys, and the calculation is incorrect for phy8, so remove this
code.

Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

index aca2b80a54b72d341053cc800f08b42302782c3c..ae44443a1288f708602ac1402495ed9038331090 100644 (file)
@@ -1876,9 +1876,6 @@ static int phy_up_v2_hw(int phy_no, struct hisi_hba *hisi_hba)
                frame_rcvd[i] = __swab32(idaf);
        }
 
-       /* Get the linkrates */
-       link_rate = hisi_sas_read32(hisi_hba, PHY_CONN_RATE);
-       link_rate = (link_rate >> (phy_no * 4)) & 0xf;
        sas_phy->linkrate = link_rate;
        hard_phy_linkrate = hisi_sas_phy_read32(hisi_hba, phy_no,
                                                HARD_PHY_LINKRATE);