[dpdk-stable] patch 'bus/ifpga: fix AFU probe failure handler' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

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

Kevin Traynor

---
>From d2c2e9f198ddaccdd7be8f39646129e5920cb637 Mon Sep 17 00:00:00 2001
From: Andy Pei <andy.pei at intel.com>
Date: Fri, 18 Jan 2019 11:12:33 +0000
Subject: [PATCH] bus/ifpga: fix AFU probe failure handler

[ upstream commit fb87e55abac808bdda60e114a6817ab6e812ec16 ]

In the original code, when an AFU device probe a driver,
if the first driver in the driver list does not support
this device or some error happens, bus probe returns an error.

With this patch, a device will try to match driver in the driver
list one by one until an appropriate driver is found.

If some error happens, the error is returned. If the current driver
does not support the device, just try the next driver in the list.

If all the drivers in the list are tried and no driver matches,
0 is returned. Otherwise, the error code is returned.

Fixes: 05fa3d4a6539 ("bus/ifpga: add Intel FPGA bus library")

Signed-off-by: Andy Pei <andy.pei at intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
Acked-by: Rosen Xu <rosen.xu at intel.com>
---
 drivers/bus/ifpga/ifpga_bus.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
index e4b7b6f50..55d3abf9f 100644
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -307,10 +307,17 @@ ifpga_probe_all_drivers(struct rte_afu_device *afu_dev)
 
 	TAILQ_FOREACH(drv, &ifpga_afu_drv_list, next) {
-		if (ifpga_probe_one_driver(drv, afu_dev)) {
-			ret = -1;
-			break;
-		}
+		ret = ifpga_probe_one_driver(drv, afu_dev);
+		if (ret < 0)
+			/* negative value is an error */
+			return ret;
+		if (ret > 0)
+			/* positive value means driver doesn't support it */
+			continue;
+		return 0;
 	}
-	return ret;
+	if ((ret > 0) && (afu_dev->driver == NULL))
+		return 0;
+	else
+		return ret;
 }
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-02-07 13:19:56.382519301 +0000
+++ 0036-bus-ifpga-fix-AFU-probe-failure-handler.patch	2019-02-07 13:19:55.000000000 +0000
@@ -1,8 +1,10 @@
-From fb87e55abac808bdda60e114a6817ab6e812ec16 Mon Sep 17 00:00:00 2001
+From d2c2e9f198ddaccdd7be8f39646129e5920cb637 Mon Sep 17 00:00:00 2001
 From: Andy Pei <andy.pei at intel.com>
 Date: Fri, 18 Jan 2019 11:12:33 +0000
 Subject: [PATCH] bus/ifpga: fix AFU probe failure handler
 
+[ upstream commit fb87e55abac808bdda60e114a6817ab6e812ec16 ]
+
 In the original code, when an AFU device probe a driver,
 if the first driver in the driver list does not support
 this device or some error happens, bus probe returns an error.
@@ -17,7 +19,6 @@
 0 is returned. Otherwise, the error code is returned.
 
 Fixes: 05fa3d4a6539 ("bus/ifpga: add Intel FPGA bus library")
-Cc: stable at dpdk.org
 
 Signed-off-by: Andy Pei <andy.pei at intel.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>