From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0047.outbound.protection.outlook.com [104.47.41.47]) by dpdk.org (Postfix) with ESMTP id 48ED31B1A3 for ; Wed, 10 Jan 2018 11:48:02 +0100 (CET) Received: from BN6PR03CA0017.namprd03.prod.outlook.com (10.168.230.155) by BN6PR03MB2690.namprd03.prod.outlook.com (10.173.144.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.366.8; Wed, 10 Jan 2018 10:48:00 +0000 Received: from BN1AFFO11FD048.protection.gbl (2a01:111:f400:7c10::107) by BN6PR03CA0017.outlook.office365.com (2603:10b6:404:23::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Wed, 10 Jan 2018 10:48:00 +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 BN1AFFO11FD048.mail.protection.outlook.com (10.58.53.63) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Wed, 10 Jan 2018 10:47:27 +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 w0AAljSM007124; Wed, 10 Jan 2018 03:47:55 -0700 From: Hemant Agrawal To: CC: , Date: Wed, 10 Jan 2018 16:16:26 +0530 Message-ID: <1515581201-29784-5-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515581201-29784-1-git-send-email-hemant.agrawal@nxp.com> References: <1515504186-13587-1-git-send-email-hemant.agrawal@nxp.com> <1515581201-29784-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131600548492964143; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(396003)(39380400002)(346002)(376002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189003)(199004)(6666003)(106466001)(53936002)(105606002)(59450400001)(6916009)(50466002)(68736007)(36756003)(498600001)(2950100002)(47776003)(2351001)(85426001)(356003)(77096006)(50226002)(2906002)(97736004)(305945005)(76176011)(8656006)(5660300001)(51416003)(8936002)(48376002)(81166006)(8676002)(86362001)(16586007)(104016004)(296002)(54906003)(15650500001)(4326008)(81156014)(316002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2690; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD048; 1:IuJf3lXj8vgBKKQojEzg6GvajwoWzQa8xc6Gh81Tf/PEa2z3y9GG+kBBtw2Y1w1rpU2sQg6Gfz3edDH/UXv/FNiIlV/G4jrIr/R95I3LnlAyKYIDX8kmvmKNXXArSv4X MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 90217365-fbca-40c6-712f-08d558178ba2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4628075)(201703131517081)(5600026)(4604075)(2017052603307); SRVR:BN6PR03MB2690; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2690; 3:DZWBpSUpAWyaTkbh7ff49BFcD1d13ioxM66Auzb10/LJPsewG9E05VA7kPefgt29QmoXLiz+DXwABfsehx76mn3VfYwkPtVgkB/YZwkK6pj6jnoioNydP3NIcvSKJHfUIyS6/rX2uiF9D0lwQcEWNp4oSnwW0EjntxZXbWlEDafugA/qGVFmfCmhO3OG8rWDkyAFP96j18dzK5uTkUUR0StBesKjPpuPxfFKDQTe300Q1Z4+b08U/4TnWM0kz6I+d4wa2d0YRg5MyTrFiXb/L1LjwyCger5t1SOCegCtTQzAE/RYFSxd2QIG2aE8uixISmk6THZLLLDNyMZq8jRfYEPL9utpcjyxviPHCMtJD7Y=; 25:PROAK5rLpgETn8LxuD7OEAXCikESo5q+32vH57UizM5XQ8ViY9nypdadf9FW8pmRm0WkILNep+yaO8h5DDdinbeGo713NmYrZj5eQpqLmOubXdZ86kz/5YsnL5NOgd6pfKj2JModBpB+Emo37BM0ay+BbZX7x3L441r6HxU3/ZE5W9NLAJfQf+i+l1cND8TN949W9oXGick8Y3bfLEs0NcGVvSnHHUNCqmF/pz4+BWlo0m17v9S3B+mQ7BuKt7QuawYKIM1qiWAsOSUybsi0pLM3ZIWg1E04nUG0ylqyLgfLQH4+8Ggm8ktS6b4bxiVd19qZq3cA5CfzLDFuh+xglQ== X-MS-TrafficTypeDiagnostic: BN6PR03MB2690: X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2690; 31:lURrCYnrUC5Ul4OmvJckEk0FxAG+66ZfLFc8TCLUmJDLv8AuaAcqcJp0fnIrQsRc32rdeP1aiQ/fnyb9kGhvQT/bGgUAgKjIdJU8YPs2qQdm4Cz/iZ9Rx1fBeIimXSkzQeegbs+AABUpf0YlDN8fHFSNaVY2tsmk9FEac/d1hKgUlsOFBO95IerQHaGJQE+kiz3/2dUuJBZqKDkacHjqoAZ+iFRhHW6R8nNUVMRkeWs=; 4:U9RroxrZaLsfNPX419o7RqJPZKzk3+n1Y/c9hvFIjzQuGI4cpqOQbvDwqRASvZQZjPcLQwet6BZYryy0MSKz5Ww8WPIJEiaohtbcLqto48OGyqpInbu6cYeqipiYnwTxXPmb+4bkIDjxcvUbCed1eEXzYjjSmiWrh/wKmHB0Q7PLd3A499bqmEj0t6h/sMnIjalTncuGHyADj5cWzzvH55Fv3N8KXBmtcurTHGxGTtQo5ewn3WeBAem8sjv4i6Pb9Lf8pbonCwceN++vGlNq3xIGHWfgu3hXAqw8Dq647Vemz+bfOZigVzQvdECS+Rm0D+hVLxxnDRZqkerHN0UziFEOTYUgZA4EeophNBsHyrA= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(3231023)(944510075)(944921075)(946801075)(946901075)(10201501046)(6055026)(6096035)(20161123565025)(20161123556025)(20161123561025)(20161123563025)(20161123559100)(201703131430075)(201703131520075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(201708071742011); SRVR:BN6PR03MB2690; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:BN6PR03MB2690; X-Forefront-PRVS: 0548586081 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2690; 23:GuBsjf/EWLcqe/wPAI6eYghfJJGu48OFrnGoNoKnR?= =?us-ascii?Q?nhIYhBf4EpKR2gpVr74lg2nIHcckIkSruIZut0F23JwcpWgLQPCMXndiz9cI?= =?us-ascii?Q?rH26mOHRM9azRkf5cIauMjEK9njU3hfV7zTeCls+n+v3XFA127OwyhwG0zqy?= =?us-ascii?Q?Ne4ycF9HQEKTnJVUzuECXtQKlP7jtpHqbNswfnCaH2jhQiSzeCm4gnsN2YkS?= =?us-ascii?Q?3el2B6W4NSANFF2/JAB9jBt3TmmZdMBcPfPhWNWgyG4oQS8HlAw6ujrWVYJE?= =?us-ascii?Q?h2hzQ2ivT5Imp8FrIXgCdS4NS8VYoIl/rvsPWi39Hi1L6T9C6ONNiQlSSASA?= =?us-ascii?Q?L4xL13KylHuNk7M+tWzMr3aPZtvuOTKxF46nfnFnu6A4e6UR7ZhV3CqFVkcN?= =?us-ascii?Q?WDZHCX+mRnGVn7TuBBQrz2csoSbZXuzwycj34dQf+L5rUJD4Q9LTdo1jHBDj?= =?us-ascii?Q?wAJadtGu8I2yAU0ZAPWURrYS72LCj9qUGEwu9eWmcXJr2hLtbXvO6MayP/pK?= =?us-ascii?Q?mKwQHXkwoBtxmTfOhCdKQHlXwyuMJFAXPaGw0FbBWfhuisvU3v2xAmV91KBL?= =?us-ascii?Q?HRx4eUC60+H1YpOTYEYs+Bb1W23L/R+JQJVg0ixX9OiFE5/hicEM0TTH6H0X?= =?us-ascii?Q?UfLnc8vM4td0E0EF3iHB2NybFtc32ZG2qAHNurcKpFTsYR/7J3jik8rfg67D?= =?us-ascii?Q?dBa+zc5uKkJ7tPjXSVX1dkvuOsjpNRx2bz3ZgCER9BC8MM5I/Y07LNgQPS6d?= =?us-ascii?Q?OW8QtrGTumR1Kdh4Zu1wHSSwKa5Cc6gzkgdUOIxPAi6QNAq6jm8iPe4/jYYC?= =?us-ascii?Q?5+r+wzi1lkn7jSUe4snrhIAWqfrkAX0dQXazULp13g2VmHEi/UrWuQadSSL4?= =?us-ascii?Q?m46UkBYkKQFDuZxlnEYfg60uEvSiwyaGWbFyrqCcgEMnXKzGdrqCxP+AdyDv?= =?us-ascii?Q?cqTvtn8FUV0r9ioQVrd3l0pbpGma92CicgSOSZ4aX3LFqWY4CNtsHtFlcXn/?= =?us-ascii?Q?FLLcqW3poSSFqQ/RtgP2M4z5OVbnnthhewJVCCsdR3yxZbZEhbD4ZHXWGEm/?= =?us-ascii?Q?uQ4GsvEu0Ivyg8ze9uU4FJGU3HmTMtve8svaGJ67Q1RHMBsXkPZeViousljW?= =?us-ascii?Q?TlzFRhfJtsxvjwWmgYxr1IH8Xtq3Vfb?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2690; 6:4tS/bTAatALWGURSxr+AwKVbkasFAXajz6pRZv7I11Ahdum4HeBvJjJgCc/XPnzoQ2Ps8kXQ7sL3WWAtk8DIru61Gkxky/hWlFPHreuXaM7Jmg2UKlnn5ZE4rNernfSc961V/4ye8+wOW7G9wEoDm/mzq3OAgT0GWF+Xd6obNTgGTsccAhpFeLcpXmsBhE0H7ZuDL4cV7DrViJZJgvIQQueJPm+UDX7/LMcF9cuAgZQVdtqDs4ohKTTHiyU+/9A4y1gDxBSTYny5Yt/QuCwrgzuB/1fZb1ijFtiSVWGaD3Ys76cduwO9sjy76uh+nXzja812yh1T3HAtSU1rBgQfChKtDcVQbyInSWM264wVbrY=; 5:CVVTaRLto6Co6zMEmnwaMnpvcUB2iDFuh9L5sJsUeifEcm4g7eOgh1HAdawLHkb6HkNWR+WltyaM5KBWdr3L6CRiy3wzvtxJjrQ8tLZt1KABSIWVUMEPEV/bfaa0cGtAklNg2tCIzMLt3DYh9NqJiOiKASHT/7SbBuIugCj9AbM=; 24:itLv4SiGE6LizC0sRBmXJBH3PvpiVK4UqAATm4Jix+6dJuXfMPCUPDrtuTDTqBb47QoLuTvPRWMVHphM2gU3HNK1BwhDGKUk82/GdZcJxsU=; 7:hointOOhsm22wNcACzUfYcYgATn/hjz8roZ5jZt8Q9yzzqveHQJ2sRwgP7LPEm3YLrfDBL0FXkOBSywKVH17jcTUhu6HjxSGKcQyzprQ74SxPBpQ4zoFuOZOGduVpPiTM8B1VrZVeEc2rWT4FXUJ71B3gLrrC/rmm50hWF+V9hmNlTWTFZ+vNa1O+hQnthbc10JGEgILLBWxarvc3CNmIWB69FqE4j4N7GRb42cSUUAUuF8lZCV/88uBDRH3BT8L SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2018 10:47:27.5180 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 90217365-fbca-40c6-712f-08d558178ba2 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: BN6PR03MB2690 Subject: [dpdk-dev] [PATCH v3 04/19] bus/dpaa: update platform soc value register routines 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: Wed, 10 Jan 2018 10:48:02 -0000 This patch update the logic and expose the soc value register, so that it can be used by other modules as well. Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/dpaa_bus.c | 12 ++++++++++++ drivers/bus/dpaa/rte_bus_dpaa_version.map | 8 ++++++++ drivers/bus/dpaa/rte_dpaa_bus.h | 11 +++++++++++ drivers/net/dpaa/dpaa_ethdev.c | 4 +++- drivers/net/dpaa/dpaa_ethdev.h | 5 ----- 5 files changed, 34 insertions(+), 6 deletions(-) diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index 79f4858..a7c05b3 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -51,6 +51,8 @@ struct netcfg_info *dpaa_netcfg; /* define a variable to hold the portal_key, once created.*/ pthread_key_t dpaa_portal_key; +unsigned int dpaa_svr_family; + RTE_DEFINE_PER_LCORE(bool, _dpaa_io); static inline void @@ -417,6 +419,8 @@ rte_dpaa_bus_probe(void) int ret = -1; struct rte_dpaa_device *dev; struct rte_dpaa_driver *drv; + FILE *svr_file = NULL; + unsigned int svr_ver; BUS_INIT_FUNC_TRACE(); @@ -436,6 +440,14 @@ rte_dpaa_bus_probe(void) break; } } + + svr_file = fopen(DPAA_SOC_ID_FILE, "r"); + if (svr_file) { + if (fscanf(svr_file, "svr:%x", &svr_ver) > 0) + dpaa_svr_family = svr_ver & SVR_MASK; + fclose(svr_file); + } + return 0; } diff --git a/drivers/bus/dpaa/rte_bus_dpaa_version.map b/drivers/bus/dpaa/rte_bus_dpaa_version.map index fb9d532..eeeb458 100644 --- a/drivers/bus/dpaa/rte_bus_dpaa_version.map +++ b/drivers/bus/dpaa/rte_bus_dpaa_version.map @@ -64,3 +64,11 @@ DPDK_17.11 { local: *; }; + +DPDK_18.02 { + global: + + dpaa_svr_family; + + local: *; +} DPDK_17.11; diff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/rte_dpaa_bus.h index 5758274..d9e8c84 100644 --- a/drivers/bus/dpaa/rte_dpaa_bus.h +++ b/drivers/bus/dpaa/rte_dpaa_bus.h @@ -20,6 +20,17 @@ #define DEV_TO_DPAA_DEVICE(ptr) \ container_of(ptr, struct rte_dpaa_device, device) +/* 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 SVR_LS1043A_FAMILY 0x87920000 +#define SVR_LS1046A_FAMILY 0x87070000 +#define SVR_MASK 0xffff0000 + +extern unsigned int dpaa_svr_family; + struct rte_dpaa_device; struct rte_dpaa_driver; diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index db6574f..24943ef 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -186,7 +186,9 @@ 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 */ } - if (fscanf(svr_file, "svr:%x", &svr_ver) <= 0) + if (fscanf(svr_file, "svr:%x", &svr_ver) > 0) + dpaa_svr_family = svr_ver & SVR_MASK; + else DPAA_PMD_ERR("Unable to read SoC device"); fclose(svr_file); diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h index 254fca2..9c3b42c 100644 --- a/drivers/net/dpaa/dpaa_ethdev.h +++ b/drivers/net/dpaa/dpaa_ethdev.h @@ -17,11 +17,6 @@ #include #include -/* 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_MBUF_HW_ANNOTATION 64 #define DPAA_FD_PTA_SIZE 64 -- 2.7.4