From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id B10801B475 for ; Mon, 14 Jan 2019 02:42:10 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jan 2019 17:42:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,475,1539673200"; d="scan'208";a="117853597" Received: from dipei-st-npg.sh.intel.com ([10.67.110.220]) by orsmga003.jf.intel.com with ESMTP; 13 Jan 2019 17:42:08 -0800 From: AndyPei To: dev@dpdk.org Cc: rosen.xu@intel.com, tianfei.zhang@intel.com, andy.pei@intel.com Date: Mon, 14 Jan 2019 09:40:43 +0800 Message-Id: <1547430043-62302-1-git-send-email-andy.pei@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dpdk-dev] [DPDK] /driver/bus/ifpga: fix driver probe failure handler X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2019 01:42:11 -0000 In the original code, when a device probe a driver, if the driver in the driver list does not support this device, a error is returned. After this patch, a device wil try to match driver in the driver list one by one until an appropriate driver is found. If the current driver does not support the device or some error happens, just try the next driver in the list. If all the drivers in the list are tried and no driver matches. 0 is returned. fixes: 05fa3d4a6539 cc: rosen.xu@intel.com cc: tianfei.zhang@intel.com cc: andy.pei@intel.com Signed-off-by: AndyPei --- 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