From patchwork Mon Sep 18 02:45:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 131544 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 41BA3425C9; Mon, 18 Sep 2023 04:48:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F408B40F16; Mon, 18 Sep 2023 04:47:37 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2100.outbound.protection.outlook.com [40.107.244.100]) by mails.dpdk.org (Postfix) with ESMTP id 6D1B540E78 for ; Mon, 18 Sep 2023 04:47:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mbg8UQd8RiIVKeg14Od2CF7dZU74895Ib8kp6neEbpGY1xKU/HqFNjFP5hYaxBxcCn/ZO3TE0MGhXHnazzl6/NycUSiHWCIXOVTr+r49TSGB3NDKYEG8m3TOajDZL+DzQ74v8X/D56/QT7NK61CRhRd2IgkDDlUXN62kSQf8gT71ZMpHRI/ZPIQU2rTtFAYG3W37McIamYAZaS761o8wSNMMJaJitDFR7r0E/5qVYXACDP6is42v1wy910ygSQce0Glfk8MG1bUyc1geLUDE9YZrD1OlElu12l3Fvk9CnDK/DXHQUpcdiEMCZL8HnryuB8J+60czaOfNRrtud/9Y4w== 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=ScyxIrSKhklMZ8tQzfzFV3zqhD8Q2ISPuJP7zAJUomk=; b=N5e6hSNP5waiK7RvHUxlZ18M0PI9/pTZOCU6wotD2/VRgjag1os7xYgTS9iCMEqOsRutQ0FalQmGUZQpossIGlGPSVP2a79edfqJEPbH2XjvKugv+GRcbxNwhXuhJNH0EBLXaQz8tKEUG/v4RLW4I6RZv9kIGuy1LaFZjI1AfqR7xu4RMrIxKMBpNMPD67Idn25KKqBce/DrMXJUqTdIQVjsYjrUTpB19ExXT5/fDD9BWwIseV7Seb1B+tP2iJZ8U+zZ9F98CeiFuzj/l77Fy4WTlK07mgVlxTxAcvQ6jm3C4q6Nwm6xBmH7RgUKP3snKBfwgImtMeNh+oEcJQseFQ== 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=ScyxIrSKhklMZ8tQzfzFV3zqhD8Q2ISPuJP7zAJUomk=; b=Mrx5staiFgy8FQm2dYyA6lgExGAISemDgRWlJI40TOxRufqqNI/GUcebnYLTX6RDezX21bqSbAB6En+mtk/0WzPvwMFLFlVIRor5Egl3urrrUW86xM6KFLjVkXQRAMMyahmNv4EruGOVCKQBqHFnbLIqMQGrzbF1+h7Vs8m/FvY= 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 PH7PR13MB6435.namprd13.prod.outlook.com (2603:10b6:510:2ea::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Mon, 18 Sep 2023 02:47:29 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7a1c:2887:348a:84bd]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7a1c:2887:348a:84bd%6]) with mapi id 15.20.6792.026; Mon, 18 Sep 2023 02:47:29 +0000 From: Chaoyong He To: dev@dpdk.org Cc: Chaoyong He , =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [PATCH v4 10/26] net/nfp: rename some parameter and variable Date: Mon, 18 Sep 2023 10:45:56 +0800 Message-Id: <20230918024612.1600536-11-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230918024612.1600536-1-chaoyong.he@corigine.com> References: <20230915091551.1459606-1-chaoyong.he@corigine.com> <20230918024612.1600536-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SE2P216CA0016.KORP216.PROD.OUTLOOK.COM (2603:1096:101:114::20) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB6435:EE_ X-MS-Office365-Filtering-Correlation-Id: 7f0fa126-c27c-4db6-85c6-08dbb7f1997d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: smom/1wY6W+0CPiib2f28dbAgjcPrO9QI80pOu9VR/8VQmGBhgO4QVkVdKxhUkK5DnKBL0W7RwHm2hEx6z72ZdZIb04bQuB0Ru3zxY8Fes3ahREekm0bHSqYm4kVmNsQXl88EdDcVFQsn22n8UYVvZinmYRpUhZ8eposqQr2MlnZYZsYkO60YQI/OuSMkA/w3sabUj2PyjhnaUmX19Tlis1ddaMr6xpYikPeq/0lzE30qmcN5bVR4obO06ag8yqSDmYiPP8YuGVWXhZfkpYT1wkRmleKw38PYWzsfzOd8HLmUVnPIc1jBgVxwHwu0SXkinGHuXvkmkSyFrH8w1ZfVKrnG2Z2s8zyNTvjZzJW0JVAZyEEHshPfj977iQNu+2Ng17HHQAX6la50AeoilYo1eK9CCHaRV6Zqd/PWTzde1uPyGELfbU1NbWDY8Z7KyIhcnjog2gWKHwNedjgQozpbzNtFPseHhK4vPiFXSj7oJ0qrG10tahdL1xBZ80FAeWCOUs15BQas3gX1O4eVpIiMm43zvX9o8+mSBWhGqvL2R5OybCauW+/6KIKHYtNf25EIpBFWznBrjUabC8I3UARpGJzHn+9/xI7OxdZm7HyoQ5sXe6ZOOVzpNbCSlQrimukukj5DeRq+Bx8o0lNbd7dBf6db8kCQ42YCSOVfxXfsNw= 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)(39830400003)(136003)(346002)(366004)(376002)(396003)(1800799009)(451199024)(186009)(54906003)(66476007)(66946007)(66574015)(41300700001)(6916009)(316002)(8676002)(4326008)(8936002)(52116002)(6506007)(6486002)(6512007)(478600001)(6666004)(83380400001)(26005)(1076003)(2616005)(107886003)(86362001)(2906002)(30864003)(44832011)(38100700002)(38350700002)(5660300002)(36756003)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?tt2lu6wTtya8O6mbnJ5tDfrn8Uiu?= =?utf-8?q?Y+Yt9zrJAME8KPVXSfwHc+ibKCsOG3BFjbq7u+63mpbJkJKeEfRN2cLhjcBZRmVix?= =?utf-8?q?i5GNsI4e0LV+WCwUjPvwfGNR6FLTO9j25SkUDujVw3kd1rzmwBuagcZlZ2yrHO/3d?= =?utf-8?q?1w0WpAJxib0HXLSdt9eOY0eF+Nvv4e6KHVdVwUraedGP8ZfpAA5zqCGyocGUUIlnX?= =?utf-8?q?cszK6eknQ8Y+T/HHLl7FBEeZty0coB/FHDIKyoPPnRwCxYuSxAs54gj/4Qv60reqV?= =?utf-8?q?wrMEiovTnIdUK4NsFWKmsr2HuJVQgIoH//qZWxS39odhA1ugEyR4yi818Rf2bb66G?= =?utf-8?q?qqAOJyyDb14p7oTFZE8X8JiXImhiYNKKJs2LN9cW/n2X2w2aW58+chPnAUlVltorP?= =?utf-8?q?HWrIdbY6ySO0O/CYUiywaRFJsEm+cRPKsia0Lf/ydRPzoKm2uUcJIVFlUGozxImeE?= =?utf-8?q?LUg27GHScDr5Y4KzPf1gn0JAruAp0SI4fB5Y636cpnIjuqpm2JWk2+yHJjud+8xpL?= =?utf-8?q?8Ke7uP0O7SCEQF+hH6YlShlFnxOZSpC+Z0AzZ/e7i8LOR95YeGgFvVavmj9+EvKf6?= =?utf-8?q?pRnywJxokt3NFWcqSQxwp8shkBf7IfrOJEujAKxLTNtv1UpVamJmRWXPjaYsNKMmn?= =?utf-8?q?QvBfeg5pE3ENbKDa0TZTEQ49I7ZdtnOKiZVE+f4P/cYHEByRNa5cKD2/0CMQR+NfM?= =?utf-8?q?6PdsvaFMvRO/sDW1Ipeu+GFbOcfYwAY/TlzCwwmKGVOS9MQh24dNfCkbT4iOgO4Ac?= =?utf-8?q?dHVfmriOrQTknN0r4Oqje+tiGqP77qv38Mig/AsY500d0tngv+z6nNtPClcNzEv0D?= =?utf-8?q?ViAjH47ISg/1vM/hE40gXZFk8ri6vlvN89F6u6dKypfx00MLlAd//3oHWwPOnH99G?= =?utf-8?q?T2y+8/oFe8vnX4rO2ArH0E4c9+CFctlbLtIgauESwvqG9M+dEnoiAr9BG5IDBNfD4?= =?utf-8?q?5VEXm8x3uSy1/GLyFtciYzxYHFfVyjKYyOmVGveilG6kVcgZdgJRUymjL+liOlXHK?= =?utf-8?q?/3oqOpA+VEd8XPkIu3JYbwjvLgWGkfBYMdYOWcm/WV1iT/8CRTFg9OOwl4jOS7OiB?= =?utf-8?q?NxgnqC1yQvhOcn4rskJyPHyXrPvGeIpUtoO3OAoEw8a50MpQQMIu8qF9Il1vnEnPI?= =?utf-8?q?ESyUGcKeyNYaSNXO2APYs9ljKmBjK6eCyf68O4d3uv+vTv3gDQxGqhW3C25MXBNCe?= =?utf-8?q?Pw60e1ida/O4EFQG9J1ay8LAMes/k78AdQYohjWkdvPzfc1A8dOoAJXAWkHRPKNeK?= =?utf-8?q?xw0i2xozxR25GOs4lTRfJfN6OmOpr/MPh6xrCypGmNOvcf9n0BUcTvmcJl0GcCVAm?= =?utf-8?q?leUA0Uv4GeUcq18q2shDzXoa0alJQlK97tb6rJVgsI2mmy4jzhe1z2sppsVFD5n5v?= =?utf-8?q?oPdssMWh1R0JAB8NdQlorEHtAO6NSh+vc2BvLx1QR+ntUKbArbB+jYQ2sPMCf6tjf?= =?utf-8?q?6AqYnZYZWdDhxDJtFf4q5gUQ/Y59UqPkcIVJ/fFGhjM5jue0rSJLvcnoaXcqmJOe3?= =?utf-8?q?Y1x1etFaJmpMe+YQ5x3exybk77w/qN1Dxw=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f0fa126-c27c-4db6-85c6-08dbb7f1997d X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2023 02:47:29.5176 (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: LtlccFj6ldOxCYV0OivyWhMIuFR82o3hzeVVtRyUvGknYQ4vVoBq3eqSbpsAPW56qajLO/mJEmLQEKt3eJpg2c7nTereB8TuPiTf2IoKnwQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB6435 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 Rename some parameter and variable to make the logic easier to understand. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfpcore/nfp_cpp.h | 10 ++--- drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 42 ++++++++--------- drivers/net/nfp/nfpcore/nfp_cppcore.c | 52 +++++++++++----------- drivers/net/nfp/nfpcore/nfp_mip.h | 2 +- drivers/net/nfp/nfpcore/nfp_mutex.c | 6 +-- drivers/net/nfp/nfpcore/nfp_nffw.c | 20 ++++----- drivers/net/nfp/nfpcore/nfp_nffw.h | 4 +- drivers/net/nfp/nfpcore/nfp_nsp.h | 8 ++-- drivers/net/nfp/nfpcore/nfp_nsp_cmds.c | 2 +- drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 20 ++++----- 10 files changed, 83 insertions(+), 83 deletions(-) diff --git a/drivers/net/nfp/nfpcore/nfp_cpp.h b/drivers/net/nfp/nfpcore/nfp_cpp.h index ceb4d56a08..be7ae1d919 100644 --- a/drivers/net/nfp/nfpcore/nfp_cpp.h +++ b/drivers/net/nfp/nfpcore/nfp_cpp.h @@ -247,7 +247,7 @@ void *nfp_cpp_priv(struct nfp_cpp *cpp); void *nfp_cpp_area_priv(struct nfp_cpp_area *cpp_area); -uint32_t __nfp_cpp_model_autodetect(struct nfp_cpp *cpp, uint32_t *model); +uint32_t nfp_cpp_model_autodetect(struct nfp_cpp *cpp, uint32_t *model); /* NFP CPP core interface for CPP clients */ struct nfp_cpp *nfp_cpp_from_device_name(struct rte_pci_device *dev, @@ -381,10 +381,10 @@ uint8_t *nfp_cpp_map_area(struct nfp_cpp *cpp, uint32_t cpp_id, uint64_t addr, uint32_t size, struct nfp_cpp_area **area); int nfp_cpp_area_read(struct nfp_cpp_area *area, uint32_t offset, - void *buffer, size_t length); + void *address, size_t length); int nfp_cpp_area_write(struct nfp_cpp_area *area, uint32_t offset, - const void *buffer, size_t length); + const void *address, size_t length); void *nfp_cpp_area_iomem(struct nfp_cpp_area *area); @@ -393,10 +393,10 @@ struct nfp_cpp *nfp_cpp_area_cpp(struct nfp_cpp_area *cpp_area); const char *nfp_cpp_area_name(struct nfp_cpp_area *cpp_area); int nfp_cpp_read(struct nfp_cpp *cpp, uint32_t cpp_id, - uint64_t address, void *kernel_vaddr, size_t length); + uint64_t address, void *buf, size_t length); int nfp_cpp_write(struct nfp_cpp *cpp, uint32_t cpp_id, - uint64_t address, const void *kernel_vaddr, size_t length); + uint64_t address, const void *buf, size_t length); int nfp_cpp_area_readl(struct nfp_cpp_area *area, uint32_t offset, uint32_t *value); diff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c index 28a6278497..db15411eb2 100644 --- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c +++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c @@ -118,9 +118,9 @@ static int nfp_compute_bar(const struct nfp_bar *bar, uint32_t *bar_config, uint64_t *bar_base, - int tgt, - int act, - int tok, + int target, + int action, + int token, uint64_t offset, size_t size, int width) @@ -129,7 +129,7 @@ nfp_compute_bar(const struct nfp_bar *bar, uint32_t newcfg; uint32_t bitsize; - if (tgt >= 16) + if (target >= 16) return -EINVAL; switch (width) { @@ -149,15 +149,15 @@ nfp_compute_bar(const struct nfp_bar *bar, return -EINVAL; } - if (act != NFP_CPP_ACTION_RW && act != 0) { + if (action != NFP_CPP_ACTION_RW && action != 0) { /* Fixed CPP mapping with specific action */ mask = ~(NFP_PCIE_P2C_FIXED_SIZE(bar) - 1); newcfg |= NFP_PCIE_BAR_PCIE2CPP_MAPTYPE (NFP_PCIE_BAR_PCIE2CPP_MAPTYPE_FIXED); - newcfg |= NFP_PCIE_BAR_PCIE2CPP_TARGET_BASEADDRESS(tgt); - newcfg |= NFP_PCIE_BAR_PCIE2CPP_ACTION_BASEADDRESS(act); - newcfg |= NFP_PCIE_BAR_PCIE2CPP_TOKEN_BASEADDRESS(tok); + newcfg |= NFP_PCIE_BAR_PCIE2CPP_TARGET_BASEADDRESS(target); + newcfg |= NFP_PCIE_BAR_PCIE2CPP_ACTION_BASEADDRESS(action); + newcfg |= NFP_PCIE_BAR_PCIE2CPP_TOKEN_BASEADDRESS(token); if ((offset & mask) != ((offset + size - 1) & mask)) return -EINVAL; @@ -170,8 +170,8 @@ nfp_compute_bar(const struct nfp_bar *bar, /* Bulk mapping */ newcfg |= NFP_PCIE_BAR_PCIE2CPP_MAPTYPE (NFP_PCIE_BAR_PCIE2CPP_MAPTYPE_BULK); - newcfg |= NFP_PCIE_BAR_PCIE2CPP_TARGET_BASEADDRESS(tgt); - newcfg |= NFP_PCIE_BAR_PCIE2CPP_TOKEN_BASEADDRESS(tok); + newcfg |= NFP_PCIE_BAR_PCIE2CPP_TARGET_BASEADDRESS(target); + newcfg |= NFP_PCIE_BAR_PCIE2CPP_TOKEN_BASEADDRESS(token); if ((offset & mask) != ((offset + size - 1) & mask)) return -EINVAL; @@ -221,9 +221,9 @@ nfp_bar_write(struct nfp_pcie_user *nfp, static int nfp_reconfigure_bar(struct nfp_pcie_user *nfp, struct nfp_bar *bar, - int tgt, - int act, - int tok, + int target, + int action, + int token, uint64_t offset, size_t size, int width) @@ -232,8 +232,8 @@ nfp_reconfigure_bar(struct nfp_pcie_user *nfp, uint32_t newcfg; uint64_t newbase; - err = nfp_compute_bar(bar, &newcfg, &newbase, tgt, act, tok, offset, - size, width); + err = nfp_compute_bar(bar, &newcfg, &newbase, target, action, + token, offset, size, width); if (err != 0) return err; @@ -457,15 +457,15 @@ nfp6000_area_iomem(struct nfp_cpp_area *area) static int nfp6000_area_read(struct nfp_cpp_area *area, - void *kernel_vaddr, + void *address, uint32_t offset, size_t length) { size_t n; int width; bool is_64; - uint32_t *wrptr32 = kernel_vaddr; - uint64_t *wrptr64 = kernel_vaddr; + uint32_t *wrptr32 = address; + uint64_t *wrptr64 = address; struct nfp6000_area_priv *priv; const volatile uint32_t *rdptr32; const volatile uint64_t *rdptr64; @@ -526,7 +526,7 @@ nfp6000_area_read(struct nfp_cpp_area *area, static int nfp6000_area_write(struct nfp_cpp_area *area, - const void *kernel_vaddr, + const void *address, uint32_t offset, size_t length) { @@ -536,8 +536,8 @@ nfp6000_area_write(struct nfp_cpp_area *area, uint32_t *wrptr32; uint64_t *wrptr64; struct nfp6000_area_priv *priv; - const uint32_t *rdptr32 = kernel_vaddr; - const uint64_t *rdptr64 = kernel_vaddr; + const uint32_t *rdptr32 = address; + const uint64_t *rdptr64 = address; priv = nfp_cpp_area_priv(area); wrptr64 = (uint64_t *)(priv->iomem + offset); diff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c index c46fd62e32..7173b4d8a5 100644 --- a/drivers/net/nfp/nfpcore/nfp_cppcore.c +++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c @@ -90,7 +90,7 @@ nfp_cpp_model(struct nfp_cpp *cpp) if (cpp == NULL) return NFP_CPP_MODEL_INVALID; - err = __nfp_cpp_model_autodetect(cpp, &model); + err = nfp_cpp_model_autodetect(cpp, &model); if (err < 0) return err; @@ -484,7 +484,7 @@ nfp_cpp_area_iomem(struct nfp_cpp_area *area) * CPP area handle * @param offset * Offset into CPP area - * @param kernel_vaddr + * @param address * Address to put data into * @param length * Number of bytes to read @@ -498,13 +498,13 @@ nfp_cpp_area_iomem(struct nfp_cpp_area *area) int nfp_cpp_area_read(struct nfp_cpp_area *area, uint32_t offset, - void *kernel_vaddr, + void *address, size_t length) { if ((offset + length) > area->size) return -EFAULT; - return area->cpp->op->area_read(area, kernel_vaddr, offset, length); + return area->cpp->op->area_read(area, address, offset, length); } /** @@ -514,7 +514,7 @@ nfp_cpp_area_read(struct nfp_cpp_area *area, * CPP area handle * @param offset * Offset into CPP area - * @param kernel_vaddr + * @param address * Address to put data into * @param length * Number of bytes to read @@ -528,13 +528,13 @@ nfp_cpp_area_read(struct nfp_cpp_area *area, int nfp_cpp_area_write(struct nfp_cpp_area *area, uint32_t offset, - const void *kernel_vaddr, + const void *address, size_t length) { if ((offset + length) > area->size) return -EFAULT; - return area->cpp->op->area_write(area, kernel_vaddr, offset, length); + return area->cpp->op->area_write(area, address, offset, length); } /* @@ -880,14 +880,14 @@ nfp_cpp_alloc(struct rte_pci_device *dev, } if (NFP_CPP_MODEL_IS_6000(nfp_cpp_model(cpp))) { - uint32_t xpbaddr; - size_t tgt; + uint32_t xpb_addr; + size_t target; - for (tgt = 0; tgt < RTE_DIM(cpp->imb_cat_table); tgt++) { + for (target = 0; target < RTE_DIM(cpp->imb_cat_table); target++) { /* Hardcoded XPB IMB Base, island 0 */ - xpbaddr = 0x000a0000 + (tgt * 4); - err = nfp_xpb_readl(cpp, xpbaddr, - (uint32_t *)&cpp->imb_cat_table[tgt]); + xpb_addr = 0x000a0000 + (target * 4); + err = nfp_xpb_readl(cpp, xpb_addr, + (uint32_t *)&cpp->imb_cat_table[target]); if (err < 0) { free(cpp); return NULL; @@ -950,9 +950,9 @@ nfp_cpp_from_device_name(struct rte_pci_device *dev, * CPP handle * @param destination * CPP id - * @param address + * @param offset * Offset into CPP target - * @param kernel_vaddr + * @param address * Buffer for result * @param length * Number of bytes to read @@ -963,20 +963,20 @@ nfp_cpp_from_device_name(struct rte_pci_device *dev, int nfp_cpp_read(struct nfp_cpp *cpp, uint32_t destination, - uint64_t address, - void *kernel_vaddr, + uint64_t offset, + void *address, size_t length) { int err; struct nfp_cpp_area *area; - area = nfp_cpp_area_alloc_acquire(cpp, destination, address, length); + area = nfp_cpp_area_alloc_acquire(cpp, destination, offset, length); if (area == NULL) { PMD_DRV_LOG(ERR, "Area allocation/acquire failed for read"); return -1; } - err = nfp_cpp_area_read(area, 0, kernel_vaddr, length); + err = nfp_cpp_area_read(area, 0, address, length); nfp_cpp_area_release_free(area); return err; @@ -989,9 +989,9 @@ nfp_cpp_read(struct nfp_cpp *cpp, * CPP handle * @param destination * CPP id - * @param address + * @param offset * Offset into CPP target - * @param kernel_vaddr + * @param address * Buffer to read from * @param length * Number of bytes to write @@ -1002,20 +1002,20 @@ nfp_cpp_read(struct nfp_cpp *cpp, int nfp_cpp_write(struct nfp_cpp *cpp, uint32_t destination, - uint64_t address, - const void *kernel_vaddr, + uint64_t offset, + const void *address, size_t length) { int err; struct nfp_cpp_area *area; - area = nfp_cpp_area_alloc_acquire(cpp, destination, address, length); + area = nfp_cpp_area_alloc_acquire(cpp, destination, offset, length); if (area == NULL) { PMD_DRV_LOG(ERR, "Area allocation/acquire failed for write"); return -1; } - err = nfp_cpp_area_write(area, 0, kernel_vaddr, length); + err = nfp_cpp_area_write(area, 0, address, length); nfp_cpp_area_release_free(area); return err; @@ -1026,7 +1026,7 @@ nfp_cpp_write(struct nfp_cpp *cpp, * as those are model-specific */ uint32_t -__nfp_cpp_model_autodetect(struct nfp_cpp *cpp, +nfp_cpp_model_autodetect(struct nfp_cpp *cpp, uint32_t *model) { int err; diff --git a/drivers/net/nfp/nfpcore/nfp_mip.h b/drivers/net/nfp/nfpcore/nfp_mip.h index 371c635b97..7fa09ee575 100644 --- a/drivers/net/nfp/nfpcore/nfp_mip.h +++ b/drivers/net/nfp/nfpcore/nfp_mip.h @@ -17,6 +17,6 @@ const char *nfp_mip_name(const struct nfp_mip *mip); void nfp_mip_symtab(const struct nfp_mip *mip, uint32_t *addr, uint32_t *size); void nfp_mip_strtab(const struct nfp_mip *mip, uint32_t *addr, uint32_t *size); int nfp_nffw_info_mip_first(struct nfp_nffw_info *state, uint32_t *cpp_id, - uint64_t *off); + uint64_t *offset); #endif /* __NFP_MIP_H__ */ diff --git a/drivers/net/nfp/nfpcore/nfp_mutex.c b/drivers/net/nfp/nfpcore/nfp_mutex.c index e97537b795..82598be7a1 100644 --- a/drivers/net/nfp/nfpcore/nfp_mutex.c +++ b/drivers/net/nfp/nfpcore/nfp_mutex.c @@ -35,7 +35,7 @@ struct nfp_cpp_mutex { }; static int -_nfp_cpp_mutex_validate(uint32_t model, +nfp_cpp_mutex_validate(uint32_t model, int *target, uint64_t address) { @@ -87,7 +87,7 @@ nfp_cpp_mutex_init(struct nfp_cpp *cpp, uint32_t model = nfp_cpp_model(cpp); uint32_t muw = NFP_CPP_ID(target, 4, 0); /* atomic_write */ - err = _nfp_cpp_mutex_validate(model, &target, address); + err = nfp_cpp_mutex_validate(model, &target, address); if (err < 0) return err; @@ -152,7 +152,7 @@ nfp_cpp_mutex_alloc(struct nfp_cpp *cpp, return NULL; } - err = _nfp_cpp_mutex_validate(model, &target, address); + err = nfp_cpp_mutex_validate(model, &target, address); if (err < 0) return NULL; diff --git a/drivers/net/nfp/nfpcore/nfp_nffw.c b/drivers/net/nfp/nfpcore/nfp_nffw.c index be80eeaa0e..df6292e909 100644 --- a/drivers/net/nfp/nfpcore/nfp_nffw.c +++ b/drivers/net/nfp/nfpcore/nfp_nffw.c @@ -31,11 +31,11 @@ nffw_res_flg_init_get(const struct nfp_nffw_info_data *res) return (res->flags[0] >> 0) & 1; } -/* loaded = loaded__mu_da__mip_off_hi<31:31> */ +/* loaded = loaded_mu_da_mip_off_hi<31:31> */ static uint32_t nffw_fwinfo_loaded_get(const struct nffw_fwinfo *fi) { - return (fi->loaded__mu_da__mip_off_hi >> 31) & 1; + return (fi->loaded_mu_da_mip_off_hi >> 31) & 1; } /* mip_cppid = mip_cppid */ @@ -45,18 +45,18 @@ nffw_fwinfo_mip_cppid_get(const struct nffw_fwinfo *fi) return fi->mip_cppid; } -/* loaded = loaded__mu_da__mip_off_hi<8:8> */ +/* loaded = loaded_mu_da_mip_off_hi<8:8> */ static uint32_t nffw_fwinfo_mip_mu_da_get(const struct nffw_fwinfo *fi) { - return (fi->loaded__mu_da__mip_off_hi >> 8) & 1; + return (fi->loaded_mu_da_mip_off_hi >> 8) & 1; } -/* mip_offset = (loaded__mu_da__mip_off_hi<7:0> << 32) | mip_offset_lo */ +/* mip_offset = (loaded_mu_da_mip_off_hi<7:0> << 32) | mip_offset_lo */ static uint64_t nffw_fwinfo_mip_offset_get(const struct nffw_fwinfo *fi) { - uint64_t mip_off_hi = fi->loaded__mu_da__mip_off_hi; + uint64_t mip_off_hi = fi->loaded_mu_da_mip_off_hi; return (mip_off_hi & 0xFF) << 32 | fi->mip_offset_lo; } @@ -227,7 +227,7 @@ nfp_nffw_info_fwid_first(struct nfp_nffw_info *state) int nfp_nffw_info_mip_first(struct nfp_nffw_info *state, uint32_t *cpp_id, - uint64_t *off) + uint64_t *offset) { struct nffw_fwinfo *fwinfo; @@ -236,7 +236,7 @@ nfp_nffw_info_mip_first(struct nfp_nffw_info *state, return -EINVAL; *cpp_id = nffw_fwinfo_mip_cppid_get(fwinfo); - *off = nffw_fwinfo_mip_offset_get(fwinfo); + *offset = nffw_fwinfo_mip_offset_get(fwinfo); if (nffw_fwinfo_mip_mu_da_get(fwinfo) != 0) { int locality_off; @@ -248,8 +248,8 @@ nfp_nffw_info_mip_first(struct nfp_nffw_info *state, if (locality_off < 0) return locality_off; - *off &= ~(NFP_MU_ADDR_ACCESS_TYPE_MASK << locality_off); - *off |= NFP_MU_ADDR_ACCESS_TYPE_DIRECT << locality_off; + *offset &= ~(NFP_MU_ADDR_ACCESS_TYPE_MASK << locality_off); + *offset |= NFP_MU_ADDR_ACCESS_TYPE_DIRECT << locality_off; } return 0; diff --git a/drivers/net/nfp/nfpcore/nfp_nffw.h b/drivers/net/nfp/nfpcore/nfp_nffw.h index f84be463c4..52e25c090a 100644 --- a/drivers/net/nfp/nfpcore/nfp_nffw.h +++ b/drivers/net/nfp/nfpcore/nfp_nffw.h @@ -38,11 +38,11 @@ /* nfp.nffw meinfo */ struct nffw_meinfo { - uint32_t ctxmask__fwid__meid; + uint32_t ctxmask_fwid_meid; }; struct nffw_fwinfo { - uint32_t loaded__mu_da__mip_off_hi; + uint32_t loaded_mu_da_mip_off_hi; uint32_t mip_cppid; /* 0 means no MIP */ uint32_t mip_offset_lo; }; diff --git a/drivers/net/nfp/nfpcore/nfp_nsp.h b/drivers/net/nfp/nfpcore/nfp_nsp.h index 7bf584dcd0..705574b900 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp.h +++ b/drivers/net/nfp/nfpcore/nfp_nsp.h @@ -231,9 +231,9 @@ struct nfp_nsp *nfp_eth_config_start(struct nfp_cpp *cpp, uint32_t idx); int nfp_eth_config_commit_end(struct nfp_nsp *nsp); void nfp_eth_config_cleanup_end(struct nfp_nsp *nsp); -int __nfp_eth_set_aneg(struct nfp_nsp *nsp, enum nfp_eth_aneg mode); -int __nfp_eth_set_speed(struct nfp_nsp *nsp, uint32_t speed); -int __nfp_eth_set_split(struct nfp_nsp *nsp, uint32_t lanes); +int nfp_eth_set_aneg(struct nfp_nsp *nsp, enum nfp_eth_aneg mode); +int nfp_eth_set_speed(struct nfp_nsp *nsp, uint32_t speed); +int nfp_eth_set_split(struct nfp_nsp *nsp, uint32_t lanes); /* NSP static information */ struct nfp_nsp_identify { @@ -248,7 +248,7 @@ struct nfp_nsp_identify { uint64_t sensor_mask; /**< Mask of present sensors available on NIC */ }; -struct nfp_nsp_identify *__nfp_nsp_identify(struct nfp_nsp *nsp); +struct nfp_nsp_identify *nfp_nsp_identify(struct nfp_nsp *nsp); enum nfp_nsp_sensor_id { NFP_SENSOR_CHIP_TEMPERATURE, diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c index 769ed54957..f656f200f4 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c @@ -24,7 +24,7 @@ struct nsp_identify { }; struct nfp_nsp_identify * -__nfp_nsp_identify(struct nfp_nsp *nsp) +nfp_nsp_identify(struct nfp_nsp *nsp) { int ret; struct nsp_identify *ni; diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c index d291552d03..32c1838a40 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c @@ -242,7 +242,7 @@ nfp_eth_calc_port_type(struct nfp_eth_table_port *entry) } static struct nfp_eth_table * -__nfp_eth_read_ports(struct nfp_nsp *nsp) +nfp_eth_read_ports_real(struct nfp_nsp *nsp) { int ret; uint32_t i; @@ -335,7 +335,7 @@ nfp_eth_read_ports(struct nfp_cpp *cpp) if (nsp == NULL) return NULL; - ret = __nfp_eth_read_ports(nsp); + ret = nfp_eth_read_ports_real(nsp); nfp_nsp_close(nsp); return ret; @@ -484,7 +484,7 @@ nfp_eth_set_mod_enable(struct nfp_cpp *cpp, int nfp_eth_set_configured(struct nfp_cpp *cpp, uint32_t idx, - int configed) + int configured) { uint64_t reg; struct nfp_nsp *nsp; @@ -507,10 +507,10 @@ nfp_eth_set_configured(struct nfp_cpp *cpp, /* Check if we are already in requested state */ reg = rte_le_to_cpu_64(entries[idx].state); - if (configed != (int)FIELD_GET(NSP_ETH_STATE_CONFIGURED, reg)) { + if (configured != (int)FIELD_GET(NSP_ETH_STATE_CONFIGURED, reg)) { reg = rte_le_to_cpu_64(entries[idx].control); reg &= ~NSP_ETH_CTRL_CONFIGURED; - reg |= FIELD_PREP(NSP_ETH_CTRL_CONFIGURED, configed); + reg |= FIELD_PREP(NSP_ETH_CTRL_CONFIGURED, configured); entries[idx].control = rte_cpu_to_le_64(reg); nfp_nsp_config_set_modified(nsp, 1); @@ -576,7 +576,7 @@ nfp_eth_set_bit_config(struct nfp_nsp *nsp, * 0 or -ERRNO */ int -__nfp_eth_set_aneg(struct nfp_nsp *nsp, +nfp_eth_set_aneg(struct nfp_nsp *nsp, enum nfp_eth_aneg mode) { return NFP_ETH_SET_BIT_CONFIG(nsp, NSP_ETH_RAW_STATE, @@ -596,7 +596,7 @@ __nfp_eth_set_aneg(struct nfp_nsp *nsp, * 0 or -ERRNO */ static int -__nfp_eth_set_fec(struct nfp_nsp *nsp, +nfp_eth_set_fec_real(struct nfp_nsp *nsp, enum nfp_eth_fec mode) { return NFP_ETH_SET_BIT_CONFIG(nsp, NSP_ETH_RAW_STATE, @@ -630,7 +630,7 @@ nfp_eth_set_fec(struct nfp_cpp *cpp, if (nsp == NULL) return -EIO; - err = __nfp_eth_set_fec(nsp, mode); + err = nfp_eth_set_fec_real(nsp, mode); if (err != 0) { nfp_eth_config_cleanup_end(nsp); return err; @@ -654,7 +654,7 @@ nfp_eth_set_fec(struct nfp_cpp *cpp, * 0 or -ERRNO */ int -__nfp_eth_set_speed(struct nfp_nsp *nsp, +nfp_eth_set_speed(struct nfp_nsp *nsp, uint32_t speed) { enum nfp_eth_rate rate; @@ -682,7 +682,7 @@ __nfp_eth_set_speed(struct nfp_nsp *nsp, * 0 or -ERRNO */ int -__nfp_eth_set_split(struct nfp_nsp *nsp, +nfp_eth_set_split(struct nfp_nsp *nsp, uint32_t lanes) { return NFP_ETH_SET_BIT_CONFIG(nsp, NSP_ETH_RAW_PORT,