From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <andy.pei@intel.com>
Received: from mga05.intel.com (mga05.intel.com [192.55.52.43])
by dpdk.org (Postfix) with ESMTP id 266A72A6A;
Thu, 17 Jan 2019 06:38:38 +0100 (CET)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga003.fm.intel.com ([10.253.24.29])
by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
16 Jan 2019 21:38:38 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.56,488,1539673200"; d="scan'208";a="126508775"
Received: from dipei-st-npg.sh.intel.com ([10.67.110.220])
by FMSMGA003.fm.intel.com with ESMTP; 16 Jan 2019 21:38:37 -0800
From: Andy Pei <andy.pei@intel.com>
To: dev@dpdk.org
Cc: rosen.xu@intel.com,
andy.pei@intel.com,
stable@dpdk.org
Date: Thu, 17 Jan 2019 13:36:54 +0800
Message-Id: <1547703414-203279-1-git-send-email-andy.pei@intel.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1547430043-62302-1-git-send-email-andy.pei@intel.com>
References: <1547430043-62302-1-git-send-email-andy.pei@intel.com>
Subject: [dpdk-stable] [DPDK] bus/ifpga: fix ifpga afu driver probe failure
handler
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Jan 2019 05:38:39 -0000
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