patch 'net/hns3: fix log about indirection table size' has been queued to stable release 21.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.4

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/28/23. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/81cb3c29c8b00b5275fc70a19b143acbcab4445e

Thanks.

Kevin

---
>From 81cb3c29c8b00b5275fc70a19b143acbcab4445e Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Tue, 31 Jan 2023 21:02:51 +0800
Subject: [PATCH] net/hns3: fix log about indirection table size

[ upstream commit b55516a94246364f272db802f5dfb9aeb8d3a2f2 ]

The error log about indirection table size during initialization phase
of PF and VF is unreasonable.

In addition, VF driver should use error level to print this log.

Fixes: 0fce2c46dc16 ("net/hns3: fix RSS indirection table size")

Signed-off-by: Huisong Li <lihuisong at huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3 at huawei.com>
---
 drivers/net/hns3/hns3_ethdev.c    | 5 ++---
 drivers/net/hns3/hns3_ethdev_vf.c | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index edeb83bbbc..ca59c42f4a 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2697,7 +2697,6 @@ hns3_check_dev_specifications(struct hns3_hw *hw)
 	if (hw->rss_ind_tbl_size == 0 ||
 	    hw->rss_ind_tbl_size > HNS3_RSS_IND_TBL_SIZE_MAX) {
-		hns3_err(hw, "the size of hash lookup table configured (%u)"
-			      " exceeds the maximum(%u)", hw->rss_ind_tbl_size,
-			      HNS3_RSS_IND_TBL_SIZE_MAX);
+		hns3_err(hw, "the indirection table size obtained (%u) is invalid, and should not be zero or exceed the maximum(%u)",
+			 hw->rss_ind_tbl_size, HNS3_RSS_IND_TBL_SIZE_MAX);
 		return -EINVAL;
 	}
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index 063633e5ed..87d094a6b4 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -719,7 +719,6 @@ hns3vf_check_dev_specifications(struct hns3_hw *hw)
 	if (hw->rss_ind_tbl_size == 0 ||
 	    hw->rss_ind_tbl_size > HNS3_RSS_IND_TBL_SIZE_MAX) {
-		hns3_warn(hw, "the size of hash lookup table configured (%u)"
-			      " exceeds the maximum(%u)", hw->rss_ind_tbl_size,
-			      HNS3_RSS_IND_TBL_SIZE_MAX);
+		hns3_err(hw, "the indirection table size obtained (%u) is invalid, and should not be zero or exceed the maximum(%u)",
+			 hw->rss_ind_tbl_size, HNS3_RSS_IND_TBL_SIZE_MAX);
 		return -EINVAL;
 	}
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 14:46:25.163665642 +0000
+++ 0056-net-hns3-fix-log-about-indirection-table-size.patch	2023-02-23 14:46:23.795236053 +0000
@@ -1 +1 @@
-From b55516a94246364f272db802f5dfb9aeb8d3a2f2 Mon Sep 17 00:00:00 2001
+From 81cb3c29c8b00b5275fc70a19b143acbcab4445e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b55516a94246364f272db802f5dfb9aeb8d3a2f2 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -17,3 +18,3 @@
- drivers/net/hns3/hns3_ethdev.c    | 2 +-
- drivers/net/hns3/hns3_ethdev_vf.c | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ drivers/net/hns3/hns3_ethdev.c    | 5 ++---
+ drivers/net/hns3/hns3_ethdev_vf.c | 5 ++---
+ 2 files changed, 4 insertions(+), 6 deletions(-)
@@ -22 +23 @@
-index d326f70129..eb809cd8c9 100644
+index edeb83bbbc..ca59c42f4a 100644
@@ -25 +26 @@
-@@ -2680,5 +2680,5 @@ hns3_check_dev_specifications(struct hns3_hw *hw)
+@@ -2697,7 +2697,6 @@ hns3_check_dev_specifications(struct hns3_hw *hw)
@@ -28 +29,3 @@
--		hns3_err(hw, "the size of hash lookup table configured (%u) exceeds the maximum(%u)",
+-		hns3_err(hw, "the size of hash lookup table configured (%u)"
+-			      " exceeds the maximum(%u)", hw->rss_ind_tbl_size,
+-			      HNS3_RSS_IND_TBL_SIZE_MAX);
@@ -30 +33 @@
- 			 hw->rss_ind_tbl_size, HNS3_RSS_IND_TBL_SIZE_MAX);
++			 hw->rss_ind_tbl_size, HNS3_RSS_IND_TBL_SIZE_MAX);
@@ -31,0 +35 @@
+ 	}
@@ -33 +37 @@
-index d220522c43..e43815607a 100644
+index 063633e5ed..87d094a6b4 100644
@@ -36 +40 @@
-@@ -719,6 +719,6 @@ hns3vf_check_dev_specifications(struct hns3_hw *hw)
+@@ -719,7 +719,6 @@ hns3vf_check_dev_specifications(struct hns3_hw *hw)
@@ -39,2 +43,3 @@
--		hns3_warn(hw, "the size of hash lookup table configured (%u) exceeds the maximum(%u)",
--			  hw->rss_ind_tbl_size, HNS3_RSS_IND_TBL_SIZE_MAX);
+-		hns3_warn(hw, "the size of hash lookup table configured (%u)"
+-			      " exceeds the maximum(%u)", hw->rss_ind_tbl_size,
+-			      HNS3_RSS_IND_TBL_SIZE_MAX);