[dpdk-stable] patch 'net/ionic: fix completion type in lif init' has been queued to stable release 20.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.2

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

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/7a866f25e6aa059dca294bb85f5bf07c3b9b584e

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 7a866f25e6aa059dca294bb85f5bf07c3b9b584e Mon Sep 17 00:00:00 2001
From: Andrew Boyer <aboyer at pensando.io>
Date: Tue, 16 Feb 2021 12:35:40 -0800
Subject: [PATCH] net/ionic: fix completion type in lif init
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit 656bfc9a4e3d377ebf160132242d1bb2b5f9b8b2 ]

The completion type was wrong.
Don't check the completion if the wait timed out.

Fixes: 669c8de67c88 ("net/ionic: support basic LIF")

Signed-off-by: Andrew Boyer <aboyer at pensando.io>
---
 drivers/net/ionic/ionic_lif.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c
index 5894f3505a..33a5977ced 100644
--- a/drivers/net/ionic/ionic_lif.c
+++ b/drivers/net/ionic/ionic_lif.c
@@ -1470,17 +1470,18 @@ int
 ionic_lif_init(struct ionic_lif *lif)
 {
 	struct ionic_dev *idev = &lif->adapter->idev;
-	struct ionic_q_init_comp comp;
+	struct ionic_lif_init_comp comp;
 	int err;
 
 	memset(&lif->stats_base, 0, sizeof(lif->stats_base));
 
 	ionic_dev_cmd_lif_init(idev, lif->index, lif->info_pa);
 	err = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT);
-	ionic_dev_cmd_comp(idev, &comp);
 	if (err)
 		return err;
 
+	ionic_dev_cmd_comp(idev, &comp);
+
 	lif->hw_index = comp.hw_index;
 
 	err = ionic_lif_adminq_init(lif);
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-10 23:59:27.106608800 +0800
+++ 0016-net-ionic-fix-completion-type-in-lif-init.patch	2021-05-10 23:59:26.330000000 +0800
@@ -1 +1 @@
-From 656bfc9a4e3d377ebf160132242d1bb2b5f9b8b2 Mon Sep 17 00:00:00 2001
+From 7a866f25e6aa059dca294bb85f5bf07c3b9b584e Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit 656bfc9a4e3d377ebf160132242d1bb2b5f9b8b2 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -18 +20 @@
-index b8023e0632..cd220abee2 100644
+index 5894f3505a..33a5977ced 100644
@@ -21 +23 @@
-@@ -1605,17 +1605,18 @@ int
+@@ -1470,17 +1470,18 @@ int
@@ -31 +33 @@
- 	ionic_dev_cmd_lif_init(idev, lif->info_pa);
+ 	ionic_dev_cmd_lif_init(idev, lif->index, lif->info_pa);
@@ -39 +41 @@
- 	lif->hw_index = rte_cpu_to_le_16(comp.hw_index);
+ 	lif->hw_index = comp.hw_index;