patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Andy Pei <andy.pei@intel.com>
To: dev@dpdk.org
Cc: rosen.xu@intel.com, andy.pei@intel.com, stable@dpdk.org
Subject: [dpdk-stable] [DPDK] bus/ifpga: fix ifpga afu driver probe failure handler
Date: Thu, 17 Jan 2019 13:36:54 +0800	[thread overview]
Message-ID: <1547703414-203279-1-git-send-email-andy.pei@intel.com> (raw)
In-Reply-To: <1547430043-62302-1-git-send-email-andy.pei@intel.com>

From: AndyPei <andy.pei@intel.com>

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, an error is returned.
With this patch, a device wil 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")
Cc: stable@dpdk.org

Signed-off-by: AndyPei <andy.pei@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 e4b7b6f..55d3abf 100644
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -306,12 +306,19 @@ void rte_ifpga_driver_unregister(struct rte_afu_driver *driver)
 	}
 
 	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;
 }
 
 /*
-- 
1.8.3.1

       reply	other threads:[~2019-01-17  5:38 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1547430043-62302-1-git-send-email-andy.pei@intel.com>
2019-01-17  5:36 ` Andy Pei [this message]
2019-01-18 11:12   ` [dpdk-stable] [PATCH v2] " Ferruh Yigit
2019-01-18 19:06     ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1547703414-203279-1-git-send-email-andy.pei@intel.com \
    --to=andy.pei@intel.com \
    --cc=dev@dpdk.org \
    --cc=rosen.xu@intel.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).