From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id A920B1B536 for ; Thu, 7 Feb 2019 14:28:06 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 738E8131718; Thu, 7 Feb 2019 13:28:05 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.33.36.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB2A16BF2A; Thu, 7 Feb 2019 13:28:03 +0000 (UTC) From: Kevin Traynor To: Andy Pei Cc: Ferruh Yigit , Rosen Xu , dpdk stable Date: Thu, 7 Feb 2019 13:25:42 +0000 Message-Id: <20190207132614.20538-36-ktraynor@redhat.com> In-Reply-To: <20190207132614.20538-1-ktraynor@redhat.com> References: <20190207132614.20538-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 07 Feb 2019 13:28:05 +0000 (UTC) Subject: [dpdk-stable] patch 'bus/ifpga: fix AFU probe failure handler' has been queued to LTS release 18.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Feb 2019 13:28:07 -0000 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 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 Reviewed-by: Ferruh Yigit Acked-by: Rosen Xu --- 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 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@dpdk.org Signed-off-by: Andy Pei Reviewed-by: Ferruh Yigit