From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1ABC4430EF; Thu, 24 Aug 2023 13:11:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CECD243274; Thu, 24 Aug 2023 13:11:00 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2090.outbound.protection.outlook.com [40.107.220.90]) by mails.dpdk.org (Postfix) with ESMTP id F096443262 for ; Thu, 24 Aug 2023 13:10:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W3ologfN2KDwxkeKP/X90TwXSg1ntCBJ0gRFgySQZfy1sObNQujk224KHbiwtPz/Tfu6WIyAXk63/VFFN8bHoG24dul31Xo3U5WtNAnqwEDjs617BC8UHD3JAQ+35c3q1iHNOQF5hgyOLvJjtuH1c3FRQKWpbHdqzjoNPB8TwSPHQnh/PZgwrhyuIT8WNZUglMr1GUSA6n/AL3C3tnVbifEGOz2EqULbYtxqxAmClw/iaIY4FQp9gAiKpQ9X0jETRtoWjGLIURAIzNKYFieLgLmdNVul39GgBDbmHCBolg8xrRkaEdwwbVKqdSYG+hlZstoVq8fSiqaVCLsU1ygkSQ== 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=v2oqJz3y0dSBWJsvc+AHWxcVJSzAakYhluAE4prPiBo=; b=Ox0YXqjY+Go7GeWMRLo1osdUwZgQxeEh5jax6vhsSf/vCTT686V6jpDKHA2Q4TTHKrLO71IlVsUpG4isO82KaqKGHJ9cN/wrwFUwVAxEQneYHoZxTEnRwLiSBY20fuTsljK0bdFQ201mdtw2Fhp3873gNPej+2w3xWXqlE2UHgTEH60EPFDp/ISKiqA6zWP+8qR10iZzswsCn/U2Ilnrg5IWxH+X35ZVSKCyJ2iwdZFBmmFkpyh6Fx/miLxAGOxrQzYLJ1jkjpF+mC5SVHwJxbKk0n3noesJ7pLqeA7KtGYgcPRaZFWaUet5dKIJ8xxyxBdm/cZPoyzM/t1GOeL/LA== 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=v2oqJz3y0dSBWJsvc+AHWxcVJSzAakYhluAE4prPiBo=; b=WzkCW4EVd8qq9J1HX00q1ruY6/oEIQtSTIb9FUK82QFmRW3SDS9C1snA36wdCaiKW0AUACfsE3oq8UEhmvpDIuakGzFPxT0zm6eUbFDrnSeeYA+GbpjNy5Pgq62vUpSZyaifZEVJD+BWepoa3MSBMtF9DLLtFoNq1nxp3xPPzWc= 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 PH0PR13MB6134.namprd13.prod.outlook.com (2603:10b6:510:295::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.26; Thu, 24 Aug 2023 11:10:55 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::51fe:5846:af8b:bace]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::51fe:5846:af8b:bace%3]) with mapi id 15.20.6699.020; Thu, 24 Aug 2023 11:10:55 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 05/27] net/nfp: standard the local variable coding style Date: Thu, 24 Aug 2023 19:09:34 +0800 Message-Id: <20230824110956.1943559-6-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230824110956.1943559-1-chaoyong.he@corigine.com> References: <20230824110956.1943559-1-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SJ0PR05CA0005.namprd05.prod.outlook.com (2603:10b6:a03:33b::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_|PH0PR13MB6134:EE_ X-MS-Office365-Filtering-Correlation-Id: 793639b2-e1c5-4c4c-1d2b-08dba492c90d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sIf44DZ8OEZmXKMFoHwr2r3scGwW9rsW1DwNWTCYavzT8UjQL7ZUp/Vvu3YCdErjjkUmABaKEl3F5d5Y6vZlbws+3tBqWcUX47jflS+jQaZPy1WfIIVe03WpgWSeNEItaOYnkUOSvSDGArdk5BjVDeKpaz6VngX9KLYnO4M3QLCdJFcm5CTXudCXyRzhT1GNyAVIRleEJjNB3BVYTLjIaDZq8kVVWgwUzEQ8xpKl9M92/KkKuEkAjFxt6EdsPIHzz/Kc1gdcF6r5gclPYzxKKzJSonC0OIEmq3/NWGTTFByyA8ybKyF5Pw1qGw7Ye34Jw/3a2Cp5ohmLDL+Y9ILom3dWbETq4UAf11HYxGNNJlZUs7MBJiR8JIHIgAJMvnoh4cdKwLfOQms2kbUj50Kh3MKu157Ow/Am8hkp+2NqGq1maLms3+9VnRw+LBudYNicyulkbgN1G3rvxYqlZciIFzatN5g6QdW6h24WPIxoQqHRedmhJyjTygGIf1s6Cg2kZg+CaJ5vproCkzzucxieSyBtkk+adP/7N2Y1/n1mACU8cquyuohv8VJr+0GkDqaSiFfzBgAjP1XslIydbiYjiKIZHwZrjCGrfYt4vfTfPfHA2ZLuJaXT7xTmj8xRs8hmRu6dxunYBPnfyOM61S4u9sZjVqbJOZtN04xSHQBU+MxxO3io4co0XN+q5TvoBtjC 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)(346002)(396003)(366004)(136003)(376002)(39830400003)(1800799009)(451199024)(186009)(316002)(66556008)(6916009)(66946007)(66476007)(12101799020)(41300700001)(44832011)(5660300002)(8936002)(8676002)(38100700002)(66574015)(38350700002)(4326008)(30864003)(2906002)(83380400001)(26005)(86362001)(478600001)(107886003)(52116002)(36756003)(6506007)(6666004)(6512007)(6486002)(2616005)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VzBmZ3J5UmpCSmtVbFFBRDZhbFBJOStMb2E5aVB4TGhhMHoyaVhPVzR1WGRD?= =?utf-8?B?TFZ3UzBUci9DalBHamZaUFlNMVdDek5SRzQwbml5ZHYrWDdIWnZJdGZaeS94?= =?utf-8?B?YnBoZjVNdGZNVFUwcVFPM3dvZkFkRjYvcnBjMFI2K0tZUHd5MkVoY0NGOXc4?= =?utf-8?B?OWhReXMvdk5nTUhOUmlXOXpEYktMVXJna3NINmFVODZrZkNOZHFCdWVMWllR?= =?utf-8?B?UEZNZzArMTFobk0yeHA0NDJrSG1HaWExOWJ2Z01JZ2VDQTJUaFBMcVovNE10?= =?utf-8?B?aUwrMFVQbHNkWDhQQVVRTm9RcjJ3UG9pczVsVlA5WEJGcXJHSlBHMjJBOW9Q?= =?utf-8?B?Y01QVGJMaldyQUd1VThWM3EzK29nVnAwTldpazJMTEo2dW1RU3VpbjltaEVq?= =?utf-8?B?ZFVLMGROdXpBT0JEcnNJallsdlRDRXdNMkxCendrcGV4R1FsZ09UOGdUOVhN?= =?utf-8?B?VHp1Q2pneXFDbytpR2k0MWNLc25tLzdXdmphaUxnWkh1Z1FleG1DbXpweUtq?= =?utf-8?B?c1ZkcFF3bmswZnd4WmpkRmlKMkI3ZHlpcXFXR2dIMUhwUmNwbE9yQXl2NExr?= =?utf-8?B?VEl2MjlSN2Ywa3d4NENncWhnTFFCYThLWWl3eGVJZmdaWVpLVm1xQWFJemFv?= =?utf-8?B?eHJoSXR0RTBUMmRMR2pwWG1xaG1rbDZzZFJIaDdNRW1oQzU5REtsUURmWXlJ?= =?utf-8?B?TzNWVEsyYUloU3RGOG9KSDVtTHlQclhkYSs0WHFWdCtWN2ovaWVqZ2Y0WWxU?= =?utf-8?B?dTRqTWI5Y2VTZG9kaUo3dGFqK1ZMY1NBb3k1MVVZRlh5NU8vbUZpd3FqOTRW?= =?utf-8?B?Qm5sakVqQzRJSjI4cW1pSktQSXB4OVppVG5EWUZnUmZieFp1RVpJM2pzVUZo?= =?utf-8?B?ZFh2MW03Q2hmYXZNdG9NU3lWdmZtVERkdy9OcTU5azF1VGxqcU56VTZ5TklH?= =?utf-8?B?b1hHcnloRGJxdXU3YnNVdmZjaGxWMWtTY0M5RXJqdktNRzJhOFVrcDhBeTRO?= =?utf-8?B?THo1WmNJTjlrSjNrMVF0TDVsblFpYmRwRWtJeEY3MkUwMExpTG9OczdUOGdH?= =?utf-8?B?MUVyZU5rYUdvVnJJaC9uVTNIZzltcmJPY202ODh3YjBTRlR2RWlSdVJhSnNl?= =?utf-8?B?TzM1dm9Mb0Z3YlAybDZrZHBqbEVybmJjOG9OVlQ2Nk4rRU9rRnVhV2xkZm80?= =?utf-8?B?U29CaW9hNnc2ZW9DNDVjNDRMVXdKTXkxbWNJaFR0RVlKQkI0SmkrWW5lQXZz?= =?utf-8?B?S0FFTXZLTWc0VGMwTXIrWUFWT3hua2RoZDkwem9uUlVYcHh4UUJ0dWU3MWJY?= =?utf-8?B?L3ZNNGIrWDY5NHV5Q1NWVWliSnVXVGpGTm4vT252cnl0eWYvcHVldWNyclo4?= =?utf-8?B?dFF0eElKSFFDVzVLbldpWTJRcGpkbEFITFlwYmNmeVRXN25TNnhoTjZwd3E3?= =?utf-8?B?ejJwNHpkRkhhdWhEdkFBZ3ZUamczRFVuZkIrbjdDUGFvT0ZMdmtGd2s5Wndr?= =?utf-8?B?RTZvcGVVZjVObkV5VEVTa1E1SXhPbzlkSzZhRXpLdEpqS3FMc0NQd2xOclpD?= =?utf-8?B?dmZMRWN4K2taTG1LcUZ6bkhzL2lXbnZtY1ZVYlN1Z05JS0FrT2NrOVpKS0Z3?= =?utf-8?B?ME9ISU5jVHliV0hYV2FzVFNKT05xeTAzNDh1bUhraThKL0pSNGp5RHB4S1dv?= =?utf-8?B?L1QrdDNxOHFBVnJ4SlBmRTQ0TGVVWTNvbkdxMW9HTHI4MXQ3d3FRWHpEbG0w?= =?utf-8?B?QVprMnJTMktSVHowOHp1Q1Z0MENwRkU5V2Vabkk0T2F3WVFhV1VKQ2lyQ3pT?= =?utf-8?B?Mnc1K21JdURXd0FhT1ZRSnhVNkZuYlRGWUVyWVFDRlpnTm5iYnpYbG9FV056?= =?utf-8?B?M2ppUTA5dlNYeHZpenNaZXROZXoreEdhZTNqaDhoVVRXa3ZZT3gzVk1xMGVN?= =?utf-8?B?b3dLYkoybnJYcXk4ZGVwb3FHUmpBRXQyV2taOVoxcDN2QXJOeUFyUVJTcTJu?= =?utf-8?B?dHZ4Q1dYeFp6QU9WUzFqSHRtQ1VKcGpMOUM1dFRJM1RMZi83eU9mVFZNOEV5?= =?utf-8?B?MWpBUXhPOE1Xa2h2ei9Da01memtaRHZmQ2psbWZUZWRwc2tHWTlUcEJ4N2Qr?= =?utf-8?B?OE1EMG5DMjBzdy90UG1VdDB6ekNRMjNRV3BPRmt6ZWRnbEFuNmx0dDZycjNO?= =?utf-8?B?VWc9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 793639b2-e1c5-4c4c-1d2b-08dba492c90d X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2023 11:10:55.2111 (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: LiGwcatgFOevxXD9QMmI7DSGcWvi97gu0MxK+jTrDaW4DnoxgcImUMVr5S3Xq7kU0PbwA3zy6ILAD2p6Xjw6r2m82sJzKAy1imFxfJb3bl0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB6134 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 There should only declare one local variable in each line, and the local variable should be arranged from short to long in the function. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 58 ++++++++++++---------- drivers/net/nfp/nfpcore/nfp_cppcore.c | 14 +++--- drivers/net/nfp/nfpcore/nfp_hwinfo.c | 27 ++++++---- drivers/net/nfp/nfpcore/nfp_mip.c | 8 +-- drivers/net/nfp/nfpcore/nfp_mutex.c | 25 ++++++---- drivers/net/nfp/nfpcore/nfp_nffw.c | 15 +++--- drivers/net/nfp/nfpcore/nfp_nsp.c | 40 ++++++++------- drivers/net/nfp/nfpcore/nfp_nsp_cmds.c | 8 +-- drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 39 ++++++++------- drivers/net/nfp/nfpcore/nfp_resource.c | 15 +++--- drivers/net/nfp/nfpcore/nfp_rtsym.c | 19 ++++--- 11 files changed, 151 insertions(+), 117 deletions(-) diff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c index ec14ec45dc..78beee07ef 100644 --- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c +++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c @@ -140,9 +140,9 @@ nfp_compute_bar(const struct nfp_bar *bar, size_t size, int width) { - uint32_t bitsize; - uint32_t newcfg; uint64_t mask; + uint32_t newcfg; + uint32_t bitsize; if (tgt >= 16) return -EINVAL; @@ -239,7 +239,8 @@ nfp_bar_write(struct nfp_pcie_user *nfp, struct nfp_bar *bar, uint32_t newcfg) { - int base, slot; + int base; + int slot; base = bar->index >> 3; slot = bar->index & 7; @@ -268,9 +269,9 @@ nfp_reconfigure_bar(struct nfp_pcie_user *nfp, size_t size, int width) { - uint64_t newbase; - uint32_t newcfg; int err; + uint32_t newcfg; + uint64_t newbase; err = nfp_compute_bar(bar, &newcfg, &newbase, tgt, act, tok, offset, size, width); @@ -303,8 +304,10 @@ nfp_reconfigure_bar(struct nfp_pcie_user *nfp, static int nfp_enable_bars(struct nfp_pcie_user *nfp) { + int x; + int end; + int start; struct nfp_bar *bar; - int x, start, end; if (rte_eal_process_type() == RTE_PROC_PRIMARY) { start = NFP_BAR_MID; @@ -333,8 +336,10 @@ nfp_enable_bars(struct nfp_pcie_user *nfp) static struct nfp_bar * nfp_alloc_bar(struct nfp_pcie_user *nfp) { + int x; + int end; + int start; struct nfp_bar *bar; - int x, start, end; if (rte_eal_process_type() == RTE_PROC_PRIMARY) { start = NFP_BAR_MID; @@ -356,8 +361,10 @@ nfp_alloc_bar(struct nfp_pcie_user *nfp) static void nfp_disable_bars(struct nfp_pcie_user *nfp) { + int x; + int end; + int start; struct nfp_bar *bar; - int x, start, end; if (rte_eal_process_type() == RTE_PROC_PRIMARY) { start = NFP_BAR_MID; @@ -403,12 +410,13 @@ nfp6000_area_init(struct nfp_cpp_area *area, uint64_t address, size_t size) { - struct nfp_pcie_user *nfp = nfp_cpp_priv(nfp_cpp_area_cpp(area)); - struct nfp6000_area_priv *priv = nfp_cpp_area_priv(area); + int pp; + int ret = 0; + uint32_t token = NFP_CPP_ID_TOKEN_of(dest); uint32_t target = NFP_CPP_ID_TARGET_of(dest); uint32_t action = NFP_CPP_ID_ACTION_of(dest); - uint32_t token = NFP_CPP_ID_TOKEN_of(dest); - int pp, ret = 0; + struct nfp6000_area_priv *priv = nfp_cpp_area_priv(area); + struct nfp_pcie_user *nfp = nfp_cpp_priv(nfp_cpp_area_cpp(area)); pp = nfp_target_pushpull(NFP_CPP_ID(target, action, token), address); if (pp < 0) @@ -493,14 +501,14 @@ nfp6000_area_read(struct nfp_cpp_area *area, uint32_t offset, size_t length) { + size_t n; + int width; + bool is_64; + uint32_t *wrptr32 = kernel_vaddr; uint64_t *wrptr64 = kernel_vaddr; - const volatile uint64_t *rdptr64; struct nfp6000_area_priv *priv; - uint32_t *wrptr32 = kernel_vaddr; const volatile uint32_t *rdptr32; - int width; - size_t n; - bool is_64; + const volatile uint64_t *rdptr64; priv = nfp_cpp_area_priv(area); rdptr64 = (uint64_t *)(priv->iomem + offset); @@ -563,14 +571,14 @@ nfp6000_area_write(struct nfp_cpp_area *area, uint32_t offset, size_t length) { - const uint64_t *rdptr64 = kernel_vaddr; - uint64_t *wrptr64; - const uint32_t *rdptr32 = kernel_vaddr; - struct nfp6000_area_priv *priv; - uint32_t *wrptr32; - int width; size_t n; + int width; bool is_64; + uint32_t *wrptr32; + uint64_t *wrptr64; + struct nfp6000_area_priv *priv; + const uint32_t *rdptr32 = kernel_vaddr; + const uint64_t *rdptr64 = kernel_vaddr; priv = nfp_cpp_area_priv(area); wrptr64 = (uint64_t *)(priv->iomem + offset); @@ -693,10 +701,10 @@ static int nfp6000_set_serial(struct rte_pci_device *dev, struct nfp_cpp *cpp) { + off_t pos; uint16_t tmp; uint8_t serial[6]; int serial_len = 6; - off_t pos; pos = rte_pci_find_ext_capability(dev, RTE_PCI_EXT_CAP_ID_DSN); if (pos <= 0) { @@ -741,8 +749,8 @@ static int nfp6000_set_barsz(struct rte_pci_device *dev, struct nfp_pcie_user *desc) { - uint64_t tmp; int i = 0; + uint64_t tmp; tmp = dev->mem_resource[0].len; diff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c index f885e7d8ff..776842bdf6 100644 --- a/drivers/net/nfp/nfpcore/nfp_cppcore.c +++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c @@ -172,9 +172,9 @@ nfp_cpp_area_alloc_with_name(struct nfp_cpp *cpp, uint64_t address, uint32_t size) { + int err; struct nfp_cpp_area *area; uint64_t tmp64 = (uint64_t)address; - int err; if (cpp == NULL) return NULL; @@ -396,8 +396,8 @@ static uint32_t nfp_xpb_to_cpp(struct nfp_cpp *cpp, uint32_t *xpb_addr) { - uint32_t xpb; int island; + uint32_t xpb; xpb = NFP_CPP_ID(14, NFP_CPP_ACTION_RW, 0); @@ -569,9 +569,9 @@ static struct nfp_cpp * nfp_cpp_alloc(struct rte_pci_device *dev, int driver_lock_needed) { - const struct nfp_cpp_operations *ops; - struct nfp_cpp *cpp; int err; + struct nfp_cpp *cpp; + const struct nfp_cpp_operations *ops; ops = nfp_cpp_transport_operations(); @@ -657,8 +657,8 @@ nfp_cpp_read(struct nfp_cpp *cpp, void *kernel_vaddr, size_t length) { - struct nfp_cpp_area *area; int err; + struct nfp_cpp_area *area; area = nfp_cpp_area_alloc_acquire(cpp, destination, address, length); if (area == NULL) { @@ -687,8 +687,8 @@ nfp_cpp_write(struct nfp_cpp *cpp, const void *kernel_vaddr, size_t length) { - struct nfp_cpp_area *area; int err; + struct nfp_cpp_area *area; area = nfp_cpp_area_alloc_acquire(cpp, destination, address, length); if (area == NULL) @@ -708,8 +708,8 @@ uint32_t __nfp_cpp_model_autodetect(struct nfp_cpp *cpp, uint32_t *model) { - uint32_t reg; int err; + uint32_t reg; err = nfp_xpb_readl(cpp, NFP_XPB_DEVICE(1, 1, 16) + NFP_PL_DEVICE_ID, ®); diff --git a/drivers/net/nfp/nfpcore/nfp_hwinfo.c b/drivers/net/nfp/nfpcore/nfp_hwinfo.c index ea4c7d6a9e..819761eda0 100644 --- a/drivers/net/nfp/nfpcore/nfp_hwinfo.c +++ b/drivers/net/nfp/nfpcore/nfp_hwinfo.c @@ -36,7 +36,9 @@ static int nfp_hwinfo_db_walk(struct nfp_hwinfo *hwinfo, uint32_t size) { - const char *key, *val, *end = hwinfo->data + size; + const char *key; + const char *val; + const char *end = hwinfo->data + size; for (key = hwinfo->data; *key != 0 && key < end; key = val + strlen(val) + 1) { @@ -58,7 +60,9 @@ static int nfp_hwinfo_db_validate(struct nfp_hwinfo *db, uint32_t len) { - uint32_t size, new_crc, *crc; + uint32_t *crc; + uint32_t size; + uint32_t new_crc; size = db->size; if (size > len) { @@ -82,12 +86,12 @@ static struct nfp_hwinfo * nfp_hwinfo_try_fetch(struct nfp_cpp *cpp, size_t *cpp_size) { - struct nfp_hwinfo *header; - void *res; - uint64_t cpp_addr; - uint32_t cpp_id; int err; + void *res; uint8_t *db; + uint32_t cpp_id; + uint64_t cpp_addr; + struct nfp_hwinfo *header; res = nfp_resource_acquire(cpp, NFP_RESOURCE_NFP_HWINFO); if (res) { @@ -135,13 +139,12 @@ static struct nfp_hwinfo * nfp_hwinfo_fetch(struct nfp_cpp *cpp, size_t *hwdb_size) { + int count = 0; struct timespec wait; struct nfp_hwinfo *db; - int count; wait.tv_sec = 0; wait.tv_nsec = 10000000; - count = 0; for (;;) { db = nfp_hwinfo_try_fetch(cpp, hwdb_size); @@ -159,9 +162,9 @@ nfp_hwinfo_fetch(struct nfp_cpp *cpp, struct nfp_hwinfo * nfp_hwinfo_read(struct nfp_cpp *cpp) { - struct nfp_hwinfo *db; - size_t hwdb_size = 0; int err; + size_t hwdb_size = 0; + struct nfp_hwinfo *db; db = nfp_hwinfo_fetch(cpp, &hwdb_size); if (db == NULL) @@ -186,7 +189,9 @@ const char * nfp_hwinfo_lookup(struct nfp_hwinfo *hwinfo, const char *lookup) { - const char *key, *val, *end; + const char *key; + const char *val; + const char *end; if (hwinfo == NULL || lookup == NULL) return NULL; diff --git a/drivers/net/nfp/nfpcore/nfp_mip.c b/drivers/net/nfp/nfpcore/nfp_mip.c index 0071d3fc37..1e601313b4 100644 --- a/drivers/net/nfp/nfpcore/nfp_mip.c +++ b/drivers/net/nfp/nfpcore/nfp_mip.c @@ -68,10 +68,10 @@ static int nfp_mip_read_resource(struct nfp_cpp *cpp, struct nfp_mip *mip) { - struct nfp_nffw_info *nffw_info; - uint32_t cpp_id; - uint64_t addr; int err; + uint64_t addr; + uint32_t cpp_id; + struct nfp_nffw_info *nffw_info; nffw_info = nfp_nffw_info_open(cpp); if (nffw_info == NULL) @@ -100,8 +100,8 @@ nfp_mip_read_resource(struct nfp_cpp *cpp, struct nfp_mip * nfp_mip_open(struct nfp_cpp *cpp) { - struct nfp_mip *mip; int err; + struct nfp_mip *mip; mip = malloc(sizeof(*mip)); if (mip == NULL) diff --git a/drivers/net/nfp/nfpcore/nfp_mutex.c b/drivers/net/nfp/nfpcore/nfp_mutex.c index 4d26e6f052..05e0ff46e5 100644 --- a/drivers/net/nfp/nfpcore/nfp_mutex.c +++ b/drivers/net/nfp/nfpcore/nfp_mutex.c @@ -79,9 +79,9 @@ nfp_cpp_mutex_init(struct nfp_cpp *cpp, uint64_t address, uint32_t key) { + int err; uint32_t model = nfp_cpp_model(cpp); uint32_t muw = NFP_CPP_ID(target, 4, 0); /* atomic_write */ - int err; err = _nfp_cpp_mutex_validate(model, &target, address); if (err < 0) @@ -122,11 +122,11 @@ nfp_cpp_mutex_alloc(struct nfp_cpp *cpp, uint64_t address, uint32_t key) { - uint32_t model = nfp_cpp_model(cpp); - struct nfp_cpp_mutex *mutex; - uint32_t mur = NFP_CPP_ID(target, 3, 0); /* atomic_read */ int err; uint32_t tmp; + struct nfp_cpp_mutex *mutex; + uint32_t model = nfp_cpp_model(cpp); + uint32_t mur = NFP_CPP_ID(target, 3, 0); /* atomic_read */ /* Look for cached mutex */ for (mutex = cpp->mutex_cache; mutex; mutex = mutex->next) { @@ -241,12 +241,13 @@ nfp_cpp_mutex_lock(struct nfp_cpp_mutex *mutex) int nfp_cpp_mutex_unlock(struct nfp_cpp_mutex *mutex) { - uint32_t muw = NFP_CPP_ID(mutex->target, 4, 0); /* atomic_write */ - uint32_t mur = NFP_CPP_ID(mutex->target, 3, 0); /* atomic_read */ + int err; + uint32_t key; + uint32_t value; struct nfp_cpp *cpp = mutex->cpp; - uint32_t key, value; uint16_t interface = nfp_cpp_interface(cpp); - int err; + uint32_t muw = NFP_CPP_ID(mutex->target, 4, 0); /* atomic_write */ + uint32_t mur = NFP_CPP_ID(mutex->target, 3, 0); /* atomic_read */ if (mutex->depth > 1) { mutex->depth--; @@ -295,12 +296,14 @@ nfp_cpp_mutex_unlock(struct nfp_cpp_mutex *mutex) int nfp_cpp_mutex_trylock(struct nfp_cpp_mutex *mutex) { + int err; + uint32_t key; + uint32_t tmp; + uint32_t value; + struct nfp_cpp *cpp = mutex->cpp; uint32_t mur = NFP_CPP_ID(mutex->target, 3, 0); /* atomic_read */ uint32_t muw = NFP_CPP_ID(mutex->target, 4, 0); /* atomic_write */ uint32_t mus = NFP_CPP_ID(mutex->target, 5, 3); /* test_set_imm */ - uint32_t key, value, tmp; - struct nfp_cpp *cpp = mutex->cpp; - int err; if (mutex->depth > 0) { if (mutex->depth == MUTEX_DEPTH_MAX) diff --git a/drivers/net/nfp/nfpcore/nfp_nffw.c b/drivers/net/nfp/nfpcore/nfp_nffw.c index 7ff468373b..32e0fc94bb 100644 --- a/drivers/net/nfp/nfpcore/nfp_nffw.c +++ b/drivers/net/nfp/nfpcore/nfp_nffw.c @@ -68,9 +68,11 @@ nffw_fwinfo_mip_offset_get(const struct nffw_fwinfo *fi) static int nfp_mip_mu_locality_lsb(struct nfp_cpp *cpp) { - uint32_t mode, addr40; - uint32_t xpbaddr, imbcppat; int err; + uint32_t mode; + uint32_t addr40; + uint32_t xpbaddr; + uint32_t imbcppat; /* Hardcoded XPB IMB Base, island 0 */ xpbaddr = 0x000a0000 + NFP_CPP_TARGET_MU * 4; @@ -117,10 +119,10 @@ nffw_res_fwinfos(struct nfp_nffw_info_data *fwinf, struct nffw_fwinfo **arr) struct nfp_nffw_info * nfp_nffw_info_open(struct nfp_cpp *cpp) { - struct nfp_nffw_info_data *fwinf; - struct nfp_nffw_info *state; - uint32_t info_ver; int err; + uint32_t info_ver; + struct nfp_nffw_info *state; + struct nfp_nffw_info_data *fwinf; state = malloc(sizeof(*state)); if (state == NULL) @@ -182,8 +184,9 @@ nfp_nffw_info_close(struct nfp_nffw_info *state) static struct nffw_fwinfo * nfp_nffw_info_fwid_first(struct nfp_nffw_info *state) { + uint32_t i; + uint32_t cnt; struct nffw_fwinfo *fwinfo; - uint32_t cnt, i; cnt = nffw_res_fwinfos(&state->fwinf, &fwinfo); if (cnt == 0) diff --git a/drivers/net/nfp/nfpcore/nfp_nsp.c b/drivers/net/nfp/nfpcore/nfp_nsp.c index 87eed3d951..a00bd5870d 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp.c @@ -72,10 +72,11 @@ nfp_nsp_print_extended_error(uint32_t ret_val) static int nfp_nsp_check(struct nfp_nsp *state) { - struct nfp_cpp *cpp = state->cpp; - uint64_t nsp_status, reg; - uint32_t nsp_cpp; int err; + uint64_t reg; + uint32_t nsp_cpp; + uint64_t nsp_status; + struct nfp_cpp *cpp = state->cpp; nsp_cpp = nfp_resource_cpp_id(state->res); nsp_status = nfp_resource_address(state->res) + NSP_STATUS; @@ -113,9 +114,9 @@ nfp_nsp_check(struct nfp_nsp *state) struct nfp_nsp * nfp_nsp_open(struct nfp_cpp *cpp) { - struct nfp_resource *res; - struct nfp_nsp *state; int err; + struct nfp_nsp *state; + struct nfp_resource *res; res = nfp_resource_acquire(cpp, NFP_RESOURCE_NSP); if (res == NULL) @@ -170,13 +171,12 @@ nfp_nsp_wait_reg(struct nfp_cpp *cpp, uint64_t mask, uint64_t val) { - struct timespec wait; - uint32_t count; int err; + uint32_t count = 0; + struct timespec wait; wait.tv_sec = 0; wait.tv_nsec = 25000000; - count = 0; for (;;) { err = nfp_cpp_readq(cpp, nsp_cpp, addr, reg); @@ -217,10 +217,15 @@ nfp_nsp_command(struct nfp_nsp *state, uint32_t buff_cpp, uint64_t buff_addr) { - uint64_t reg, ret_val, nsp_base, nsp_buffer, nsp_status, nsp_command; - struct nfp_cpp *cpp = state->cpp; - uint32_t nsp_cpp; int err; + uint64_t reg; + uint32_t nsp_cpp; + uint64_t ret_val; + uint64_t nsp_base; + uint64_t nsp_buffer; + uint64_t nsp_status; + uint64_t nsp_command; + struct nfp_cpp *cpp = state->cpp; nsp_cpp = nfp_resource_cpp_id(state->res); nsp_base = nfp_resource_address(state->res); @@ -296,11 +301,13 @@ nfp_nsp_command_buf(struct nfp_nsp *nsp, void *out_buf, unsigned int out_size) { - struct nfp_cpp *cpp = nsp->cpp; + int err; + int ret; + uint64_t reg; size_t max_size; - uint64_t reg, cpp_buf; - int ret, err; uint32_t cpp_id; + uint64_t cpp_buf; + struct nfp_cpp *cpp = nsp->cpp; if (nsp->ver.minor < 13) { PMD_DRV_LOG(ERR, "NSP: Code 0x%04x with buffer not supported ABI %hu.%hu)", @@ -360,13 +367,12 @@ nfp_nsp_command_buf(struct nfp_nsp *nsp, int nfp_nsp_wait(struct nfp_nsp *state) { - struct timespec wait; - uint32_t count; int err; + int count = 0; + struct timespec wait; wait.tv_sec = 0; wait.tv_nsec = 25000000; - count = 0; for (;;) { err = nfp_nsp_command(state, SPCODE_NOOP, 0, 0, 0); diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c index 31677b66e6..3081e22dad 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c @@ -26,9 +26,9 @@ struct nsp_identify { struct nfp_nsp_identify * __nfp_nsp_identify(struct nfp_nsp *nsp) { - struct nfp_nsp_identify *nspi = NULL; - struct nsp_identify *ni; int ret; + struct nsp_identify *ni; + struct nfp_nsp_identify *nspi = NULL; if (nfp_nsp_get_abi_ver_minor(nsp) < 15) return NULL; @@ -77,9 +77,9 @@ nfp_hwmon_read_sensor(struct nfp_cpp *cpp, enum nfp_nsp_sensor_id id, uint32_t *val) { - struct nfp_sensors s; - struct nfp_nsp *nsp; int ret; + struct nfp_nsp *nsp; + struct nfp_sensors s; nsp = nfp_nsp_open(cpp); if (nsp == NULL) diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c index 899fcd7441..9e8a247e5c 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c @@ -149,9 +149,10 @@ nfp_eth_port_translate(struct nfp_nsp *nsp, uint32_t index, struct nfp_eth_table_port *dst) { - uint32_t rate; uint32_t fec; - uint64_t port, state; + uint64_t port; + uint32_t rate; + uint64_t state; port = rte_le_to_cpu_64(src->port); state = rte_le_to_cpu_64(src->state); @@ -199,7 +200,8 @@ nfp_eth_port_translate(struct nfp_nsp *nsp, static void nfp_eth_calc_port_geometry(struct nfp_eth_table *table) { - uint32_t i, j; + uint32_t i; + uint32_t j; for (i = 0; i < table->count; i++) { table->max_index = RTE_MAX(table->max_index, @@ -241,12 +243,13 @@ nfp_eth_calc_port_type(struct nfp_eth_table_port *entry) static struct nfp_eth_table * __nfp_eth_read_ports(struct nfp_nsp *nsp) { - union eth_table_entry *entries; - struct nfp_eth_table *table; - uint32_t table_sz; + int ret; uint32_t i; uint32_t j; - int ret, cnt = 0; + int cnt = 0; + uint32_t table_sz; + struct nfp_eth_table *table; + union eth_table_entry *entries; const struct rte_ether_addr *mac; entries = malloc(NSP_ETH_TABLE_SIZE); @@ -320,8 +323,8 @@ __nfp_eth_read_ports(struct nfp_nsp *nsp) struct nfp_eth_table * nfp_eth_read_ports(struct nfp_cpp *cpp) { - struct nfp_eth_table *ret; struct nfp_nsp *nsp; + struct nfp_eth_table *ret; nsp = nfp_nsp_open(cpp); if (nsp == NULL) @@ -337,9 +340,9 @@ struct nfp_nsp * nfp_eth_config_start(struct nfp_cpp *cpp, uint32_t idx) { - union eth_table_entry *entries; - struct nfp_nsp *nsp; int ret; + struct nfp_nsp *nsp; + union eth_table_entry *entries; entries = malloc(NSP_ETH_TABLE_SIZE); if (entries == NULL) @@ -400,8 +403,8 @@ nfp_eth_config_cleanup_end(struct nfp_nsp *nsp) int nfp_eth_config_commit_end(struct nfp_nsp *nsp) { - union eth_table_entry *entries = nfp_nsp_config_entries(nsp); int ret = 1; + union eth_table_entry *entries = nfp_nsp_config_entries(nsp); if (nfp_nsp_config_modified(nsp)) { ret = nfp_nsp_write_eth_table(nsp, entries, NSP_ETH_TABLE_SIZE); @@ -432,9 +435,9 @@ nfp_eth_set_mod_enable(struct nfp_cpp *cpp, uint32_t idx, int enable) { - union eth_table_entry *entries; - struct nfp_nsp *nsp; uint64_t reg; + struct nfp_nsp *nsp; + union eth_table_entry *entries; nsp = nfp_eth_config_start(cpp, idx); if (nsp == NULL) @@ -474,9 +477,9 @@ nfp_eth_set_configured(struct nfp_cpp *cpp, uint32_t idx, int configed) { - union eth_table_entry *entries; - struct nfp_nsp *nsp; uint64_t reg; + struct nfp_nsp *nsp; + union eth_table_entry *entries; nsp = nfp_eth_config_start(cpp, idx); if (nsp == NULL) @@ -515,9 +518,9 @@ nfp_eth_set_bit_config(struct nfp_nsp *nsp, uint32_t val, const uint64_t ctrl_bit) { - union eth_table_entry *entries = nfp_nsp_config_entries(nsp); - uint32_t idx = nfp_nsp_config_idx(nsp); uint64_t reg; + uint32_t idx = nfp_nsp_config_idx(nsp); + union eth_table_entry *entries = nfp_nsp_config_entries(nsp); /* * Note: set features were added in ABI 0.14 but the error @@ -603,8 +606,8 @@ nfp_eth_set_fec(struct nfp_cpp *cpp, uint32_t idx, enum nfp_eth_fec mode) { - struct nfp_nsp *nsp; int err; + struct nfp_nsp *nsp; nsp = nfp_eth_config_start(cpp, idx); if (nsp == NULL) diff --git a/drivers/net/nfp/nfpcore/nfp_resource.c b/drivers/net/nfp/nfpcore/nfp_resource.c index 9dd4832779..fa92f2762e 100644 --- a/drivers/net/nfp/nfpcore/nfp_resource.c +++ b/drivers/net/nfp/nfpcore/nfp_resource.c @@ -67,10 +67,12 @@ static int nfp_cpp_resource_find(struct nfp_cpp *cpp, struct nfp_resource *res) { - char name_pad[NFP_RESOURCE_ENTRY_NAME_SZ + 2]; + int ret; + uint32_t i; + uint32_t key; + uint32_t cpp_id; struct nfp_resource_entry entry; - uint32_t cpp_id, key; - int ret, i; + char name_pad[NFP_RESOURCE_ENTRY_NAME_SZ + 2]; cpp_id = NFP_CPP_ID(NFP_RESOURCE_TBL_TARGET, 3, 0); /* Atomic read */ @@ -152,11 +154,11 @@ struct nfp_resource * nfp_resource_acquire(struct nfp_cpp *cpp, const char *name) { - struct nfp_cpp_mutex *dev_mutex; - struct nfp_resource *res; int err; + uint16_t count = 0; struct timespec wait; - uint16_t count; + struct nfp_resource *res; + struct nfp_cpp_mutex *dev_mutex; res = malloc(sizeof(*res)); if (res == NULL) @@ -175,7 +177,6 @@ nfp_resource_acquire(struct nfp_cpp *cpp, wait.tv_sec = 0; wait.tv_nsec = 1000000; - count = 0; for (;;) { err = nfp_resource_try_acquire(cpp, res, dev_mutex); diff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.c b/drivers/net/nfp/nfpcore/nfp_rtsym.c index 243d3c9ce5..a34278beca 100644 --- a/drivers/net/nfp/nfpcore/nfp_rtsym.c +++ b/drivers/net/nfp/nfpcore/nfp_rtsym.c @@ -85,8 +85,8 @@ nfp_rtsym_sw_entry_init(struct nfp_rtsym_table *cache, struct nfp_rtsym_table * nfp_rtsym_table_read(struct nfp_cpp *cpp) { - struct nfp_rtsym_table *rtbl; struct nfp_mip *mip; + struct nfp_rtsym_table *rtbl; mip = nfp_mip_open(cpp); rtbl = __nfp_rtsym_table_read(cpp, mip); @@ -99,13 +99,18 @@ struct nfp_rtsym_table * __nfp_rtsym_table_read(struct nfp_cpp *cpp, const struct nfp_mip *mip) { - uint32_t strtab_addr, symtab_addr, strtab_size, symtab_size; - struct nfp_rtsym_entry *rtsymtab; + int n; + int err; + uint32_t size; + uint32_t strtab_addr; + uint32_t symtab_addr; + uint32_t strtab_size; + uint32_t symtab_size; struct nfp_rtsym_table *cache; + struct nfp_rtsym_entry *rtsymtab; const uint32_t dram = NFP_CPP_ID(NFP_CPP_TARGET_MU, NFP_CPP_ACTION_RW, 0) | NFP_ISL_EMEM0; - int err, n, size; if (mip == NULL) return NULL; @@ -341,10 +346,10 @@ nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl, const char *name, int *error) { - const struct nfp_rtsym *sym; - uint32_t val32; - uint64_t val; int err; + uint64_t val; + uint32_t val32; + const struct nfp_rtsym *sym; sym = nfp_rtsym_lookup(rtbl, name); if (sym == NULL) { -- 2.39.1