From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 4036F1B1B6 for ; Wed, 24 Jan 2018 16:39:40 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id E8637226D0; Wed, 24 Jan 2018 10:39:39 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute1.internal (MEProxy); Wed, 24 Jan 2018 10:39:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=orF81iHD/cpaD51hK ifac/rPZKFBFka+Shxotm7tPUc=; b=Yoqk/m5egc0s2kZ3PHVAE4FsDl/6boPmn pQVrSdZoejIHRtK0lM0PSo8XLGMX0bV+Z5RnetkWM27umC9ayQprVt7YjqJP7KMV qUyJiNMcxkw+ro4EfMsrZFCuTgLsiWeN98kfukzqGcLnRWN44i5Nnj/nybRWbC4T 6Nst+vycyDNut57YBASmZeDYQ3S7BIUTdOyNp/KrXT0Br4LXUV4E+FRM1N+sOCj1 ORtshTGocROVmnuiBy0yxoQG59s8ZMQcfODjmrJicAcs2Fkw/uASSrdVQbtOa9po Q5F9oAXKn44nY3POGUwmCcGSG8b2iuKVM/Eus9fkoYfSgz2kuxl9A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=orF81iHD/cpaD51hKifac/rPZKFBFka+Shxotm7tPUc=; b=jEvEjeOc ggDQoUYC2CPaa8EbqwG0vVj5Y5op/onPgwuZyXgfvtIZCR/YuLQcAPmOgKzoZLvN Sn5EzzXAZsBRXsYMwHdVJOc678XoJRDDg0Ql3ylhM6PiEhr3quqPZofajaImqdEu P6DjhWw0fechQxnEau7rJL0HB+V8mIKfz/l9ibPLB2ENrbcJ8SMOiLdVNwcEWpKK tSmEij1B0kNL+OiNgX6BlBaV7Fn3qNEEEqLSje8I+Ar+ZK0SaV3CARNLbmyyJ9x/ WCGIpid96dV4eRaFxXJg9O/kXkGgOp6cOeL2Xfu8g3Ka9EDthlYMbwonlTCxVmio AT0Us95gZkCv2w== X-ME-Sender: Received: from localhost.localdomain (unknown [115.150.27.206]) by mail.messagingengine.com (Postfix) with ESMTPA id 4933A7E1A2; Wed, 24 Jan 2018 10:39:37 -0500 (EST) From: Yuanhan Liu To: Hemant Agrawal Cc: dpdk stable Date: Wed, 24 Jan 2018 23:32:32 +0800 Message-Id: <1516808026-25523-84-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516808026-25523-1-git-send-email-yliu@fridaylinux.org> References: <1516808026-25523-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/dpaa: fix FW version code' has been queued to LTS release 17.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: Wed, 24 Jan 2018 15:39:40 -0000 Hi, FYI, your patch has been queued to LTS release 17.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 01/26/18. So please shout if anyone has objections. Thanks. --yliu --- >>From b6842c2b2fe8e61d6e0fd345240cfcc371bee5d2 Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Wed, 10 Jan 2018 16:16:25 +0530 Subject: [PATCH] net/dpaa: fix FW version code [ upstream commit a8e78906afba01d60a86c19c50ba0e43c5c1d13b ] fix the soc id path and missing fclose Fixes: cf0fab1d2ca5 ("net/dpaa: support firmware version get API") Signed-off-by: Hemant Agrawal --- drivers/net/dpaa/dpaa_ethdev.c | 14 +++++--------- drivers/net/dpaa/dpaa_ethdev.h | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 3023302..29678c5 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -212,19 +212,15 @@ dpaa_fw_version_get(struct rte_eth_dev *dev __rte_unused, DPAA_PMD_ERR("Unable to open SoC device"); return -ENOTSUP; /* Not supported on this infra */ } - - ret = fscanf(svr_file, "svr:%x", &svr_ver); - if (ret <= 0) { + if (fscanf(svr_file, "svr:%x", &svr_ver) <= 0) DPAA_PMD_ERR("Unable to read SoC device"); - return -ENOTSUP; /* Not supported on this infra */ - } - ret = snprintf(fw_version, fw_size, - "svr:%x-fman-v%x", - svr_ver, - fman_ip_rev); + fclose(svr_file); + ret = snprintf(fw_version, fw_size, "SVR:%x-fman-v%x", + svr_ver, fman_ip_rev); ret += 1; /* add the size of '\0' */ + if (fw_size < (uint32_t)ret) return ret; else diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h index 5457d61..ec5ae13 100644 --- a/drivers/net/dpaa/dpaa_ethdev.h +++ b/drivers/net/dpaa/dpaa_ethdev.h @@ -46,7 +46,7 @@ /* DPAA SoC identifier; If this is not available, it can be concluded * that board is non-DPAA. Single slot is currently supported. */ -#define DPAA_SOC_ID_FILE "sys/devices/soc0/soc_id" +#define DPAA_SOC_ID_FILE "/sys/devices/soc0/soc_id" #define DPAA_MBUF_HW_ANNOTATION 64 #define DPAA_FD_PTA_SIZE 64 -- 2.7.4