net: hns: bug fix of ge reset sequence

The bit fileds of PPE reset register are different between HNS v1 and
HNS v2, but the current procedure just only match HNS v1. Here is a
patch to fix it.

Signed-off-by: Kejian Yan <yankejian@huawei.com>
Signed-off-by: Qianqian Xie <xieqianqian@huawei.com>
Signed-off-by: Yisen Zhuang <Yisen.Zhuang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
index 96cb628a7c5f626d6f764984d0b56a10c296d237..09e60d6e3c94f6acf65cbd9012fe36ac9d3535ae 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
@@ -271,7 +271,11 @@ static void hns_dsaf_ge_srst_by_port(struct dsaf_device *dsaf_dev, u32 port,
                }
        } else {
                reg_val_1 = 0x15540 << dsaf_dev->reset_offset;
-               reg_val_2 = 0x100 << dsaf_dev->reset_offset;
+
+               if (AE_IS_VER1(dsaf_dev->dsaf_ver))
+                       reg_val_2 = 0x100 << dsaf_dev->reset_offset;
+               else
+                       reg_val_2 = 0x40 << dsaf_dev->reset_offset;
 
                if (!dereset) {
                        dsaf_write_sub(dsaf_dev, DSAF_SUB_SC_GE_RESET_REQ1_REG,