d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/dpaa: fix FW version code

Browse Source 
fix the soc id path and missing fclose

Fixes: cf0fab1d2c ("net/dpaa: support firmware version get API")
Cc: stable@dpdk.org

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
This commit is contained in:
Hemant Agrawal 2018-01-10 16:16:25 +05:30 committed by Ferruh Yigit
parent d565c88738
commit a8e78906af
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/dpaa/dpaa_ethdev.c
View File

@ -186,19 +186,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

2
drivers/net/dpaa/dpaa_ethdev.h
View File

@ -20,7 +20,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