public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: Salil Mehta <salil.mehta@huawei.com>
To: <davem@davemloft.net>
Cc: <salil.mehta@huawei.com>, <yisen.zhuang@huawei.com>,
	<mehta.salil.lnk@gmail.com>, <netdev@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>, <linuxarm@huawei.com>,
	lipeng <lipeng321@huawei.com>,
	JinchuanTian <tianjinchuan1@huawei.com>
Subject: [PATCH V2 net-next 02/18] net: hns: Modify GMAC init TX threshold value
Date: Fri, 31 Mar 2017 12:20:16 +0100	[thread overview]
Message-ID: <20170331112032.4692-3-salil.mehta@huawei.com> (raw)
In-Reply-To: <20170331112032.4692-1-salil.mehta@huawei.com>

From: lipeng <lipeng321@huawei.com>

This patch reduces GMAC TX threshold value to avoid gmac
hang-up with speed 100M/duplex half.

Signed-off-by: lipeng <lipeng321@huawei.com>
Signed-off-by: JinchuanTian <tianjinchuan1@huawei.com>
Reviewed-by: Yisen Zhuang <yisen.zhuang@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
---
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 6 ++++++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h  | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c
index 3382441..a8dbe00 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c
@@ -325,6 +325,12 @@ static void hns_gmac_init(void *mac_drv)
 	hns_gmac_tx_loop_pkt_dis(mac_drv);
 	if (drv->mac_cb->mac_type == HNAE_PORT_DEBUG)
 		hns_gmac_set_uc_match(mac_drv, 0);
+
+	/* reduce gmac tx water line to avoid gmac hang-up
+	 * in speed 100M and duplex half.
+	 */
+	dsaf_set_dev_field(drv, GMAC_TX_WATER_LINE_REG, GMAC_TX_WATER_LINE_MASK,
+			   GMAC_TX_WATER_LINE_SHIFT, 8);
 }
 
 void hns_gmac_update_stats(void *mac_drv)
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
index 8fa18fc..4b8af68 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
@@ -466,6 +466,7 @@
 
 #define GMAC_DUPLEX_TYPE_REG			0x0008UL
 #define GMAC_FD_FC_TYPE_REG			0x000CUL
+#define GMAC_TX_WATER_LINE_REG			0x0010UL
 #define GMAC_FC_TX_TIMER_REG			0x001CUL
 #define GMAC_FD_FC_ADDR_LOW_REG			0x0020UL
 #define GMAC_FD_FC_ADDR_HIGH_REG		0x0024UL
@@ -912,6 +913,9 @@
 
 #define GMAC_DUPLEX_TYPE_B 0
 
+#define GMAC_TX_WATER_LINE_MASK		((1UL << 8) - 1)
+#define GMAC_TX_WATER_LINE_SHIFT	0
+
 #define GMAC_FC_TX_TIMER_S 0
 #define GMAC_FC_TX_TIMER_M 0xffff
 
-- 
2.7.4

  parent reply	other threads:[~2017-03-31 11:20 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-31 11:20 [PATCH V2 net-next 00/18] net: hns: Misc. HNS Bug Fixes & Code Improvements Salil Mehta
2017-03-31 11:20 ` [PATCH V2 net-next 01/18] net: hns: Fix the implementation of irq affinity function Salil Mehta
2017-03-31 11:20 ` Salil Mehta [this message]
2017-03-31 11:20 ` [PATCH V2 net-next 03/18] net: hns: Optimize the code for GMAC pad and crc Config Salil Mehta
2017-03-31 11:20 ` [PATCH V2 net-next 04/18] net: hns: Remove redundant memset during buffer release Salil Mehta
2017-03-31 11:20 ` [PATCH V2 net-next 05/18] net: hns: bug fix of ethtool show the speed Salil Mehta
2017-03-31 11:20 ` [PATCH V2 net-next 06/18] net: hns: Optimize hns_nic_common_poll for better performance Salil Mehta
2017-03-31 11:20 ` [PATCH V2 net-next 07/18] net: hns: Fix to adjust buf_size of ring according to mtu Salil Mehta
2017-03-31 11:20 ` [PATCH V2 net-next 08/18] net: hns: Replace netif_tx_lock to ring spin lock Salil Mehta
2017-03-31 11:20 ` [PATCH V2 net-next 09/18] net: hns: Correct HNS RSS key set function Salil Mehta
2017-03-31 11:20 ` [PATCH V2 net-next 10/18] net: hns: Remove the redundant adding and deleting mac function Salil Mehta
2017-03-31 11:20 ` [PATCH V2 net-next 11/18] net: hns: Remove redundant mac_get_id() Salil Mehta
2017-03-31 11:20 ` [PATCH V2 net-next 12/18] net: hns: Remove redundant mac table operations Salil Mehta
2017-03-31 11:20 ` [PATCH V2 net-next 13/18] net: hns: Clean redundant code from hns_mdio.c file Salil Mehta
2017-03-31 11:20 ` [PATCH V2 net-next 14/18] net: hns: Optimise the code in hns_mdio_wait_ready() Salil Mehta
2017-03-31 11:20 ` [PATCH V2 net-next 15/18] net: hns: Simplify the exception sequence in hns_ppe_init() Salil Mehta
2017-03-31 11:20 ` [PATCH V2 net-next 16/18] net: hns: Adjust the SBM module buffer threshold Salil Mehta
2017-03-31 11:20 ` [PATCH V2 net-next 17/18] net: hns: Avoid Hip06 chip TX packet line bug Salil Mehta
2017-03-31 11:20 ` [PATCH V2 net-next 18/18] net: hns: Some checkpatch.pl script & warning fixes Salil Mehta
2017-03-31 15:44   ` Joe Perches
2017-03-31 16:46     ` Salil Mehta

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170331112032.4692-3-salil.mehta@huawei.com \
    --to=salil.mehta@huawei.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxarm@huawei.com \
    --cc=lipeng321@huawei.com \
    --cc=mehta.salil.lnk@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=tianjinchuan1@huawei.com \
    --cc=yisen.zhuang@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox