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 859E0A0524 for ; Fri, 5 Feb 2021 12:37:09 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8081D1889F7; Fri, 5 Feb 2021 12:37:09 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 872D4188949 for ; Fri, 5 Feb 2021 12:37:08 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id g10so7356869wrx.1 for ; Fri, 05 Feb 2021 03:37:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y/P6SlxMeoUcwYWIaozdSX1jpQZQdf+BrEVs4wlfT5c=; b=AxtU9v24bJUeW0uUK2YC7T+sQioAgdw3R0mIqPOSKt4gNrtO7kFpmC6b5vvdjFyauF rgCd20l9PgJ0lO2mArsaAEJ/UX0zPh12gG+XDrapyeZGRWIg/AoxQxS8CYaxsLDcJza9 tTDMG+ua3/W+NbH99x94lJ+Ej1NyK7evAkYUukXJYHG89wib0p9JmXSir4KjMCAbYBL4 d9bIIyHsA0msD9pTHUpXJcmkgqV38Vrl6wExjaBFjVTUeFahRJn6hkNZdz66s6lq8V65 uZ7GoESFzvBGSD1fHxOjJYYCXoNKOn34adgoXU/n8kbEFBelZa3/Cd8yJlNpI2YTlrUH l1SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y/P6SlxMeoUcwYWIaozdSX1jpQZQdf+BrEVs4wlfT5c=; b=AU2y2fao382wlhSzKwpXx5k8Zr2hpZIQpIHkR/zKP9uwnhGJvaTelx/55BPUjmqIeF uNj+jsqAKU8ah/K0LRR/FXzfZBtbkow+i6awkW9wpUa7ui83tvMB+CiDG7lLO+s0z7c+ 9Po7e8f3/y7jqZfTf/0cvknjO4V2ztJeFpQhxqlzy8q338X2MiSpyrWTR3uQuQ4oNGFL ZfKnxNdXg0B3af9Pc6QF42MW4sqZJ5hf9NEEK6fAa+cH8asshx/O5f4xhWy5+C+tETj1 wRLcikn8QRLdJqwRVaHgirZ6YLe2OE83rVKsoxtzk1/bJyj7z5n/VRHY2GeaMifQ4Dma VSPg== X-Gm-Message-State: AOAM530zdopPPT4sSk+pmt6r8io5d3niUmWKT53IgKNe1mxMp/iyYqfc 11u6euyyegMKEEJosBfECCs= X-Google-Smtp-Source: ABdhPJw4cNkBpKXNa14wmk4NoAYfHERfM6xwO/E0sB5+76k4pAxoe1cgCoCPBmt/6FnGgGQo1R62Rw== X-Received: by 2002:a5d:53c3:: with SMTP id a3mr4415392wrw.43.1612525028361; Fri, 05 Feb 2021 03:37:08 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u6sm12736716wro.75.2021.02.05.03.37.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:37:07 -0800 (PST) From: luca.boccassi@gmail.com To: Wenjun Wu Cc: Jeff Guo , dpdk stable Date: Fri, 5 Feb 2021 11:18:30 +0000 Message-Id: <20210205111920.1272063-224-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/e1000: fix flow control mode setting' has been queued to stable release 20.11.1 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" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/da9ff873df04fd6a6f9cd61741fff7d36e5b4734 Thanks. Luca Boccassi --- >From da9ff873df04fd6a6f9cd61741fff7d36e5b4734 Mon Sep 17 00:00:00 2001 From: Wenjun Wu Date: Wed, 20 Jan 2021 14:53:37 +0800 Subject: [PATCH] net/e1000: fix flow control mode setting [ upstream commit 9f3c2398ae8a31eac1d5e00696a7922b2531597b ] E1000_CTRL register should be updated according to fc_conf->mode's value. Fixes: af75078fece3 ("first public release") Signed-off-by: Wenjun Wu Acked-by: Jeff Guo --- drivers/net/e1000/igb_ethdev.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index dfe87508c2..5bcc67d75f 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,39 @@ 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); + + /* + * check if we want to change flow control mode - driver doesn't have native + * capability to do that, so we'll write the registers ourselves + */ + ctrl = E1000_READ_REG(hw, E1000_CTRL); + + /* + * set or clear E1000_CTRL_RFCE and E1000_CTRL_TFCE bits depending + * on configuration + */ + switch (fc_conf->mode) { + case RTE_FC_NONE: + ctrl &= ~E1000_CTRL_RFCE & ~E1000_CTRL_TFCE; + break; + case RTE_FC_RX_PAUSE: + ctrl |= E1000_CTRL_RFCE; + ctrl &= ~E1000_CTRL_TFCE; + break; + case RTE_FC_TX_PAUSE: + ctrl |= E1000_CTRL_TFCE; + ctrl &= ~E1000_CTRL_RFCE; + break; + case RTE_FC_FULL: + ctrl |= E1000_CTRL_RFCE | E1000_CTRL_TFCE; + break; + default: + PMD_INIT_LOG(ERR, "invalid flow control mode"); + return -EINVAL; + } + + E1000_WRITE_REG(hw, E1000_CTRL, ctrl); + E1000_WRITE_FLUSH(hw); return 0; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:39.039575538 +0000 +++ 0224-net-e1000-fix-flow-control-mode-setting.patch 2021-02-05 11:18:29.182698271 +0000 @@ -1 +1 @@ -From 9f3c2398ae8a31eac1d5e00696a7922b2531597b Mon Sep 17 00:00:00 2001 +From da9ff873df04fd6a6f9cd61741fff7d36e5b4734 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9f3c2398ae8a31eac1d5e00696a7922b2531597b ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index ec355cbf35..5323504e98 100644 +index dfe87508c2..5bcc67d75f 100644