[dpdk-stable] patch 'net/iavf/base: fix adminq return' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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/13/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.

Thanks.

Luca Boccassi

---
>From daa69f04b2fdf0bf94faa32474109ec977e934c3 Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang at intel.com>
Date: Tue, 3 Dec 2019 15:03:16 +0800
Subject: [PATCH] net/iavf/base: fix adminq return

[ upstream commit 013d5e879fe357176e0ade1cb6561917a7d46864 ]

When send a adminq, if get IAVF_AQ_RC_BUSY, we should return
IAVF_ERR_NOT_READY.

Fixes: e5b2a9e957e7 ("net/avf/base: add base code for avf PMD")

Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr at intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
Acked-by: Qiming Yang <qiming.yang at intel.com>
---
 drivers/net/iavf/base/iavf_adminq.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/iavf/base/iavf_adminq.c b/drivers/net/iavf/base/iavf_adminq.c
index a8b989aea9..a9fc63992d 100644
--- a/drivers/net/iavf/base/iavf_adminq.c
+++ b/drivers/net/iavf/base/iavf_adminq.c
@@ -822,6 +822,8 @@ enum iavf_status_code iavf_asq_send_command(struct iavf_hw *hw,
 		cmd_completed = true;
 		if ((enum iavf_admin_queue_err)retval == IAVF_AQ_RC_OK)
 			status = IAVF_SUCCESS;
+		else if ((enum iavf_admin_queue_err)retval == IAVF_AQ_RC_EBUSY)
+			status = IAVF_ERR_NOT_READY;
 		else
 			status = IAVF_ERR_ADMIN_QUEUE_ERROR;
 		hw->aq.asq_last_status = (enum iavf_admin_queue_err)retval;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:40.671359158 +0000
+++ 0045-net-iavf-base-fix-adminq-return.patch	2020-02-11 11:17:38.392001197 +0000
@@ -1,13 +1,14 @@
-From 013d5e879fe357176e0ade1cb6561917a7d46864 Mon Sep 17 00:00:00 2001
+From daa69f04b2fdf0bf94faa32474109ec977e934c3 Mon Sep 17 00:00:00 2001
 From: Qi Zhang <qi.z.zhang at intel.com>
 Date: Tue, 3 Dec 2019 15:03:16 +0800
 Subject: [PATCH] net/iavf/base: fix adminq return
 
+[ upstream commit 013d5e879fe357176e0ade1cb6561917a7d46864 ]
+
 When send a adminq, if get IAVF_AQ_RC_BUSY, we should return
 IAVF_ERR_NOT_READY.
 
 Fixes: e5b2a9e957e7 ("net/avf/base: add base code for avf PMD")
-Cc: stable at dpdk.org
 
 Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr at intel.com>
 Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -17,10 +18,10 @@
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/net/iavf/base/iavf_adminq.c b/drivers/net/iavf/base/iavf_adminq.c
-index 0a5b2b281b..c1668d2287 100644
+index a8b989aea9..a9fc63992d 100644
 --- a/drivers/net/iavf/base/iavf_adminq.c
 +++ b/drivers/net/iavf/base/iavf_adminq.c
-@@ -803,6 +803,8 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw *hw,
+@@ -822,6 +822,8 @@ enum iavf_status_code iavf_asq_send_command(struct iavf_hw *hw,
  		cmd_completed = true;
  		if ((enum iavf_admin_queue_err)retval == IAVF_AQ_RC_OK)
  			status = IAVF_SUCCESS;