patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
To: Huisong Li <lihuisong@huawei.com>
Cc: Min Hu <humin29@huawei.com>, dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'net/hns3: fix DCB reconfiguration' has been queued to stable release 19.11.9
Date: Thu, 10 Jun 2021 14:06:37 +0200	[thread overview]
Message-ID: <20210610120641.885862-49-christian.ehrhardt@canonical.com> (raw)
In-Reply-To: <20210610120641.885862-1-christian.ehrhardt@canonical.com>

Hi,

FYI, your patch has been queued to stable release 19.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/12/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/43fd40175a729db764b45d4ec63b74eb1f5b6ade

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 43fd40175a729db764b45d4ec63b74eb1f5b6ade Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong@huawei.com>
Date: Sat, 15 May 2021 08:52:37 +0800
Subject: [PATCH] net/hns3: fix DCB reconfiguration

[ upstream commit b67bdfc8f6630934f3005ad531225c7203304661 ]

Whether the enable bit of the pfc ("pfc_en") is changed or not is one of
the conditions for reconfiguring the DCB. Currently, pfc_en is not
rolled back when DCB configuration fails. This patch fixes it.

Fixes: 62e3ccc2b94c ("net/hns3: support flow control")

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
---
 drivers/net/hns3/hns3_dcb.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c
index 4ecb6a97b0..81fe86aa39 100644
--- a/drivers/net/hns3/hns3_dcb.c
+++ b/drivers/net/hns3/hns3_dcb.c
@@ -1392,6 +1392,7 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
 	enum hns3_fc_status fc_status = hw->current_fc_status;
 	enum hns3_fc_mode requested_fc_mode = hw->requested_fc_mode;
 	uint8_t hw_pfc_map = hw->dcb_info.hw_pfc_map;
+	uint8_t pfc_en = hw->dcb_info.pfc_en;
 	int ret;
 
 	if (pf->tx_sch_mode != HNS3_FLAG_TC_BASE_SCH_MODE &&
@@ -1445,6 +1446,7 @@ pfc_setup_fail:
 	hw->current_fc_status = fc_status;
 
 buffer_alloc_fail:
+	hw->dcb_info.pfc_en = pfc_en;
 	hw->dcb_info.hw_pfc_map = hw_pfc_map;
 
 	return ret;
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-10 14:05:00.366558832 +0200
+++ 0049-net-hns3-fix-DCB-reconfiguration.patch	2021-06-10 14:04:58.102024911 +0200
@@ -1 +1 @@
-From b67bdfc8f6630934f3005ad531225c7203304661 Mon Sep 17 00:00:00 2001
+From 43fd40175a729db764b45d4ec63b74eb1f5b6ade Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b67bdfc8f6630934f3005ad531225c7203304661 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 1cb6adb886..90c0d041c9 100644
+index 4ecb6a97b0..81fe86aa39 100644
@@ -23 +24 @@
-@@ -1543,6 +1543,7 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
+@@ -1392,6 +1392,7 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
@@ -31 +32 @@
-@@ -1596,6 +1597,7 @@ pfc_setup_fail:
+@@ -1445,6 +1446,7 @@ pfc_setup_fail:

  parent reply	other threads:[~2021-06-10 12:08 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-10 12:05 [dpdk-stable] patch 'app/testpmd: fix NVGRE encap configuration' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'Revert "kni: fix compilation on SLES15-SP3"' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'bus/fslmc: remove unused debug macro' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'raw/skeleton: add missing check after setting attribute' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'ipc: use monotonic clock' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'examples/timer: fix time interval' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'test/timer: check memzone allocation' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'power: fix sanity checks for guest channel read' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'event/dpaa2: remove unused macros' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'app/eventdev: fix lcore parsing skipping last core' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'net/ice/base: fix memory allocation wrapper' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/ena: switch memcpy to optimized version' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/ena/base: fix type conversions by explicit casting' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/ena: remove endian swap functions' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/nfp: fix reporting of RSS capabilities' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: return error on PCI config write failure' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: clear hash map on flow director clear' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: fix querying flow director counter for out param' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: fix secondary process request start/stop Rx/Tx' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: fix ordering in secondary process initialization' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/iavf: fix Tx context descriptor' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/ice: fix VSI array out of bounds access' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/i40e: fix VF RSS configuration' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/bnx2x: fix build with GCC 11' " Christian Ehrhardt
2021-06-10 12:06 ` Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/ice/base: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/tap: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/mlx4: fix secondary process initialization ordering' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/mlx5: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'crypto/qat: fix null authentication request' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'app/crypto-perf: check memory allocation' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'examples/rxtx_callbacks: fix port ID format specifier' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'examples/flow_classify: fix NUMA check of port and core' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'examples/l2fwd-cat: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'examples/skeleton: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test: check flow classifier creation' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/power: fix CPU frequency check' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/power: add turbo mode to " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/power: fix low frequency test when turbo enabled' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/power: fix turbo test' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/table: fix build with GCC 11' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'examples/l3fwd-power: fix empty poll thresholds' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test: fix division by zero' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/crypto: fix build with GCC 11' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/mlx4: fix leak when configured repeatedly' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/mlx5: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: fix requested FC mode rollback' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: remove meaningless packet buffer " Christian Ehrhardt
2021-06-10 12:06 ` Christian Ehrhardt [this message]
2021-06-10 12:06 ` [dpdk-stable] patch 'common/sfc_efx/base: limit reported MCDI response length' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/memif: fix Tx bps statistics for zero-copy' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test: fix build with GCC 11' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/cmdline: silence clang 12 warning' " Christian Ehrhardt

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=20210610120641.885862-49-christian.ehrhardt@canonical.com \
    --to=christian.ehrhardt@canonical.com \
    --cc=humin29@huawei.com \
    --cc=lihuisong@huawei.com \
    --cc=stable@dpdk.org \
    /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;
as well as URLs for NNTP newsgroup(s).