From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0044.outbound.protection.outlook.com [104.47.42.44]) by dpdk.org (Postfix) with ESMTP id 3162A1B235; Tue, 9 Jan 2018 14:24:51 +0100 (CET) Received: from MWHPR03CA0012.namprd03.prod.outlook.com (10.175.133.150) by BY2PR0301MB0727.namprd03.prod.outlook.com (10.160.63.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Tue, 9 Jan 2018 13:24:18 +0000 Received: from BY2FFO11FD042.protection.gbl (2a01:111:f400:7c0c::169) by MWHPR03CA0012.outlook.office365.com (2603:10b6:300:117::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Tue, 9 Jan 2018 13:24:18 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; NXP1.onmicrosoft.com; dkim=none (message not signed) header.d=none;NXP1.onmicrosoft.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD042.mail.protection.outlook.com (10.1.14.227) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Tue, 9 Jan 2018 13:23:47 +0000 Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w09DOAVk017638; Tue, 9 Jan 2018 06:24:15 -0700 From: Hemant Agrawal To: CC: , , Date: Tue, 9 Jan 2018 18:52:50 +0530 Message-ID: <1515504186-13587-3-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515504186-13587-1-git-send-email-hemant.agrawal@nxp.com> References: <1513166759-13466-1-git-send-email-hemant.agrawal@nxp.com> <1515504186-13587-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131599778279230706; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39380400002)(376002)(396003)(346002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(199004)(189003)(105606002)(106466001)(104016004)(50226002)(53936002)(8676002)(8936002)(5660300001)(4326008)(8656006)(2906002)(16586007)(54906003)(2351001)(51416003)(76176011)(97736004)(86362001)(305945005)(50466002)(81166006)(36756003)(356003)(81156014)(68736007)(316002)(575784001)(2950100002)(296002)(498600001)(6916009)(48376002)(77096006)(85426001)(47776003)(6666003); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0727; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD042; 1:23myyHaIgL3R3V8l5pqg6VQtsSjO5BAcKeBKL7RryrvxbMzutu+3O3uzUqJQlcvuAvYUIbK3CJG3cugpOtJcYrx9sK14Smijoc7ZNSq2WAxKKVtBqvxs5Fz871SdkODD MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 30e51908-7327-40c6-8cf2-08d557643751 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4628075)(201703131517081)(5600026)(4604075)(2017052603307); SRVR:BY2PR0301MB0727; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0727; 3:H8J4o+t4bGzeVhyqBDJKMgrj7CaIaCWSIi9c51Tk8z7SF3frSA5viA4wfmEFqP1zYjhYCLVno4xs+M1VxQ8in729y2aQI8QLCuRXzMCH/Zx2WGr/BplBgZWW5WPwtkRCgKbrgCZvZhGKV9xDgL/M1w8zjbFtb+oHUUiP6klp3rIO81yc/cA2c1USTByCh4nEUrzLPH28heqcBg0GZNiA53foE58XHSZJniXVPwLAyMtWngf/dDRd14Ax+tSc94cf3+Em/xScXVLr8ns7G60+s27gcs+p/MiVIL8SErGOU9by10akriGUfq+OMACXB0DJto40JfdIoKJ05N8uDj2FCOni98L2NU5Koy8de1ocJd4=; 25:LRsD+SrA/j3OInYCkGld7BQApa299z7g2Q1UIoZIp14m4hd91qRPTquwrZVQ1hR/k8xHRDKMGcjRpj/E/fTviFzifhJ0bPxaV36zbT/rYtI59dWldZh4bJYJSjiSHhqK5N6Wr0Ff50MmlmlwUPMgDM6mo/KzfEMNCLARpZAFtqqZidXpJZKiXZQvFXXVj4WxiVjWp8p7s36qkjYiRQm3hYX+mWfGOOF46Wn2ZUmBs+ajOB4HCmPTAH8LMs9qFNc1Coagms5gCglUSTQTs9B2lj2lYazESPOZxHFZZzxcEfGA4hFKJ6lTHW3J93m+/a+6n7NlEPGnZH1XCezePxoUgQ== X-MS-TrafficTypeDiagnostic: BY2PR0301MB0727: X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0727; 31:B9LMiEL9YfJpnUMV/GbJ92PrCAKxmH+U5YDhhK5Y834+wehr+Rjacr5WX3/V8WlY/uFrQnykYOOb7AXkhNFseLFN/ffXpkI/TTc2UPoHwkaz8maBdetRy97SD56WhtD2N4V6wdknd5u2XJGWzBBEUQXZ0tA9E1pN/pUGSblrHyrxXpJYtD0fch7nvmYTiHYWe2TD4HJPpMPXKzt7osxk525i+ojNRg9vQFhkw48OPtw=; 4:6/1/p+pP6KUEaTrea2haMq+iQHzx8o2g0Ggk/wEUWWRKgmM9LhEpi8AsACl0i/A+0I6Y1wlY41UzLt2FQyQVsGiS+uO6SWjlJoGzBCQKHuTuijEpqTkUix3BrpBnQKJyCbZH3du6yvHl9ES1S1a+bAeGW31D4Rx+Xa61kfoxxPhszB6MXLTA9WizaMYAAbDjQ1ZrDiecXTS9xa03MHzHGJMHWKUBPVALsLiE1D3yCZ6QTSiP1N+W0SUTdSt3XHpXvv7EdQLLATXdI3gN05De+sZf3bI/qWpLV44mVgdscgHhnbRIC45v5HJbAf6HTdfb X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231023)(944510075)(944921075)(946801075)(946901075)(6055026)(6096035)(20161123561025)(20161123556025)(201703131430075)(201703131520075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(20161123563025)(20161123565025)(20161123559100)(201708071742011); SRVR:BY2PR0301MB0727; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:BY2PR0301MB0727; X-Forefront-PRVS: 0547116B72 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0727; 23:Un1NXE6eO+4QmydQDs+XqC1vGd3+tMTeF9FDkig?= =?us-ascii?Q?uUUF/9z4p9GbrAAQBMEl1qZjMvCPwYqlOgOoJZrKqzIV2GdoNTD6ZiX7dEwx?= =?us-ascii?Q?YGXhFZ3rlYWf/+hLCFXxFEJ5pC/wpmSEgUU2Zq2gpDZEpYeO1rU9IjnqVLzv?= =?us-ascii?Q?QvWaqS/8x3+tEonN4kMeaO6qIbZWW+zA765LajGlUJql4JXienGNpRPjgjtE?= =?us-ascii?Q?jo4sS8bGmUauMmq5N4YfoJgerHGyojOLS5ebICdqZQdf0iQSAgTlMJk/qAD6?= =?us-ascii?Q?F+sz3WimTqxRw0zRBYQhryEklCfrEgcM/PxfHJc7oEd3iGNNOQWIjBlqLtD+?= =?us-ascii?Q?rl1SQnPd6LZldlgtukhEFwa5mPOMxt9EZYOatsjlDIpOEl1lOkA991JYhjRT?= =?us-ascii?Q?7TbFpInIgsn50yjyLwPVJ15u6S6uRQP3AFvTbbD47Czgwkef4X2mPqkipejA?= =?us-ascii?Q?J0a4XdUXhhMsIusatvSA/h07PbPwykhRSLTSRPWLU2WRtDRJr26t2TDDffQv?= =?us-ascii?Q?SF1/CkYdXfX6TDWi9AKf/K6seBkuZHOvKx4f+YAqQ9Qzxdlv8kMfUKwWWwlC?= =?us-ascii?Q?ZabJB4tDVHykekTVuHXZoB+hu14f04RQCChhNkuH5GFTJg1UvtZkHtjUURiY?= =?us-ascii?Q?wzodKcnb1rVJ9ix4s8uwFydWLCkFDGs4MihiNxXUb8ZzfyluZqEeKQ2W1kiS?= =?us-ascii?Q?oi40LL7YsueAL4e40E0JHBhsfplEKTbjSjdJ8+0puaUdA0sKNIIMA36Vnn1E?= =?us-ascii?Q?85Jxb8w4WGFuwrkJITwNTEZ18STWNB/Dnpej9vMezWbrI8gNAk5lCww3Vvwt?= =?us-ascii?Q?mDs2VyteFDLicxxBUyhRgMtvRF6eF30j64m0/4wJFBvFKq/2ZbvnudY0RVLq?= =?us-ascii?Q?KQ66EbDi/Nq/AsjXrJ8piEqr4Vxogg7QVo6BPwSQ30AiS2QzmDyppvqUaHSP?= =?us-ascii?Q?7R6wjAvMOZDhwalNqDEBc4ozDZnHIF7PVUKjA5Fk98DEyHMvcLGj6vrRZTKM?= =?us-ascii?Q?/p//NBWYmcjP4zQCxGyB3hDc4ZasDZv0P/uqdoxSx55Q8ISuabETaMjn8bRZ?= =?us-ascii?Q?T69KI1VJCz6kVmVLq/C9//FTwAmkRU9sqbEbC7pLp60epu8QNNw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0727; 6:xVLKmbFbmU+6eKxyicBSZ8Q37FenJ8ENdNaNcD4OetXMrtJ3qFU3Nt2G+x7qlXnvDaW329+QAwS3kr1LfhsSfujVsghWm+KmzVuM8s4j/RWupvDs/MZctyKAMP1mICHQZrTmac3L+CHhVK9S7btQymBfTOKqmCDP+olzZ5RYLiqhlw2gH7ZkvzUyBBYkaA5bu5Hu0JiRe6XJt1+EVrON6fOn2tgqUvE5dY+AwHNKVW+Sq/Sa1GV+BixHQx0FSHeEOOXE8ijYfijTo8SvwrSna+JZNDapRdJ4N5NHazAkxKbiKAT8CvP/TgupqRa6tY7yqsPpM2PfBJUIy7J8Yb0DWh+kl8OqqE6l/rYxB5eVgaI=; 5:mYa5jKhClobrs5a10rT8NIedoDzWgo0TlJ5RKxLhEgjdjGru1shUs2eBJ+Bw0qdYC4SgR3H0yQp4z3QZi1MS4+YOJSfhV1a6TMaiiIbaWmAATz1OjXSmEZwePtidXx03W2JdEzwMj48jHmYBraG1L2+IfDorNYR4To+rkrZcO/A=; 24:b/I5Wqzo/CfOmDyJNUcvxzbJF58xdldCA5MB3NGpol31IZ7IMVC6U0+gj7L1yGGybqaxuKKNVmfBiettzT9uTQpMefqfn8Xc2JAeKPY1bXU=; 7:xzKnOg7QeqWTAFqjNtlgD7fxlpPnCq7oKpnF07G1VgopKfCVlFCOVFCZdOytJCOtc/occz5VdVO9OocDEf72FDDPEyjGihxt/McrhuoID5XNDhRboXPkl3IEJ3VQpIhQ8i2ncwqQLyY0aKNYhoNlyn2MjP7ckJ8wvZPRQN2LgaOmoku1GH3nzygllviMeZY98DWylne09NJntJRnjf4E7FqZ69mZfaDpioEnlm2GlTFPbhyI6JIVXrHQWfDMDoFY SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jan 2018 13:23:47.7358 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 30e51908-7327-40c6-8cf2-08d557643751 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB0727 Subject: [dpdk-dev] [PATCH v2 02/18] net/dpaa: fix FW version code 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: Tue, 09 Jan 2018 13:24:52 -0000 fix the soc id path and missing fclose Fixes: cf0fab1d2ca5 ("net/dpaa: support firmware version get API") Cc: stable@dpdk.org 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 7b4a6f1..db6574f 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -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 diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h index bd63ee0..254fca2 100644 --- a/drivers/net/dpaa/dpaa_ethdev.h +++ b/drivers/net/dpaa/dpaa_ethdev.h @@ -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 -- 2.7.4