From patchwork Wed Dec 13 12:05:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 121742 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5382898qgn; Wed, 13 Dec 2017 04:07:43 -0800 (PST) X-Google-Smtp-Source: ACJfBosATeMhA0LFe4xU1jguxl1Mp7F2IibZEfRwh0h0kG1xUJBENuK1u+S+7t2urAx1m9HUqb2W X-Received: by 10.28.153.210 with SMTP id b201mr2014450wme.2.1513166863071; Wed, 13 Dec 2017 04:07:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513166863; cv=none; d=google.com; s=arc-20160816; b=x/oj6C6SU1elY9ITcXqK+M4GgyWkIJAayP5U6883aJa6TQIffgN4DcpJxZMD839BbY r3y5l7eaduiElgZIIHID3DU/ydnG/AnOKpeMoZYxVPO9X7cRnDSwXPdeXLEtMJhJW9Ro HNLAUUxgHpEoiP/U/oXfAY2MN9GL4y46Ymp6Q7GObpMYY0wT7dPG2bsoydh2IKERT68U XFoHuPKgXS+ZVQ7L7r1aprCW7Y+nKSNesUoKItWK6vXNDlEgM8rB30n0Fb+B84rIlqip X3b1VBRIQ4a2UG/AOhq19c4BFIBBbaoeYWygv1bRLrnA6CHLzCFLAdz2DqhlmlXqs/Xm Zung== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:cc:to:from:arc-authentication-results; bh=olNuW4OkH1heAlGR1AMCEVf5ImZId1MorA9RKGCvACM=; b=alQCt0p+zIw7+nHb3fN0UeezT5ruw7CTaiOf6/Qk1sVAef5bYQT5KQR2ajLNQl6XNy Ax+on5ng/LOXDhGc4/ux+I0L6BABLh28f49XjuCKUltfdN63AONpbrbuU32wdNF0UPSU Yykc9gi02UYERSKwit57HiGooFibOBmX1S366w5dWq+jZ6Z2Zj5x589LdSXxVquAfEjC dIilU3J6jzQB51RvqbNP0uRUAf7fN00q//RuJOr1M15F9nFkP271mHx63x0th8JBOjFU +niRcc7H1w3BSCISamk41VsPed4VG/mk8MMKX7CdnjORphY6dqVBBvukHWs1igaqPIrp WGNg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id y71si1344193wrb.505.2017.12.13.04.07.42; Wed, 13 Dec 2017 04:07:43 -0800 (PST) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3BE099B6B; Wed, 13 Dec 2017 13:07:09 +0100 (CET) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0079.outbound.protection.outlook.com [104.47.37.79]) by dpdk.org (Postfix) with ESMTP id A01CE293B for ; Wed, 13 Dec 2017 13:07:06 +0100 (CET) Received: from BLUPR0301CA0034.namprd03.prod.outlook.com (10.162.113.172) by MWHPR03MB2702.namprd03.prod.outlook.com (10.168.207.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.302.9; Wed, 13 Dec 2017 12:07:05 +0000 Received: from BN1BFFO11FD012.protection.gbl (2a01:111:f400:7c10::1:184) by BLUPR0301CA0034.outlook.office365.com (2a01:111:e400:5259::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.302.9 via Frontend Transport; Wed, 13 Dec 2017 12:07:04 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; intel.com; dkim=none (message not signed) header.d=none; intel.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 BN1BFFO11FD012.mail.protection.outlook.com (10.58.144.75) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.282.5 via Frontend Transport; Wed, 13 Dec 2017 12:06:57 +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 vBDC6t9O008652; Wed, 13 Dec 2017 05:07:03 -0700 From: Hemant Agrawal To: CC: Date: Wed, 13 Dec 2017 17:35:45 +0530 Message-ID: <1513166759-13466-5-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513166759-13466-1-git-send-email-hemant.agrawal@nxp.com> References: <1513166759-13466-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131576404178894808; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(336005)(346002)(39380400002)(39860400002)(376002)(2980300002)(1110001)(1109001)(339900001)(3190300001)(199004)(189003)(2950100002)(68736007)(51416003)(15650500001)(356003)(85426001)(97736004)(59450400001)(76176011)(104016004)(6666003)(6916009)(2906002)(86362001)(5660300001)(4326008)(47776003)(53936002)(2351001)(106466001)(105606002)(50466002)(316002)(36756003)(50226002)(77096006)(48376002)(8936002)(8676002)(81156014)(305945005)(81166006)(498600001)(16586007); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2702; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD012; 1:UgQUQ1xy/Jw8Accgk+CUFicsS+tBSTLpwzC/ztbsUDIlSqpLpRB/HYOt0A6m1F0J1m14cmnnWrj+RSqkYwm8aM6/mV2cMFEsAjR4q9EjtdyZB7r5cCkx30C29DY8J8e3 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 35374a82-ed48-4eb5-ffd8-08d54222025e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4628075)(201703131517081)(5600026)(4604075)(2017052603307); SRVR:MWHPR03MB2702; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2702; 3:X3DOGgv4wBXS+Zy5Q5OVzkSdzl+w60qF2wS76V3GxMoOp/oS2N6vB7RbzsD/MJV4BOw0ME8B2OWKnfy9vULyKYzWgSM6LFQc0GfzPs6T09dyLzJxmVA06aCb3+gZ85idlL2bxT6IzL8o6VKLLS4BXUD+cy9JY0orT76N5NbvkJ+WtVpUHgcpv3JuTWElk7VT2Wl2AN+anPfNa3DOUs1I96mf9ViO+xxUO3AVaiug2NQ8bqiTqMf/rGw7UQFumeulwr+Ol4oKth7M4gMHcRzfw+PI7W/Ub4ruBMo/Tr9pb/9Yy+ffP3hWl2JtCCj1J1gSPZVgKcVuYAzjQNjsBBYpYXZweuQ/iwFZMzDKGy70wIw=; 25:+/zuq/c40l7kPVRYGc+vT2GEbviFFLC0JpiWeRUY9TV+CTNcDYP/QlCrDrazD/hqFMxKVEsrOc6/OHbF6ojgUQdeb3P/mAPG82B7SRvM9XhhbQUoZYOdg32U+z/CtX9XdBFCRGiJAr+2hqibdMxyKSVIrhZAmmoutGsZqqMKtsVrpNnDXwTK0AvkkLs/mfdjJHxyUsAUhPPExQ1rLuF3n/rhMbeEpb0V23ut2VtRX6nGeLb3Fq3W0NmJ/MKkYyQFFB6Q5MPsI7LKw67X2EG/wVqQjw4b3PHNt7AB+kRYl+OJFzSmuwjhOFgEe1kRwgsD30mecgnzCCeAeJGAjsvfOQ== X-MS-TrafficTypeDiagnostic: MWHPR03MB2702: X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2702; 31:lRTlqFnmaLTrTnFyUNTu7mBLeHLD0YRD7RHYNeVWr8s2sEqbtRmJVfFGt9vkSipNlmsjq/J1wKH3BgK1Ez0waAbJjnFR5mg2TTbHA+R4ydk2y2JmP2WUJouASdI9LvH4ETaPld09MPsioKCb9TTzuK80HYK1twAOJUieAoBmo1EcGJCqhKnP3k6hX+pTt1KbbzdWhJbKzf5p/LCnQx1Zqs9YJr0lgqZXBDwGwrTsk7M=; 4:pQ9QHrv7lumhhpiGohDehY1j1zwxkC4ivvNKWCc+7gu78MMt+ywjDbPBpX3ZValRHq4gh4TMi3y5U/flmFMwmhKFsUwkgw7iCqg2ISJX715D5A+CG8VDyT8rZaNNIbfELELLVyKJp7F6vNmcEwJTVJNeEE6BujsyuXM2Hr92IRqkzs8bWS3p5RYoIcWKwIaQ58xrD6HtrjRw7y5U4D2pk0M24fTcWz2nBtE27UuVv/UkS5YJFP/48suZLVYKs5MFpw18kWMEkVh5E/aALAq9DS5BAidxHwEO4hgUI7JQa1C7ffDDtm/wO+ehbPjnIAea8XCW5zlpgEQpGGvTO9sTPuQuP2uu+mGq6NCz4FUNULY= 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)(5005006)(8121501046)(93006095)(93001095)(3231023)(10201501046)(3002001)(6055026)(6096035)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123559100)(20161123556025)(20161123565025)(20161123563025)(20161123561025)(201708071742011); SRVR:MWHPR03MB2702; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:MWHPR03MB2702; X-Forefront-PRVS: 052017CAF1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2702; 23:3sG7o0AL4P+GSBeXYi9rY2mijAPxWx/jtU/yvedAP?= 4BhFAKlYhbnAIyzHjbhTVJOHHT1xv/tHwcRnyQf9tVwnmu+JyQYZhlL+PPFQmgrOxbLSjGmAbm0YRBmdbY+iqIPKuoqTcBxwTYpznGuiz5KqQBfr00ivzZlK055Ve8Z0X8rgy2COupqldf7USoTdys3IETJT8jT+G2yJvQeW+7Eajl1wLreH7y9qPyFGeEUDvS2HZJcOp2a71QWDOjrIhk+vAUTElFhzLt5crKb93vl3H7gdLuH5PGUhT0HdWCw7esOY21BUvTe3avQ3xaP0dVdHuBTpTZOlkBqZRNpzyIbsxwcZkd8t7aMLqbB6Y9eIJCXFab02C2Hv2QsoW81dJrH7y2mnRid/zpwSxI0O4Z8pGpJYGB0rxciaXXwVoHeAFvHNgNHK6tpIuhZhgGRAwP+gCrnT65KTKYT1n4udCdzZUesim+ml65e5L2LID7n801waLX4do6mhDdgpbegC4JerE/GTHh1pThAVpTb5y/TvZM/32hlBC0NqGvnUWFWkTQUoJu4dwZYmzznYVIBBZtnfpoWrqj+yZizNsbGDeiCQK45rCTmJgkwNzBnXYXOT+WsgEN1mhqxjZrxZtTyNT290NkttToVXzE5tzNW/jni3eRVTd2OmG4147ffbZsNWvGZZCli3bthQ2zDOr/fzon9gqKvS7JTZlfyINp76B9KU+yxEErDv5gODXs6H5uWrTz57z5kXm3Ji0ujGUsX6wmcLbTOnv04e2Uw6kxBrC8mOebCb+UMMWuI59TFkp4+M411bdsd5qnf99e7YbarIC4GGEdTmEqFyC+4rLAJmtuLOOoFrXfnU3evd3UHhARggbQlbaquB/+F8987NnnNNP7rwlbbeLM4++icyjNW3qmY7g8nIcevvj893rzO8RtKZJSCv7/CkBRlhUMQ+/RpohQG/C07fIeEZNd45NKvhNeePNoXjKZAMI2t4aKHYiLPqalj+vbUHxRqIMqNCb4/Ev5WbJ3XWDbpWabjYs37vB7pOybw/EjEHGolzJhBY7BHUOd9ttpYyxgvUigJW2pwQXQbhEstWHS+effnvi+EAO4UNQ== X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2702; 6:Kp9N6fqQ2pt6KtER1qFGIKtvMRIJjAQ5DeMIBxIbC9yifRXgAhzbnuM0j9EreWDU98q02wI6q2PP2ba8KW0CcYZ+XZ0rdYCPynV6DAzV1JxDlvefVx/Q/CJtuNtEKdxBLcan0r3HmFyz6HWghI0u+zElMqa0ZslbqjsreIxA83ZmgkD3YREH26LFarlyKqTaoJfOAIZfuLHO3KCo7rl/DrEu/IsUKF3dhbFktwnGl5XsYoGoK0DztrThgIr5k5KMW81o0pkI3SBovlpEJp0dxmeoTC6b3HrZmrCUCBJEVRbzi+2jTcSI74lt+0rbvVJLIQ69GrZiVrNYwYMVCKllqeuQLBZl+kbE5sRwjW9OfPc=; 5:mS3dbAV3zyCqYJG9ECCShcfEXAAN7UFQ6IJzFuYDehrxeGOFDzwg9Dc0pv69uMR8XjRomRHDjl9Yes4umj5/bPh9AFiXpjzzuGddnbx9MBz120rQMvQ/CfH4HdaCHoXETky1JstKOF4waltejD7iTsGY319+z3RLYo2Ziu1VETA=; 24:GrgH5PdAyWGjqQV+itf/p/X3vQwxZ0wHKubfYUCoRnLMLeURvuf0dEp4+lkVGTZ2aic0FBJ9KxTOFnwqQMl5sXgqgwXrkJuu4CB8l0jek/0=; 7:xQ42pPtNYW/QfgrkN/Xx489UpzdNleZHeOCIzi1CbzNEDGoUvgV/N582cCy5f+S2VbbW8P5RDFgD4R496kfVlNuMcSk+IbdPyc2KZLfT9AEWWOzZfiJHfsUEs/+DtoX1vwqfg8wgf1xNTMpshh+6TjqbheATTM+jX+HBF04/l3A1TcQ7klt0g2fMyR4yA91798aJJBUvKkYF0ZHDtm8TTDMFQEbLTUvRFjo/6qGEeVk7nXBnimdKGBmyd44YZMAP SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2017 12:06:57.7178 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 35374a82-ed48-4eb5-ffd8-08d54222025e 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: MWHPR03MB2702 Subject: [dpdk-dev] [PATCH 04/18] 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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(-) -- 2.7.4 diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index 1cc8c89..f1bc62a 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -77,6 +77,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 @@ -443,6 +445,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(); @@ -462,6 +466,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 eafc944..40caf72 100644 --- a/drivers/bus/dpaa/rte_dpaa_bus.h +++ b/drivers/bus/dpaa/rte_dpaa_bus.h @@ -46,6 +46,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 29678c5..4ad9afc 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -212,7 +212,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 ec5ae13..3f06d63 100644 --- a/drivers/net/dpaa/dpaa_ethdev.h +++ b/drivers/net/dpaa/dpaa_ethdev.h @@ -43,11 +43,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