From patchwork Mon May 15 12:37:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 24306 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 438667CB3; Mon, 15 May 2017 14:38:32 +0200 (CEST) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0087.outbound.protection.outlook.com [104.47.32.87]) by dpdk.org (Postfix) with ESMTP id 307EB3254 for ; Mon, 15 May 2017 14:38:23 +0200 (CEST) Received: from CY1PR03CA0036.namprd03.prod.outlook.com (10.174.128.46) by BN3PR0301MB0898.namprd03.prod.outlook.com (10.160.156.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1084.16; Mon, 15 May 2017 12:38:21 +0000 Received: from BY2FFO11OLC004.protection.gbl (2a01:111:f400:7c0c::191) by CY1PR03CA0036.outlook.office365.com (2603:10b6:600::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1084.16 via Frontend Transport; Mon, 15 May 2017 12:38:21 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.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 BY2FFO11OLC004.mail.protection.outlook.com (10.1.15.184) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1075.5 via Frontend Transport; Mon, 15 May 2017 12:38:20 +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 v4FCbxNx003970; Mon, 15 May 2017 05:38:18 -0700 From: Hemant Agrawal To: CC: , Date: Mon, 15 May 2017 18:07:34 +0530 Message-ID: <1494851864-26029-12-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1494851864-26029-1-git-send-email-hemant.agrawal@nxp.com> References: <1492607395-5922-1-git-send-email-hemant.agrawal@nxp.com> <1494851864-26029-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131393255006325772; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39450400003)(39860400002)(39380400002)(39840400002)(39400400002)(39410400002)(39850400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(9170700003)(8656002)(110136004)(498600001)(38730400002)(53936002)(2906002)(33646002)(50466002)(54906002)(48376002)(50226002)(189998001)(68736007)(6916009)(85426001)(2950100002)(356003)(81166006)(15650500001)(8936002)(8676002)(86362001)(4326008)(106466001)(50986999)(6666003)(76176999)(2351001)(36756003)(104016004)(47776003)(305945005)(105606002)(5660300001)(77096006)(5003940100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR0301MB0898; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC004; 1:e7vEMPrc5Pr0wMbh/i90auhNII27wuAcYwXGCwyLVbImKkYTs4e5K2Ijzig7m4aqfXQ0lhmme/jLibRzb9Vp4b068cDIOZ6VQK/aoar961v8mSPppuOUWmA1g0wHD+FabXrrdRT4Q3L/c1x8IU8ZwMl/d8d8ADbQvFYrVbSmBgip9hdeDzYcbCBKvcFqoRdZPGIIaABcCxX2gOUD32utpmpJsGgxwXg4jKhdHAsT9t4gzqr5nfpzwDcBWAU4/89iwK86nCz9SPnwq3tboPdAMbNYcKbcNKuGL5bPxhS4yroc047xeoClndeZfNHfZXHVc9pGoifFs2AWDz1L8qBJnEB8uWCUbVveeHZafdxxx9WyhShlYEkRk23dI6tvuj4U3wFbLbcYWtaiWw25Z4a3MztEywDFz2KGJlmMt1tB03YZhtGORsnlUuaPeL+4MdWa+LkCRveQPN/Q0pBdmgAGfzg2EzlHzVPHClYAusneyMP+y3l4v2PCinrWhUFmumkV6mUU8eYwJh3JVHfvs/ZNkVMdABPKg/F3J93NseU8KS5S0d0R2d39hyb4Qe6R3zjjt178Lr/xM6RQuPqzcrcQhw8aEhwJeqDgJGTbzt6anx/cvIiM2JjvekgNWvCxqiqsNnwLDm8PP4JOiWsG5lS9gdiRyu4qXr7JOFKhIszjjad3tPJmuDxsmqkcTYVAH/w1TVx5lboj57ja/JrMcUFuWawhZu65vRLQ76p+1JT2kGgsWQ2cVM3tcyMENV1v/sas4djIy4M+96JLKI2dRQzeKQ== MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a7d20b05-40b8-4205-6aae-08d49b8f44fd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:BN3PR0301MB0898; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB0898; 3:RwpdWtlWZvRIPL0SZkF9C6OsdFAAwJS0R0Rv9uX0QqnEKf8NTRnweN6ttAlWOx99aRvM447Bks/qPpCtNT0D93gRdyftFA3bt4tv4otnlFflzsLxhVS0rHW+j0XSlpMUMHbx8/JS7LsLAejSuX+pZ6NRAF0364Tk9BJlS1eqltXOdKc3B4Tqq2nTS4KzLjxv5AX2/Ze7pmArXt4XFq8q8j+6LI0XgufUNYwb0cVDlUvTHrg9hEQQnoOnc7Td88GoVySfjHdJfZBW8ZxoExXdS8KJ+LfPpZ3mdmCkARRhQrvJFS9niDxTDEaj5pMV9t/cN6YUCcL2FjX+fUY4wOCrisM1EGpeF517pSqdbNc7t4ew/+ss7bVufCZFeQo6UdVNy7kl25m4INw14lPf1DJ39PST0tQZL4JGH80j2aS+zy4ytkiBrPcBzaO4mgcnWGis; 25:nQGsWE0lft2OY614nzYr6aGmcLlZim8wdkjHsACphLB+CElXUZMyIF7ZuusVLjicYHy0F/1T0sG1ZDaADxBSSyKnCqsm3r1bvvx6HW2Bucv3q2HZAzG+EaOO9hvGKqDUbdQLI9ZvJnY9akQLLI2YK93/bAMrDC8q2wsTE23wW6RTW9xJjJr+cBgkSpqWr9Ya98712Yxz+NQnnCyY0EbHjVIMIW4dK5NoS/UtHlGROwBwnvkdhGIlkk+G8YptZtnitf9GM9DUp6Gu0xLYxao80kKMJcQdHsm7NQNUpus37kWhwjw5hdUZ/Z1z1hkt5D7UcsoejzcZXwRvclDJ21QLJWJyhXQtEOGWuGJaHYRQ3TInBk2c5dpZBmD1/gSU/XaoGYuGIjYpS+nPkDalYuXQqD93Of7B/OfiSfC/q+Q+QtXkxl5NY9fPQwT7tPfkevXvEEjS/zaRdBDydIeMgW6p1Q== X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB0898; 31:QADWIMPeV8VuHHIxw6BhP1+KtI5I0pXTA5speOVrUvojy/AXcmYOFm7GJ/jO9qD5tmx29gaVxXQAAbmahPw0fcrG+6nfdNH94P03o7IZr0qozb8FZmFdR4TbnRL4vvmNxYte46/F/fCGxmLwvg3R/YGuprS69ikq4iWg/Wx4pxj8PVw6YEERW1SmBrhOT9j40uOhDNbOuau2kDak08pCP4LQhL38efdsJ2OIY8rtNgU2KQe5msutg4CerIyW4MLI X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(13018025)(13023025)(13024025)(8121501046)(5005006)(13015025)(13017025)(3002001)(93006095)(93001095)(10201501046)(6055026)(6096035)(20161123565025)(20161123561025)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(20161123559100)(20161123563025)(20161123556025); SRVR:BN3PR0301MB0898; BCL:0; PCL:0; RULEID:(400006); SRVR:BN3PR0301MB0898; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR0301MB0898; 4:U2YKCKYlmgMfRBVck4YVCbZPtKmUuxN7ljkovccn?= vQhZIvyyRmWUAkxuTdMxQkRXYF/O/pPDTFnJFe1yYUEg4cfAzY3Qfr54f8e859oRXWqjTJvnUPgfyBgpBIMNvGwObJO1b1OVwrbrDCRHSI7QQFCsywO4hthuMmNqD9VcoXicmjjxPUOJYDPgGOV9vgbA6xoyk1LLY7BLi49llaNUbc9+GTrczx60FYjjSWzZnRD0NddhIvVsiqkTu0WlElLm320KFkaVe+yYY/vzmbPrMGZ4ZY8aUIb1DGc4AuaHWCZ4hjTv5hwkIByoI5C+C1/N3R6Jz686i6P3QNRAjOmNIrmCvkUaaNpyku/zpelDLZyIs3iV7fN+1HudCstceF0qs57Vat42wlss/aql/RsYWx7TnUwgxvSgFx0HPZe7srXdKqazCdtf+ZbDn5HZ3qV93l6l3/z2EaAei9exKHgQgV+E4PD0pHT3da9H2Fxop/5pGayMEqgD5EWtSORyZQKBUA1+iF/KBAv6v1+Ui/HDtz6AeyHTjNjxWwlLYUPbt7waZFo+LKgO8GD2hTb+UJZpkBj+lpElwye4p2bjd1Pe+XSFWXU5ONKu7CoCmc4yrufoRrs9bWj73oMPs4EisUmYw2kP0chyCUfJSjXbEGIuRaWSSSbs/5UMTfiEVlVeEpEH6CRBL0MVdEoywUqo+0VBWeBydg/iwsbWyNjMaJTYp0XxgbyIhuLuOY15LwvvFPfp7MdE8HMyeLcjbcJLt6lV9YPf6skwTRuVlIn/XybbEGoFCT8oQmZsFz14PRDXMzJNctMPpiAoyUDI0hZUToEAxx9+LJiNqN7Ry95PUu4eoRyFrJ1GF6DgHIGA7knCAi+/wzqkbsTuS+g9TD7Grql6/363Is/WvVTbu/Qhcc4brHHJ4pvrWcDcHtpasIEad+s/ZjB6leiX3P8rnaCiHAyibNcoEF8u4+xr8JaRY+I6E4vLhz83pxtoSvBUreCG8o8= X-Forefront-PRVS: 0308EE423E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR0301MB0898; 23:h/Dp+JSJ2zFz6IBsvxECZq2Gu0MMjU1vJvBB3kS?= IasiqZ1aCJN8bjXneqS+ICRa6UawZSlETm0m5iCIRU/a9H0S+H/B+0QxcvUjOlZ6hk1KADo+a5Gv1qFKxB1iYA43Zp9024B6alkEfR/NP2ZnWfhPPostjjm0viyFIvLwsUlpvm2h0coxWYyi13l1ps3omW9I8fEMBqkvNvpFYtTlCY/sXUW7Yo48PJUE5HY2niy6m8Yt8LJT0Dr8QB1zOWzy9TIL/QcEd2tmLT4ODR/DqOiCoatkFBSAXMRDmdH09Pf1OoR/s7RWJC05fbFvrYjntBaFRIhOnY+CRtURbiHxKXhu6QEsjZBdxaTMU0p5MuLGzndP51jhkPoGbTQRHeLJ1qooDC7DeSDXy6M9MGPQlsr8aMpXfX3OsEsBKBHYHyFBIzUMGy6c0P/eGotPlN1cnL36nlXUHgc5MA0GAVYb/Fdddc5dleHW8qlvqmzPAc/F6yNEUhNeJK97dVUP6ReBTzFFrNGyo1OYDHxbkBwblnx/tyP+FRUqPnbL7AOKEx9QrxLvxGOHGk28bm5ZDYfojIS4V87WkfDtOeECv7uC6rDbqEXF9YRwRthtZryHjD58MuHTz/FPZClMUf+uN1kL1RXtRNrBx5ohIm9PLzKRANI8jHylcsYP5NY5DVYJavQfs3LD+tQCfU6sn2wle84nZ6WVoOmNc9BWFin5hN4qOmoDyhSXCbft/fS68EZJ+EF3WKmx4dCjV5OZCWhmEcTTVNoknZCtXYjmV6sNv0vZPhfJqgV1oLyI2f0P5lCOv2YOUT9ijZjOwzN+g3IZe1JvtbBtmN0X8zfrr69xirj7KPt6fgwrEEpC5TYKNQYKYalo3LVlEFTwWQr5l3aREH2ZUHFW8wvS7utpV38BdZbgE1fp5on8D+L+TwCxXQLXOaL+gn6m9GPYmsFGsHscQ9U/4HNNBIbUV+00pBm5am+062VYK0Q8pFu+DD25cbNvc+z+MAKNdM6q42nrPsDUChVqX62ddO/LEcAnrjc64VMMcblHPzD3hqsiqn7uuHTXcPYxbBk5RH5DNzu9xN5pX2AlZ9JscErfN02T0MhuGqvZr5zehSDE5vMFXnwmKr5PQrcYMLDJ5Olf7TnxZ9J+VjimY2At9Eb/1Lb6L/CKhUY4oYwRqkQYumnagdRwNLn0UcobE2ox/bmjmHdCK/4Ka26UtAADB7jXyil3t+Zq9q7fXyu6aszrZxF2HYVSz5A0bBOwN0MCIjcf9uxCTi3/+Xn40+ZKXbDAjnElipDckiNnBJQ== X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB0898; 6:Ah8sWArji2QDZ9Np8riW5PRqvfr3nEOlDGvWKIiLcgTAfmUZLRvMBXJsB6Ljz9AP4EqVQnodqiHjAc+ov09vlyWnzDjW91tVQqrKCnS4Ocs98n+65IHqtLRjmxtUq6ngDX0ndmEaYUa462Oy5Wcvsm3BXhP4JJ+eZmvi/MQ0T+vAAeDXc2ihWPz/T+NlXEzbXn0H/jFtY+l7xSMEPk+rlWilWyTYH/fPb2de+JjoNqtseWj/eKRCsUVa1Mj0INaZqx3JU2s5AUWKgV5uzzZYqPck1MAvy0RMEnPtwwnYbbrY8M+G/jkxTnbkTasQVuxt0BJXEMgjKeSmIwAll1zTVyRC31yy9cO9BvRwCBaANX/VyfFtvmqxHH4EKnTGrhYSapbNqfshOzAW25r+yfroQupuKJlV38OghQ2fd8fqCvCVAOzev3IZiIHuw85x9OsJAoWlpowQMP3qwfwrcaqqOErFYZ34d8PZ2xGkd0rF8ggYx4Oh6W/dZKck36u5L1IgZ3fvH0nhOd80/CLoB/t/Gw==; 5:PAaYckaTEWghSVwVJ37plCxvaLFGIO1oWhO0CoFGqmld5bx9E0d25n8xIATySMsx6UdOUH6TiCKJ28Hs+Wf8+mRdzq7+NAx+2KRHqg7440NdxEShwFaWsEmaVsgSpt8gH2pMzLF3/fB7PMUsILWvypaz/9NYwKifd0dIkMV3ONgwv5nrsIq9VrYPfuiMizFq; 24:TU+a8GTnWib9PAwe5FFy2oROwyaPDk52XywQScC3fYjedVFlkuaD2v0DRU7ScyzUkDl6samJc9QX2flg7lsVZVOrAiRA9SPZUOfHiNN7Nb0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB0898; 7:EBAzUl9v12DQolPVnuD2YT5BG0z5MJSyXb39rsuPerr1Fe4MWEHVkQX5qFTi2PnVXjjlAiMXE1wG3qDfc2dVl1tvAU3BsazYdE/xkiPfs6Ewvr2wWNqJS7ptzogPXAgxpSM8W3C5cIoUt3QdoVumo4LAb6vKVKQubnDRNHkyPbGrvqg+fwBFCx9DsQl5wXWZFI20MTCJrFwSQeooxOcRdPB1oVhSIrAHQtn9jS4jlvQ5YMOtdsx9RHSoDYaVYut94jgh9ckuP8Cq7M9S1jFIyrbOyroVN1P89/gS0ywpr0Nzadz4TMGk5nZVXPudrpCjOy7tjmDY+FYCVEEKeZHvfQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2017 12:38:20.4453 (UTC) 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: BN3PR0301MB0898 Subject: [dpdk-dev] [PATCH v2 10/20] bus/fslmc: update TAILQ usages in dpaa2 objects 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 updates the usages of malloc and TAILQ in dpbp and dpio objects. Signed-off-by: Hemant Agrawal --- drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 28 +++++++++------------------- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 32 ++++++++++++-------------------- 2 files changed, 21 insertions(+), 39 deletions(-) diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c index 2fb285c..644f01c 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c @@ -53,8 +53,9 @@ #include "portal/dpaa2_hw_pvt.h" #include "portal/dpaa2_hw_dpio.h" -TAILQ_HEAD(dpbp_device_list, dpaa2_dpbp_dev); -static struct dpbp_device_list *dpbp_dev_list; /*!< DPBP device list */ +TAILQ_HEAD(dpbp_dev_list, dpaa2_dpbp_dev); +static struct dpbp_dev_list dpbp_dev_list + = TAILQ_HEAD_INITIALIZER(dpbp_dev_list); /*!< DPBP device list */ int dpaa2_create_dpbp_device( @@ -63,19 +64,8 @@ struct dpaa2_dpbp_dev *dpbp_node; int ret; - if (!dpbp_dev_list) { - dpbp_dev_list = malloc(sizeof(struct dpbp_device_list)); - if (!dpbp_dev_list) { - PMD_INIT_LOG(ERR, "Memory alloc failed in DPBP list\n"); - return -1; - } - /* Initialize the DPBP List */ - TAILQ_INIT(dpbp_dev_list); - } - /* Allocate DPAA2 dpbp handle */ - dpbp_node = (struct dpaa2_dpbp_dev *) - malloc(sizeof(struct dpaa2_dpbp_dev)); + dpbp_node = rte_malloc(NULL, sizeof(struct dpaa2_dpbp_dev), 0); if (!dpbp_node) { PMD_INIT_LOG(ERR, "Memory allocation failed for DPBP Device"); return -1; @@ -88,7 +78,7 @@ if (ret) { PMD_INIT_LOG(ERR, "Resource alloc failure with err code: %d", ret); - free(dpbp_node); + rte_free(dpbp_node); return -1; } @@ -98,14 +88,14 @@ PMD_INIT_LOG(ERR, "Failure cleaning dpbp device with" " error code %d\n", ret); dpbp_close(&dpbp_node->dpbp, CMD_PRI_LOW, dpbp_node->token); - free(dpbp_node); + rte_free(dpbp_node); return -1; } dpbp_node->dpbp_id = dpbp_id; rte_atomic16_init(&dpbp_node->in_use); - TAILQ_INSERT_HEAD(dpbp_dev_list, dpbp_node, next); + TAILQ_INSERT_TAIL(&dpbp_dev_list, dpbp_node, next); PMD_INIT_LOG(DEBUG, "Buffer pool resource initialized %d", dpbp_id); @@ -117,7 +107,7 @@ struct dpaa2_dpbp_dev *dpaa2_alloc_dpbp_dev(void) struct dpaa2_dpbp_dev *dpbp_dev = NULL; /* Get DPBP dev handle from list using index */ - TAILQ_FOREACH(dpbp_dev, dpbp_dev_list, next) { + TAILQ_FOREACH(dpbp_dev, &dpbp_dev_list, next) { if (dpbp_dev && rte_atomic16_test_and_set(&dpbp_dev->in_use)) break; } @@ -130,7 +120,7 @@ void dpaa2_free_dpbp_dev(struct dpaa2_dpbp_dev *dpbp) struct dpaa2_dpbp_dev *dpbp_dev = NULL; /* Match DPBP handle and mark it free */ - TAILQ_FOREACH(dpbp_dev, dpbp_dev_list, next) { + TAILQ_FOREACH(dpbp_dev, &dpbp_dev_list, next) { if (dpbp_dev == dpbp) { rte_atomic16_dec(&dpbp_dev->in_use); return; diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c index 203a7d5..73b1808 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c @@ -69,8 +69,9 @@ struct swp_active_dqs global_active_dqs_list[NUM_MAX_SWP]; -TAILQ_HEAD(dpio_device_list, dpaa2_dpio_dev); -static struct dpio_device_list *dpio_dev_list; /*!< DPIO device list */ +TAILQ_HEAD(dpio_dev_list, dpaa2_dpio_dev); +static struct dpio_dev_list dpio_dev_list + = TAILQ_HEAD_INITIALIZER(dpio_dev_list); /*!< DPIO device list */ static uint32_t io_space_count; /*Stashing Macros default for LS208x*/ @@ -214,7 +215,7 @@ static inline struct dpaa2_dpio_dev *dpaa2_get_qbman_swp(void) int ret; /* Get DPIO dev handle from list using index */ - TAILQ_FOREACH(dpio_dev, dpio_dev_list, next) { + TAILQ_FOREACH(dpio_dev, &dpio_dev_list, next) { if (dpio_dev && rte_atomic16_test_and_set(&dpio_dev->ref_count)) break; } @@ -336,18 +337,8 @@ static inline struct dpaa2_dpio_dev *dpaa2_get_qbman_swp(void) return -1; } - if (!dpio_dev_list) { - dpio_dev_list = malloc(sizeof(struct dpio_device_list)); - if (!dpio_dev_list) { - PMD_INIT_LOG(ERR, "Memory alloc failed in DPIO list\n"); - return -1; - } - - /* Initialize the DPIO List */ - TAILQ_INIT(dpio_dev_list); - } - - dpio_dev = malloc(sizeof(struct dpaa2_dpio_dev)); + dpio_dev = rte_malloc(NULL, sizeof(struct dpaa2_dpio_dev), + RTE_CACHE_LINE_SIZE); if (!dpio_dev) { PMD_INIT_LOG(ERR, "Memory allocation failed for DPIO Device\n"); return -1; @@ -364,7 +355,7 @@ static inline struct dpaa2_dpio_dev *dpaa2_get_qbman_swp(void) reg_info.index = 0; if (ioctl(dpio_dev->vfio_fd, VFIO_DEVICE_GET_REGION_INFO, ®_info)) { PMD_INIT_LOG(ERR, "vfio: error getting region info\n"); - free(dpio_dev); + rte_free(dpio_dev); return -1; } @@ -381,14 +372,14 @@ static inline struct dpaa2_dpio_dev *dpaa2_get_qbman_swp(void) if (vfio_dmamap_mem_region(dpio_dev->qbman_portal_ce_paddr, reg_info.offset, reg_info.size)) { PMD_INIT_LOG(ERR, "DMAMAP for Portal CE area failed.\n"); - free(dpio_dev); + rte_free(dpio_dev); return -1; } reg_info.index = 1; if (ioctl(dpio_dev->vfio_fd, VFIO_DEVICE_GET_REGION_INFO, ®_info)) { PMD_INIT_LOG(ERR, "vfio: error getting region info\n"); - free(dpio_dev); + rte_free(dpio_dev); return -1; } @@ -403,13 +394,14 @@ static inline struct dpaa2_dpio_dev *dpaa2_get_qbman_swp(void) PMD_INIT_LOG(ERR, "Fail to configure the dpio qbman portal for %d\n", dpio_dev->hw_id); - free(dpio_dev); + rte_free(dpio_dev); return -1; } io_space_count++; dpio_dev->index = io_space_count; - TAILQ_INSERT_HEAD(dpio_dev_list, dpio_dev, next); + TAILQ_INSERT_TAIL(&dpio_dev_list, dpio_dev, next); + PMD_INIT_LOG(DEBUG, "DPAA2:Added [dpio-%d]", object_id); return 0; }