From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 24DB6A0A05 for ; Tue, 19 Jan 2021 20:46:50 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B7661140DC1; Tue, 19 Jan 2021 20:46:49 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 2BE85140D2A; Tue, 19 Jan 2021 08:12:44 +0100 (CET) IronPort-SDR: cN6N6VHYQOxgVploR/PXhyjiqxsTgZL9OdFSmNYhuwy5Wq8/k53Cy8KIUYpWud33pUQO8ONG88 CB9KdP+4Xg0w== X-IronPort-AV: E=McAfee;i="6000,8403,9868"; a="242957264" X-IronPort-AV: E=Sophos;i="5.79,358,1602572400"; d="scan'208";a="242957264" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2021 23:12:38 -0800 IronPort-SDR: E8/i5OGISvYhMw3btYcCZ1SMp8vmabMbVv1LcdVOMEoIqz6Zdo5CuFDt87RKHylpIXpbWtk1g5 KK5TKQxdjmug== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,358,1602572400"; d="scan'208";a="355460026" Received: from wuwenjun.sh.intel.com ([10.67.110.153]) by fmsmga008.fm.intel.com with ESMTP; 18 Jan 2021 23:12:36 -0800 From: Wenjun Wu To: dev@dpdk.org, jia.guo@intel.com, qi.z.zhang@intel.com, Yuying.Zhang@intel.com Cc: Wenjun Wu , stable@dpdk.org Date: Tue, 19 Jan 2021 14:58:47 +0800 Message-Id: <20210119065847.66043-1-wenjun1.wu@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Tue, 19 Jan 2021 20:46:48 +0100 Subject: [dpdk-stable] [PATCH v1] net/e1000: fix the invalid flow control mode setting X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" E1000_CTRL register should be updated according to fc_conf->mode's value. Fixes: af75078fece3 ("first public release") Cc: stable@dpdk.org Signed-off-by: Wenjun Wu --- drivers/net/e1000/igb_ethdev.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 647aa8d99..390737393 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -3064,6 +3064,7 @@ eth_igb_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) uint32_t rx_buf_size; uint32_t max_high_water; uint32_t rctl; + uint32_t ctrl; hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); if (fc_conf->autoneg != hw->mac.autoneg) @@ -3101,6 +3102,15 @@ eth_igb_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) rctl &= ~E1000_RCTL_PMCF; E1000_WRITE_REG(hw, E1000_RCTL, rctl); + + ctrl = E1000_READ_REG(hw, E1000_CTRL); + ctrl &= ~(E1000_CTRL_RFCE|E1000_CTRL_TFCE); + if (fc_conf->mode == RTE_FC_RX_PAUSE || fc_conf->mode == RTE_FC_FULL) + ctrl |= E1000_CTRL_RFCE; + if (fc_conf->mode == RTE_FC_TX_PAUSE || fc_conf->mode == RTE_FC_FULL) + ctrl |= E1000_CTRL_TFCE; + E1000_WRITE_REG(hw, E1000_CTRL, ctrl); + E1000_WRITE_FLUSH(hw); return 0; -- 2.25.1