[PATCH net-next 01/19] net: hns: bug fix of ge reset sequence

Path	csiph.com!news.freedyn.net!aioe.org!bofh.it!news.nic.it!robomod
From	Yisen Zhuang <Yisen.Zhuang@huawei.com>
Newsgroups	linux.kernel
Subject	[PATCH net-next 01/19] net: hns: bug fix of ge reset sequence
Date	Tue, 21 Jun 2016 05:50:01 +0200
Message-ID	<rMkRj-qs-3@gated-at.bofh.it> (permalink)
References	<rMkHD-l2-5@gated-at.bofh.it>
X-Mailer	git-send-email 1.9.1
MIME-Version	1.0
Content-Type	text/plain
X-Originating-IP	[10.67.212.75]
X-Cfilter-Loop	Reflected
X-Mirapoint-Virus-Rapid-Raw	score=unknown(0), refid=str=0001.0A090204.5768B6A6.0001,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32
X-Mirapoint-Loop-ID	3d731ac5b0470e0888b2d3b6c90c1235
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	32
Organization	linux.* mail to news gateway
X-Original-Cc	<liguozhu@huawei.com>, <huangdaode@hisilicon.com>, <arnd@arndb.de>, <andriy.shevchenko@linux.intel.com>, <andrew@lunn.ch>, <geliangtang@163.com>, <ivecera@redhat.com>, <fengguang.wu@intel.com>, <charles.chenxin@huawei.com>, <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linuxarm@huawei.com>
X-Original-Date	Tue, 21 Jun 2016 11:56:21 +0800
X-Original-Message-ID	<1466481399-70080-2-git-send-email-Yisen.Zhuang@huawei.com>
X-Original-References	<1466481399-70080-1-git-send-email-Yisen.Zhuang@huawei.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1427237

Show key headers only | View raw

From: Qianqian Xie <xieqianqian@huawei.com>

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>
---
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
index 96cb628..09e60d6 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,
-- 
1.9.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH net-next 01/19] net: hns: bug fix of ge reset sequence Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
  Re: [PATCH net-next 01/19] net: hns: bug fix of ge reset sequence Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-06-21 12:40 +0200
    Re: [PATCH net-next 01/19] net: hns: bug fix of ge reset sequence Yisen Zhuang <Yisen.zhuang@huawei.com> - 2016-06-22 03:40 +0200

csiph-web