From patchwork Fri Sep 15 09:15:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 131491 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7F7C3425A3; Fri, 15 Sep 2023 11:18:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F0D9542D3F; Fri, 15 Sep 2023 11:16:49 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2139.outbound.protection.outlook.com [40.107.237.139]) by mails.dpdk.org (Postfix) with ESMTP id 2CF7742830 for ; Fri, 15 Sep 2023 11:16:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WFSVNYiOKDzGUUD2+JF4ilb6G0npmyClwDvum79LN07NRdPeWmM8HSRrJnwZuR7VvjUljh5txGHSnS5PhAfurmkESAG8hy15d/DbRwkbgSngkGH17752on4UU4624uvzRo0KMwei6HghY2u/4trX3Pw6/5cRe6Cgtf3FfsFfgiuLHdFG6JoHo5wrssOB8wRi4M7RGrRTZiiVERaLJDH1se6rfoydKTOSpDsxlahZw6NsPdHFUNMym/Ca2LSk86993Vx7/7r6D0tZe8NoJWjEQEHQ0JeaMhkaaB2hJmIjohtseCmd/3KF8gFjHUnzGjKLL9BeAgGNuUy9N5LImJXN4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ptn9ydJjsqic/wGlPp8i1tyd6DcpDIJXBUlOIsCv9ts=; b=KZRQG3/XGgh/3W3HFBFnLoZs+hBuYScU3Bc0TUHmQQNoVHx8w+reaGqX+ILbInoniV+IAQ3UELZBCI0jMp44uUiRCcWuo5Teih6lCbRx5UylzVZ4DpYwVo4Uv2eiMKjUo7bGb4UYzBCvSCnTpd5xJKx1kEoeD2FY2zANZkBejA+azB4bHE6g3b7QNSTdSwO+6xxc9yjkYa46K33AS2k2HQDvwSgkXd7zkmcrWZ+ybttN97bx+Tgs0hGS17Y+ld/JZpgPOZOLAFejo+zvLvI3IC3NejWDTstLpFNnvJXy70vDKn24JKyHucy4hf4X1Kciia9eA94PIxZUXn0gCkIa1A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ptn9ydJjsqic/wGlPp8i1tyd6DcpDIJXBUlOIsCv9ts=; b=UsjfCMkPt/3/kL17sywwgRtLrObg7FnBKgnBQNuqQLfOZsq2HH86/YQ2xX+OMv469vf+WuLLDwtwkTdPLP1q+vglU+WafYwT7SCh6f301Cybg4+YPU/rymdl5FYdNEBqr3dUHln8MT4u4yBi72Jk9ui7xtmWWPmvOCMzuvOQPLE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by CO1PR13MB4773.namprd13.prod.outlook.com (2603:10b6:303:fb::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.21; Fri, 15 Sep 2023 09:16:46 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::c05c:6915:1628:70c4]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::c05c:6915:1628:70c4%7]) with mapi id 15.20.6768.029; Fri, 15 Sep 2023 09:16:46 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [PATCH v3 16/27] net/nfp: refact the resource module Date: Fri, 15 Sep 2023 17:15:40 +0800 Message-Id: <20230915091551.1459606-17-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230915091551.1459606-1-chaoyong.he@corigine.com> References: <20230830021457.2064750-1-chaoyong.he@corigine.com> <20230915091551.1459606-1-chaoyong.he@corigine.com> X-ClientProxiedBy: PH7PR10CA0017.namprd10.prod.outlook.com (2603:10b6:510:23d::10) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|CO1PR13MB4773:EE_ X-MS-Office365-Filtering-Correlation-Id: b3bcce25-c996-4770-9bf9-08dbb5cc7c30 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +LVDwP4uokXNYnxjtAk2+IbbIUQdubZ8gTCvKjHZjAa7N0GSXk6ZY+/09FIDjJsumS/zKZBR/v/Cl9VaaGQijlg3BMt6B9CgurMVrPcMOuXkZRHCIZIuTVezIcptXGpmR9pkZPJH1wrDBS7ZO5gKIV9IAManUMJ4Ye0h/xtyjuzBHX3RHhtFtx9tL4I+MT28jVhEiL3bI6jucvpBfbSeH0yqGSkqRNb+PDdFxQbxPnhN6xfMFXGg88yevSzhHTcdfUBdooqscz5lyHG/iBLWVf6oQBTh3oReZfdOJ0NDofHe6VEKT9urKB7pzDPH0h1D/Xt3/UMLbdYhOUnbzFk+59qmAoF9uOtCwKWs9lIp+xOXFxFAjXghXcB0vJ3z/PTfT/fqJ6io/deP+7C3TYVlQUtcl7xeZvTiSgTUM1UCcfKtX40fd5Xu+6YpS4xMcAoGXA+9o+XVjJE6CNxo8q+b3IWgFLU8xnWbAZWOWhAFFa46jwfbutNKnah45uTtVZq91MADIAxi84Izo4TKz7f2Po3qHLHnHW776qgDgkQLMV0g+hcMmTXuPF5L0/YPfQlQV9R9iGOupTixXyUdEVCiAq6bYihUhKAMAUYFen34drwX3YVFEAASnUmAOI/XzOhEQZ4zqqfDPYxzKIuKYgC83QJbg3aw72EyLJrY9UpXTSk= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39840400004)(346002)(136003)(376002)(396003)(366004)(451199024)(186009)(1800799009)(6512007)(107886003)(1076003)(2616005)(6666004)(52116002)(6506007)(6486002)(66946007)(26005)(316002)(41300700001)(66476007)(66556008)(6916009)(54906003)(5660300002)(4326008)(8676002)(38350700002)(8936002)(38100700002)(478600001)(83380400001)(36756003)(44832011)(86362001)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?NyvJuP7/ZiOiEnze8/DP1Iv2mPZS?= =?utf-8?q?AnCV91X+SMCqgw62AbhIco5HN4GkgFzsRel37WDpm4bcqMiwd1AK4SfdQ6vkDhRfC?= =?utf-8?q?a6IlarNzA4RHp4rUcBuDERt1pyboNNzbEZHG5r7F6DBTOsiFFtlZyd/NoOhcCidBJ?= =?utf-8?q?SlsQunw6s5HCwk/MGBDuvv8viNxa09phOOesuV71qbw+WugP+GTzwPQAlnuDg6q8T?= =?utf-8?q?bDuKHcIqkbi1uzD5sbe7SAOV5OhQu8tII3E1zeTHjzw5SViRWEsQBL809JajZDD3C?= =?utf-8?q?zk1NAYKijWeiDDkXJ0hQ1/iCtK2Znqil2yhi0wJqy/cGO9Swh/a1N+zq0YKEhSBL2?= =?utf-8?q?DrDZMyzYpc96ezgpC4TMhwm3Dr3fb/I8tqcZ/7Z3YhdfdHOaSAW0CZtsGXQq32gcd?= =?utf-8?q?1O3/IJX/fq4f/8ABaPEgdl5WG3GyvurR0P9zHzVTYcRItRcrCeUsBBQ1Uh3mV6cBX?= =?utf-8?q?qkvU073F4xgEaStJbDHxmBJYupx2hwqcPXBGNdj03+Sz6oIZKoGpFuzhdBFNf9OmJ?= =?utf-8?q?IgqghCVbltCZJcHmNrH/9/LU/YGi4HCAsyFlCV9n2QfTYEhh9NADab8zhKtXYIrw9?= =?utf-8?q?jokeOrJBLzLNCbxV88TyRnNYM9HgIcQbakvxZk4bN/zUx2nBvIJ3TDVMkpwyXFKWL?= =?utf-8?q?7fOcV/aci5gCxXjzvdqbLQCulloyGc+pRgMl1iByC6sa1bOQ8x4WY0oiHg0cu9N28?= =?utf-8?q?0bZfGO4a+3r1DxBULgzhyYjSfewnxnXqJYw2eIFoCbXX0TAkPhJ8DDMdtvKf+TiCK?= =?utf-8?q?0Y4mekQRly4O5lvbsR1rYfvpWZHoCoam5Kf1ZmF9Ln+/SYix/X2JTkB0gNVrB+gcA?= =?utf-8?q?/WPrrTYtdV5O25RUHKB2naXlnc0zxRGaqHQlsdoHjaIzFNitS98YeUbR1KRn4f6eR?= =?utf-8?q?xxjYGra24Ad4KXAtMihUml6ja8pENBAasodFPs5RbFTKgNENlussFzKf/kKWxq9Xd?= =?utf-8?q?ts2JDIkdko8HDyi5AvECa6SxZ6Ko9Obzye6nck605lLILiFt1uOkeUtn/S2XKflIM?= =?utf-8?q?g8308UdzYHdPus/yAzqDV4f4v7fejI3PRUUpsoTAFP2Djdg2qpGdxqe3jGs3nz8Lx?= =?utf-8?q?U7CM+Lc1VywZoIpTrjjm4+h0MJbDmdkUdfocfuaNFhb76UY5Y606grLNRl5RIAdFJ?= =?utf-8?q?QQpjkVwExN+kS6hoK0sQ8lNv7RnCRSSDS07ZCJ/n+h7d5SemxE38Shk3cn7ul9erb?= =?utf-8?q?nYdUSbNsR73rBMNUThXzem63c3RhN0f6GXGLvfUkRkI0Soy3dBphjCaGvYR4+Gwwb?= =?utf-8?q?mgHMPQ3DB5QHfneDJ2SWC6WOPdWUmLMlk3afRJDtmJJymchpgmsA3l9bEopNg6KBo?= =?utf-8?q?ODAghMkCpte/vzDXkqX6JOcdVDHDI2abIXIC21Ot2/az85Ml2+MBvPfermoEZYxeg?= =?utf-8?q?I7upY+Adj3pXvBZdI3iwAh9Dn/Q6MC/hUCtMBu3bbSbIwAnMCk/nw3w9or+kXke1B?= =?utf-8?q?geec9mI03jT/TIrRBxCh1bNhFVIjt3JK0+P0fYUQ8AGhc/22E7X6v/2W247kk+YXK?= =?utf-8?q?feRW2kdthqqRpbgo7GYIMtE0zm/rEl+UBA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3bcce25-c996-4770-9bf9-08dbb5cc7c30 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2023 09:16:46.7572 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ad0zGR9xQcs6ykQtPSnQj4HhhTbRmpNR5yty4XvzyUSuqyCB9qBn77qfiH3926CHufoxFO4GG/zRyfzlHCaQcjUFaitbdpM6LH/gAW48W9o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR13MB4773 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sync the logic from kernel driver and remove the unneeded header file include statements. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfpcore/nfp_resource.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/net/nfp/nfpcore/nfp_resource.c b/drivers/net/nfp/nfpcore/nfp_resource.c index e7e232eb4e..e4a3a42eea 100644 --- a/drivers/net/nfp/nfpcore/nfp_resource.c +++ b/drivers/net/nfp/nfpcore/nfp_resource.c @@ -3,15 +3,11 @@ * All rights reserved. */ -#include -#include -#include +#include "nfp_resource.h" -#include "nfp_cpp.h" +#include "nfp_crc.h" #include "nfp_logs.h" #include "nfp6000/nfp6000.h" -#include "nfp_resource.h" -#include "nfp_crc.h" #define NFP_RESOURCE_TBL_TARGET NFP_CPP_TARGET_MU #define NFP_RESOURCE_TBL_BASE 0x8100000000ULL @@ -43,7 +39,7 @@ struct nfp_resource_entry { }; #define NFP_RESOURCE_TBL_SIZE 4096 -#define NFP_RESOURCE_TBL_ENTRIES (int)(NFP_RESOURCE_TBL_SIZE / \ +#define NFP_RESOURCE_TBL_ENTRIES (NFP_RESOURCE_TBL_SIZE / \ sizeof(struct nfp_resource_entry)) struct nfp_resource { @@ -173,8 +169,7 @@ nfp_resource_acquire(struct nfp_cpp *cpp, NFP_RESOURCE_TBL_BASE, NFP_RESOURCE_TBL_KEY); if (dev_mutex == NULL) { PMD_DRV_LOG(ERR, "RESOURCE - CPP mutex alloc failed"); - rte_free(res); - return NULL; + goto err_free; } wait.tv_sec = 0; @@ -186,13 +181,12 @@ nfp_resource_acquire(struct nfp_cpp *cpp, break; if (err != -EBUSY) { PMD_DRV_LOG(ERR, "RESOURCE - try acquire failed"); - goto err_free; + goto mutex_free; } if (count++ > 1000) { /* 1ms * 1000 = 1s */ PMD_DRV_LOG(ERR, "Error: resource %s timed out", name); - err = -EBUSY; - goto err_free; + goto mutex_free; } nanosleep(&wait, NULL); @@ -202,8 +196,9 @@ nfp_resource_acquire(struct nfp_cpp *cpp, return res; -err_free: +mutex_free: nfp_cpp_mutex_free(dev_mutex); +err_free: rte_free(res); return NULL; }