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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.7

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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
>From cf69b94980b721dbbc3ccc828584a322a23adcc5 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/avf/base/avf_adminq.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/avf/base/avf_adminq.c b/drivers/net/avf/base/avf_adminq.c
index 71f18b3477..2dc98797f7 100644
--- a/drivers/net/avf/base/avf_adminq.c
+++ b/drivers/net/avf/base/avf_adminq.c
@@ -852,4 +852,6 @@ enum avf_status_code avf_asq_send_command(struct avf_hw *hw,
 		if ((enum avf_admin_queue_err)retval == AVF_AQ_RC_OK)
 			status = AVF_SUCCESS;
+		else if ((enum avf_admin_queue_err)retval == AVF_AQ_RC_EBUSY)
+			status = AVF_ERR_NOT_READY;
 		else
 			status = AVF_ERR_ADMIN_QUEUE_ERROR;
-- 
2.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-07 15:08:18.567052647 +0000
+++ 0020-net-iavf-base-fix-adminq-return.patch	2020-02-07 15:08:17.528062764 +0000
@@ -1 +1 @@
-From 013d5e879fe357176e0ade1cb6561917a7d46864 Mon Sep 17 00:00:00 2001
+From cf69b94980b721dbbc3ccc828584a322a23adcc5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 013d5e879fe357176e0ade1cb6561917a7d46864 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -16 +17 @@
- drivers/net/iavf/base/iavf_adminq.c | 2 ++
+ drivers/net/avf/base/avf_adminq.c | 2 ++
@@ -19,9 +20,9 @@
-diff --git a/drivers/net/iavf/base/iavf_adminq.c b/drivers/net/iavf/base/iavf_adminq.c
-index 0a5b2b281b..c1668d2287 100644
---- a/drivers/net/iavf/base/iavf_adminq.c
-+++ b/drivers/net/iavf/base/iavf_adminq.c
-@@ -804,4 +804,6 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw *hw,
- 		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;
+diff --git a/drivers/net/avf/base/avf_adminq.c b/drivers/net/avf/base/avf_adminq.c
+index 71f18b3477..2dc98797f7 100644
+--- a/drivers/net/avf/base/avf_adminq.c
++++ b/drivers/net/avf/base/avf_adminq.c
+@@ -852,4 +852,6 @@ enum avf_status_code avf_asq_send_command(struct avf_hw *hw,
+ 		if ((enum avf_admin_queue_err)retval == AVF_AQ_RC_OK)
+ 			status = AVF_SUCCESS;
++		else if ((enum avf_admin_queue_err)retval == AVF_AQ_RC_EBUSY)
++			status = AVF_ERR_NOT_READY;
@@ -29 +30 @@
- 			status = IAVF_ERR_ADMIN_QUEUE_ERROR;
+ 			status = AVF_ERR_ADMIN_QUEUE_ERROR;