diff options
| author |   Qianqian Xie <xieqianqian@huawei.com> | 2016-06-21 11:56:21 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-06-21 04:51:54 -0400 |
| commit | 0b03fd8528f7bf00b5c058212d69f92cf123bf30 (patch) | |
| tree | 2f03e7c83cc604cd6d4154883faab325fb3fc9f9 /drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | |
| parent | Merge branch 'dsa-mv88e6xxx-probe-compatible' (diff) | |
| download | linux-dev-0b03fd8528f7bf00b5c058212d69f92cf123bf30.tar.xz linux-dev-0b03fd8528f7bf00b5c058212d69f92cf123bf30.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c index 96cb628a7c5f..09e60d6e3c94 100644 --- 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, |