diff mbox series

[v3,19/27] net/e1000/base: modify flow control setup

Message ID	20200706081222.19279-20-guinanx.sun@intel.com (mailing list archive)
State	Accepted, archived
Delegated to:	Qi Zhang
Headers	IronPort-SDR: H21VyrieEGtQbGuUf7ixf6Ry3Knu2qi2fKDRtQMX8XC6UTepRUzMHlkuzMl3jI4RjGrfxjDzJM gxlJKkCQAAxQ== IronPort-SDR: /a9wdeLHSY2fwH7oC+OyCud94PVghKRh4x2xHYo2LvhaJ4c6lO+AjxTbr8+wFrMLK8Iw6hFNeQ zOA6AI+bqZEA== From: Guinan Sun <guinanx.sun@intel.com> To: dev@dpdk.org Cc: Jeff Guo <jia.guo@intel.com>, Zhao1 Wei <wei.zhao1@intel.com>, Guinan Sun <guinanx.sun@intel.com>, Efrati Nir <nir.efrati@intel.com> Date: Mon, 6 Jul 2020 08:12:14 +0000 Message-Id: <20200706081222.19279-20-guinanx.sun@intel.com> In-Reply-To: <20200706081222.19279-1-guinanx.sun@intel.com> References: <20200622064634.70941-1-guinanx.sun@intel.com> <20200706081222.19279-1-guinanx.sun@intel.com> Subject: [dpdk-dev] [PATCH v3 19/27] net/e1000/base: modify flow control setup Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	update e1000 base code \| [v3,00/27] update e1000 base code [v3,01/27] net/e1000/base: i210 slow system clock update [v3,02/27] net/e1000/base: add ICL device ID [v3,03/27] net/e1000/base: introduce flags [v3,04/27] net/e1000/base: add support for i211 [v3,05/27] net/e1000/base: expose xmdio methods [v3,06/27] net/e1000/base: fall through explicitly [v3,07/27] net/e1000/base: add function parameter descriptions [v3,08/27] net/e1000/base: improve code style and fix klocwork errors [v3,09/27] net/e1000/base: modify HW level time sync mechanisms [v3,10/27] net/e1000/base: remove duplicated codes [v3,11/27] net/e1000/base: expose MAC functions [v3,12/27] net/e1000/base: add define to PCIm function state [v3,13/27] net/e1000/base: add missing register defines [v3,14/27] net/e1000/base: increased timeout for ME ULP exit [v3,15/27] net/e1000/base: add missing device ID [v3,16/27] net/e1000/base: expose more future extended NVM [v3,17/27] net/e1000/base: remove useless statement [v3,18/27] net/e1000/base: add missed define for VFTA [v3,19/27] net/e1000/base: modify flow control setup [v3,20/27] net/e1000/base: led blinking fix for i210 [v3,21/27] net/e1000/base: expose new FEXTNVM registers and masks [v3,22/27] net/e1000/base: add support for Nahum10 [v3,23/27] net/e1000/base: add ADL device ID [v3,24/27] net/e1000/base: introduce DPGFR register [v3,25/27] net/e1000/base: cleanup pre-processor tags [v3,26/27] net/e1000/base: modify copyright [v3,27/27] net/e1000/base: update version

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK
ci/Intel-compilation	success	Compilation OK

Commit Message

Guinan Sun July 6, 2020, 8:12 a.m. UTC

Customers had a problem with large pings after connected standby.
This is due to the requirement of maintaining link after CS - the driver
blocks resets during "AdapterStart" and skips flow control setup.
Added condition in e1000_setup_link_ich8lan.c function that always setup
flow control, and setup physical interface only when no need to block
resets.

Signed-off-by: Efrati Nir <nir.efrati@intel.com>
Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
---
 drivers/net/e1000/base/e1000_ich8lan.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/e1000/base/e1000_ich8lan.c b/drivers/net/e1000/base/e1000_ich8lan.c
index 9b9cc7d90..85344ebeb 100644
--- a/drivers/net/e1000/base/e1000_ich8lan.c
+++ b/drivers/net/e1000/base/e1000_ich8lan.c
@@ -5200,9 +5200,6 @@  STATIC s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)
 
 	DEBUGFUNC("e1000_setup_link_ich8lan");
 
-	if (hw->phy.ops.check_reset_block(hw))
-		return E1000_SUCCESS;
-
 	/* ICH parts do not have a word in the NVM to determine
 	 * the default flow control setting, so we explicitly
 	 * set it to full.
@@ -5218,10 +5215,12 @@  STATIC s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)
 	DEBUGOUT1("After fix-ups FlowControl is now = %x\n",
 		hw->fc.current_mode);
 
-	/* Continue to configure the copper link. */
-	ret_val = hw->mac.ops.setup_physical_interface(hw);
-	if (ret_val)
-		return ret_val;
+	if (!hw->phy.ops.check_reset_block(hw)) {
+		/* Continue to configure the copper link. */
+		ret_val = hw->mac.ops.setup_physical_interface(hw);
+		if (ret_val)
+			return ret_val;
+	}
 
 	E1000_WRITE_REG(hw, E1000_FCTTV, hw->fc.pause_time);
 	if ((hw->phy.type == e1000_phy_82578) ||