From patchwork Mon Jun 22 06:45:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guinan Sun X-Patchwork-Id: 71900 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 342B6A0350; Mon, 22 Jun 2020 09:11:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F22EA1D16A; Mon, 22 Jun 2020 09:06:26 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id BA5CF1C2E7 for ; Mon, 22 Jun 2020 09:06:19 +0200 (CEST) IronPort-SDR: sA8R8ZWMkkQetD4Pgthvtx40QRNw40rzGQo0e4sId138l3Ceh4NGI3gbsyqgnESbqNG+a26dDD /+GAzbF8Pitg== X-IronPort-AV: E=McAfee;i="6000,8403,9659"; a="141944858" X-IronPort-AV: E=Sophos;i="5.75,266,1589266800"; d="scan'208";a="141944858" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2020 00:06:19 -0700 IronPort-SDR: /ncEtjgLEDxMGzQQ6tSU7sjnm9adWhT7o7DlVjl4n/YMFOMBV6ZuKvE5wpj8wajTWCy78khSdM 2NtdT3f0IFvQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,266,1589266800"; d="scan'208";a="384409033" Received: from dpdk.sh.intel.com ([10.239.255.83]) by fmsmga001.fm.intel.com with ESMTP; 22 Jun 2020 00:06:17 -0700 From: Guinan Sun To: dev@dpdk.org Cc: Jeff Guo , Zhao1 Wei , Guinan Sun , Sasha Neftin Date: Mon, 22 Jun 2020 06:45:57 +0000 Message-Id: <20200622064634.70941-34-guinanx.sun@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200622064634.70941-1-guinanx.sun@intel.com> References: <20200622064634.70941-1-guinanx.sun@intel.com> Subject: [dpdk-dev] [PATCH 33/70] net/e1000/base: wrap the unneeded code X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The default flow control settings for i225 should be set up as 'full' for a request mode and do not depend from a NVM. '_set_default_fc_generic' method took value from NVM and set a wrong default flow control settings. Therefore driver up with none flow control settings. Setting up '_fc_full' directly from a '_setup_link_generic' method and solve this problem. Signed-off-by: Sasha Neftin Signed-off-by: Guinan Sun --- drivers/net/e1000/base/e1000_mac.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/e1000/base/e1000_mac.c b/drivers/net/e1000/base/e1000_mac.c index 0ae2a60d8..577ba9c1b 100644 --- a/drivers/net/e1000/base/e1000_mac.c +++ b/drivers/net/e1000/base/e1000_mac.c @@ -941,9 +941,7 @@ s32 e1000_setup_link_generic(struct e1000_hw *hw) * based on the EEPROM flow control settings. */ if (hw->fc.requested_mode == e1000_fc_default) { - ret_val = e1000_set_default_fc_generic(hw); - if (ret_val) - return ret_val; + hw->fc.requested_mode = e1000_fc_full; } /* Save off the requested flow control mode for use later. Depending