From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f171.google.com (mail-wr0-f171.google.com [209.85.128.171]) by dpdk.org (Postfix) with ESMTP id 1695FFB02 for ; Mon, 27 Mar 2017 16:17:39 +0200 (CEST) Received: by mail-wr0-f171.google.com with SMTP id w11so44889966wrc.3 for ; Mon, 27 Mar 2017 07:17:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=Fr/wKNsUz5MVz6XVb7MeOTD0Q2jWvzOswJOMDXehhwg=; b=FsoeHGxHcEMaMpixbvR6loqjzhXTDmiYISNfKIfbckK4thrmstNnizJtXp608DxGM9 Fkl2z2ayWK/TroWZXqKPyXF+Ns99Krlzs0Z83YB3FecpsxrB7Z9yCLpHsORVLm1gwgZE ur2KoAKQx3Bb5gvY8OeGGSKAOB7ClVYusIiP4trPEJzQbIo8uTuvPAILh2Qqj5g5WDtW SP11MezYRQlQPdiaHPGCqEuELTqd4++yEdrZs3ltN+cNQrrAnrPXwN0XXGDCpT0aHMKD 6rZdwbHaZwFZn1lzSjMH7TR9FsHK9pVjRul5Zs2T54ZiRBzAqlGVxC3HJV1Y241KrRaL YG9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Fr/wKNsUz5MVz6XVb7MeOTD0Q2jWvzOswJOMDXehhwg=; b=j/EVMppW7A4o9FTElk/k6ygCgDJMZwS7bFPQ0LAHHBwh6Nm/cmeaIMRB9RF9rtdBq6 pEMIsdrnAKzVMcvla84xbuH6eExb76cy+qjnzdqGPEsBX4F8pZP879lMdoztkiJjDbxw RNqCzOKzFyxvreFFQoMp91/G4oltnpavpVx4S59SbUYgZ0T+/If21jpecV6+tK0aLMK2 zBEB6ndU0jba3XqfcvGbYCnZ00cAJsJkxZSuPPQCUg1b4aRTZt2rgKE664Czht/N/0+X +M6++bsRfXZnM/8UHtaW4NNI+/Vf6ipeDpvGWrTMPw+sL4jrq68qlrdz6VVUy3A46OBS uKCg== X-Gm-Message-State: AFeK/H3hgJT5wUasKMaEmb+agbmS/RY3dhNHIntOQQSilfQ1jrrxeFrMBIyBlTfkia2YB3OR X-Received: by 10.223.170.200 with SMTP id i8mr23231381wrc.79.1490624258371; Mon, 27 Mar 2017 07:17:38 -0700 (PDT) Received: from bidouze.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id 51sm897107wrx.38.2017.03.27.07.17.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Mar 2017 07:17:37 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: stable@dpdk.org Date: Mon, 27 Mar 2017 16:17:22 +0200 Message-Id: <2f6db539fb06934a9433fea1e3ea64d5171db962.1490624067.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.1.4 Subject: [dpdk-dev] [PATCH 1/2] net/mlx4: fix returned values upon failed probing 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, 27 Mar 2017 14:17:40 -0000 Let error messages in place, but return unambiguous values upon probing errors. Fixes: 66e1591687ac ("mlx4: avoid init errors when kernel modules are not loaded") Cc: stable@dpdk.org Signed-off-by: Gaetan Rivet Acked-by: Adrien Mazarguil --- drivers/net/mlx4/mlx4.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 665d8f7..24166c9 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -5706,10 +5706,8 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) list = ibv_exp_get_device_list(&i); if (list == NULL) { assert(errno); - if (errno == ENOSYS) { - WARN("cannot list devices, is ib_uverbs loaded?"); - return 0; - } + if (errno == ENOSYS) + ERROR("cannot list devices, is ib_uverbs loaded?"); return -errno; } assert(i >= 0); @@ -5741,11 +5739,11 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) ibv_free_device_list(list); switch (err) { case 0: - WARN("cannot access device, is mlx4_ib loaded?"); - return 0; + ERROR("cannot access device, is mlx4_ib loaded?"); + return -ENODEV; case EINVAL: - WARN("cannot use device, are drivers up to date?"); - return 0; + ERROR("cannot use device, are drivers up to date?"); + return -EINVAL; } assert(err > 0); return -err; -- 2.1.4