[dpdk-stable] patch 'net/hinic/base: remove queue number limitation' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

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

Thanks.

Luca Boccassi

---
>From 6767e3c2cdbd4cde34f649aaff355de06003a912 Mon Sep 17 00:00:00 2001
From: Guoyang Zhou <zhouguoyang at huawei.com>
Date: Tue, 24 Nov 2020 14:45:33 +0800
Subject: [PATCH] net/hinic/base: remove queue number limitation

[ upstream commit acf4aeafcef7baf187d980041ab9b23aa56733c1 ]

The maximum number of queues on the chip can be any value greater
than 0, it does not have to be the power of two, if it does not be
fixed, dpdk initialization may be failed with OVS mode firmware.

Fixes: 828d3e15a9dc ("net/hinic/base: support context and work queue")

Signed-off-by: Guoyang Zhou <zhouguoyang at huawei.com>
---
 drivers/net/hinic/base/hinic_pmd_nicio.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/net/hinic/base/hinic_pmd_nicio.c b/drivers/net/hinic/base/hinic_pmd_nicio.c
index 1ce065c6f7..9d9f2a7a56 100644
--- a/drivers/net/hinic/base/hinic_pmd_nicio.c
+++ b/drivers/net/hinic/base/hinic_pmd_nicio.c
@@ -763,11 +763,6 @@ static int hinic_alloc_nicio(struct hinic_hwdev *hwdev)
 	int err;
 
 	max_qps = hinic_func_max_qnum(hwdev);
-	if ((max_qps & (max_qps - 1))) {
-		PMD_DRV_LOG(ERR, "wrong number of max_qps: %d",
-			max_qps);
-		return -EINVAL;
-	}
 
 	nic_io->max_qps = max_qps;
 	nic_io->num_qps = max_qps;
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-30 11:49:30.459743934 +0000
+++ 0002-net-hinic-base-remove-queue-number-limitation.patch	2020-11-30 11:49:30.386271440 +0000
@@ -1 +1 @@
-From acf4aeafcef7baf187d980041ab9b23aa56733c1 Mon Sep 17 00:00:00 2001
+From 6767e3c2cdbd4cde34f649aaff355de06003a912 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit acf4aeafcef7baf187d980041ab9b23aa56733c1 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 2736305156..162308b02f 100644
+index 1ce065c6f7..9d9f2a7a56 100644
@@ -22 +23 @@
-@@ -758,11 +758,6 @@ static int hinic_alloc_nicio(struct hinic_hwdev *hwdev)
+@@ -763,11 +763,6 @@ static int hinic_alloc_nicio(struct hinic_hwdev *hwdev)
@@ -27 +28 @@
--		PMD_DRV_LOG(ERR, "Wrong number of max_qps: %d",
+-		PMD_DRV_LOG(ERR, "wrong number of max_qps: %d",