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 ED855A0548; Thu, 2 Jun 2022 03:54:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D24D940A84; Thu, 2 Jun 2022 03:54:16 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2106.outbound.protection.outlook.com [40.107.223.106]) by mails.dpdk.org (Postfix) with ESMTP id 40AC14021E for ; Thu, 2 Jun 2022 03:54:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kU5g/rg/+zcRAVuMc4zSDbhiCNyxN3NLLJrUN62AuiHGJWN5sVvtdUENjlnE9KzUafEN7LchhY5oSSvksOQ/f9nKOXsu2X9IaBDY50oI5t8STOPJf3rUfR/YFVZowMMcwVEyYc5MsK3Vzf/ovL9Kc616iesdtIfxUYTwY8bi3dpjWCEvap/TQBP0YNl8Fw0+RSeAxHrZSz2tUpYaEPnNIs2KYnFuc3CflR3Un47bpQLo/PPm2MxqrlWMr60snQ8VMqT7fk64UsraztBQuCIv80pa6azeIzo5oNF/DwiGn6LSrHsnAw/c4POjDtGtqdLdEokmKYaeOtmU2UJYQz3Gcw== 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=BzUJNhuLFqbEMan/UW8NamthEcKcW9PKwUetdOIRc34=; b=dybvWCuocy2WKkPrxOVTgnCLx4LjbjzHYluWguOH5b0Ni/qq9mhEBAU/QlCjIV0vF9vg3yKWEQ0owA4kg/hkMY/X+tIfJSlw/CsIt0Hhyv3jIxhBC0I1yb57sIKu9i+5/YajafAG9yJLkHOE7Jo66HleHtXYM5aaINT5yuA/zdlx8NVNOP3GUk6Bd4J/C07kdcWqvoADhxpouurj1ho/eWGF4g/wrlAz363vT88qdL834rOxbsKPz0OlIO68wk8WoGH8pSnmv5NFPKljGKyWIZ/nqhKI0hPvw7J6WdHh2f9gzFDDWlcHdBUlgA4501qdq5ZCEGAn3Um8/dYbnTMllw== 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=BzUJNhuLFqbEMan/UW8NamthEcKcW9PKwUetdOIRc34=; b=QO0jr0dpU9qws9LWA0gpBSlIoZ+2W4zcG59ZolUSFCVVtriw3Nww33SQZK0bnVJbM6UMYL/ZE7lH6ADfUkDD5ks/YhDmdOMXpjhUTI7z1lGwiczlefPdZXyQoVr5ioNMsMOpH42Yf7w9PJiaeZIpgCc6XK+H7Epy7PDRrL4TUPk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from DM6PR13MB3004.namprd13.prod.outlook.com (2603:10b6:5:191::21) by CY4PR13MB1349.namprd13.prod.outlook.com (2603:10b6:903:a0::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.13; Thu, 2 Jun 2022 01:54:14 +0000 Received: from DM6PR13MB3004.namprd13.prod.outlook.com ([fe80::d902:ed7d:82bb:c753]) by DM6PR13MB3004.namprd13.prod.outlook.com ([fe80::d902:ed7d:82bb:c753%4]) with mapi id 15.20.5314.013; Thu, 2 Jun 2022 01:54:14 +0000 From: Jin Liu To: dev@dpdk.org Cc: niklas.soderlund@corigine.com, Chaoyong He , Jin Liu Subject: [PATCH 01/14] net/nfp: change the coding style Date: Thu, 2 Jun 2022 03:52:51 +0200 Message-Id: <20220602015304.710197-2-jin.liu@corigine.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220602015304.710197-1-jin.liu@corigine.com> References: <20220602015304.710197-1-jin.liu@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: LO4P123CA0457.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1aa::12) To DM6PR13MB3004.namprd13.prod.outlook.com (2603:10b6:5:191::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5103c992-bf30-4f0c-ce2c-08da443acbc0 X-MS-TrafficTypeDiagnostic: CY4PR13MB1349:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /3nbd0q8b0esXuNUMOSULb9pP5L9Ij8zNFrv6T51C+n1pRq/t8pPLM1sR55pk6agrE4ywBP30aJKsy3GtqSUqWYym/31ryJXSnQcONYlAfbsyJvemSdqbDoa14kmmflP92Jjo8537xdG/6h3L9GlT7BKqrHpNXcD5qbMfYxFbI0eDR51pZZoXZhPqiXN3jpxG+/ypOwlUXWUJXJbWobKJxzZR0+yDDZT8X/Kfz9Rl1CWMtXP7VSg9puYChC78qT7wsPe8zQH1LfB5pBv7WI3GsaslEerCyksI+PFNG2aHhaDGwwJJMHaLv89181Aep/yLWm9b5RbTM3wdTmlKoGL3FdKP4bMuhIR+VD6QbeF9Xls/1+umSbBqAm7jNrwklL79rxlocN84f5bU/nyXC64tvaenk94LYGXT3B3bFL22sFrdW6amI+2oMtBUy4W+ZJgmsw+F4f2JlUJCI3f0MzA8Av61WCdnpPaZYk29Y5vyFDQAooaBjWxLB64MHCM5uapmeA/0elEJngpXkCzye0spTnxc+fRzqm6Eqoel1iv+C+PhOx37nhsLknwOITWq5x+XIqyfMXLU8UJs0jjFobEB6+TRYKA7eVLyxLzJxX710mGWBOp7JEdE911dx6hXKxRKNxu89EC1MOGg4MeOEGp2YJwic/NCENtwiO90lma5Meb8F7G/Y//t7g2cKVkh35jIbMngYdxN0IBaQKszEr/SQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR13MB3004.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(39840400004)(136003)(376002)(346002)(396003)(6512007)(83380400001)(8936002)(38350700002)(8676002)(66476007)(316002)(4326008)(38100700002)(26005)(66946007)(66556008)(2906002)(6506007)(30864003)(6486002)(5660300002)(508600001)(6666004)(52116002)(107886003)(1076003)(36756003)(186003)(86362001)(41300700001)(66574015)(44832011)(2616005)(54906003)(6916009); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cmk2R0JETWVLVitYTjYrZEdheURGd2ljcXZnY1ZaZEhuQVg5SmtwamZ1bU9o?= =?utf-8?B?bStPamV3MENOVjE3V011WG4yckc5dk1FTmFDUk9Lc0NTblNOdFNGZVNaUXl0?= =?utf-8?B?d1dGZS9rTzhlZmhBUlorVVhvakZvbmFPdElCYlA3L0dmSUpyeXhwNk9XVElw?= =?utf-8?B?R1BIOUJFN3dFWTZ3SHR2REFpdzAwZVVLdkhZQjJGckt6NVNoeGZDaHp1ZHJk?= =?utf-8?B?a1BQZC81MUZ4M096RWp6SmpSTWZFT2E5NkZlenBlZXIyVmR0QUZ0UkZHOGRQ?= =?utf-8?B?VVhlZW1wMVk2SmxJekVkKzdDc1poVzJ5NktlV2FUcU94QmFrTGlIL0NOeGh1?= =?utf-8?B?Y1FMa1ZNNFNiZWlraEtOc3N5Vm5Pb3RLSlJzRStLYjVwSFBJZVNzdElDRDFJ?= =?utf-8?B?WE85V2pWajlabmFFdXVaVXBuVExRQktGVWZtdkttOXM5endPTTRUd0dKVUI1?= =?utf-8?B?emFIWm1sK3B2bkltS1ZGOUFCNjRpc1QvRFFUb0EyN0dVV0VURE8wallsb0d1?= =?utf-8?B?ZVRqdnVRQ1NzLzYyRzZXUmhsMDB1b0d0Yy9sUGQxUkdDbFUzbGl4Ti9vWVBs?= =?utf-8?B?bVBPektmME1wT1JrSUo0bmwxL3R1Y3pzMkdVbnVwNFJKQXZhVUJnQ1c0cmhP?= =?utf-8?B?Z1hGdC9JK1FYbHBpRHczK1U4UHlyREFRcUdSMzFDZzJuZit2WDJaeUFYbUxZ?= =?utf-8?B?djEwMmVqTUFoUGNYTzVxRTJuK1NCM2RkRlgxZzhvRDNEazk4K2U0WVh1MVdM?= =?utf-8?B?aDd0YUdwQnMvZnNGMFNSRFFMbFA1SEw3b1B6SnBHdUo3ckVNMVl4SWdKNGpF?= =?utf-8?B?ejc2SU9aWnRvWFhHL0N2aEhtb2UyeGFhbDFGck1mUmJUcEErcjdlaDNra2x6?= =?utf-8?B?djN1Lzg0NXJ0bkVmNEdvbGpLeGIwUnpVbkdCS05DVnhrWm9XK3J1cU1HN3lL?= =?utf-8?B?b3hsVlE3LytrVHNKWnpab2d5ZWdNNm5kYVhOYUwxVVoxQktXdDJ5aHZkaGJv?= =?utf-8?B?OVl0UGNYSEhWZWJSUndCK3lPOGRyc0lZU1BXOTRuNDVCVVY1TThkTTZlRTJF?= =?utf-8?B?UHZoWU82ODJ5U25VZVJmdmVxVWNsU25tWE1yZWQxS3RocWxzeEVSMzBYZnFG?= =?utf-8?B?bmxlSjQzbTBHYWZFTm1mN1ZLNG1VbTlHYXc4RVNhdGV5UGNNY1JPY0JSV2xI?= =?utf-8?B?TjFZTSs2YjcvZjN5SGJmZm5TZ2gveDhYNGwrL0FvTWtGMTRCbUZsdjQxeTJ2?= =?utf-8?B?WlpTNDNuUHU4SkoySFl0YnVyM0tTWFNXUUJmSG9LelRHbFdVNWhrRys0ajVa?= =?utf-8?B?NzhhTUhoWld2OEpHcmk5dHFQeDZNcnpJMlI1UkV6ZHNzMWRkNnRJVTlRYmtn?= =?utf-8?B?emlHOXBHT25CNU9pTjdaTXRTSkRqMnZJRGtoRlRGR2lTaytXYWxpS3hSL2I2?= =?utf-8?B?VDR5OHhTZFVEWGVxdEpLUHBFTllxYVcxa2dnVHFMUnpVemJkNFI1NFhXaE5n?= =?utf-8?B?YWphUWxTa3JGRU9zZWdjRnlVby9nUDNRS2hYUERVZTJvNytxZzM4N1lCRG9U?= =?utf-8?B?d1ArTEs0ek0xOUlNZGk3bUI0M3JoT0hjWFVJYTZIWXAxcEZLM0VJVVFyQzhs?= =?utf-8?B?WXNtY2ZSUHNlbDR5YU4vMHd6WjFZNFM4c3pBNDk5bjREZXlnV2dIUHB2a1Y1?= =?utf-8?B?ckE0NWMvVTlyY1NqeGR4YzhneWwybTRuMTVEejNhTVZaWWprQXNTN2NCR05G?= =?utf-8?B?N3RUQ1pldUFsK3FxdndaNlhoM2hVSlJuaFRvdEF1UjR1L21FdU9ib2x1c1Ev?= =?utf-8?B?cDk4SElqbVBwYUE0UkZpblZmV1l0WWxyYzI0Z3h5QXZkRmtBWUFiWVFSL3V2?= =?utf-8?B?OEQvTmk1azBlbVlDUEtJZTlGSEdHOTNOdlBrTjRXK0JGb1NvZHRBdVZPSG9V?= =?utf-8?B?SHhTeUdETXRiZ3piNjE3VUc0Qjl1Z25nUlZkdkhwL0YzQlRhQVg2V1JadnNZ?= =?utf-8?B?a2F1Nm1UUThESlhoazdCdFpYWFk4WXBWUlZnMk41TTMxc0VvcjVoY0cwbGVE?= =?utf-8?B?S2NNZFVNZjQ3VVh3UFBxcU9xa1NBb2dycTVmdHlMSFJieE5EbWRkR1pHOUU5?= =?utf-8?B?K3cvMUplR1RCSnNHQ1RGMXhsYy9QVFhUcHFEVXdvb3pOdTVNQTlGUW1pQ2JG?= =?utf-8?B?cGt2K0RxQkJPS1hBVVppNFUweEtqSFR5Q21OWG43bHRZNlhZWlVuMk9vMXFm?= =?utf-8?B?L09vS3hRLzVhZ0dIVVF2cnQwR0JSek9UQXJ2bHZUY2xCcDhjMzJQTWJVRGlP?= =?utf-8?B?THNyTXlPUW5LTWJaWWw0ZHhlVEtHWkxRcVh1RkxOUWF0RGFKZTg3Zz09?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5103c992-bf30-4f0c-ce2c-08da443acbc0 X-MS-Exchange-CrossTenant-AuthSource: DM6PR13MB3004.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 01:54:14.7923 (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: KMu4anwmyoOZriKwfkabSLywaNF8iobOnuaBrUiV8FCpZPxKPcoE0XgztgBHBhbtNY6IU+pjsdEuu94a0H3KMw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR13MB1349 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 From: Chaoyong He Change the coding style of some logics, to make it more compatible with the DPDK coding style. Signed-off-by: Chaoyong He Signed-off-by: Jin Liu Signed-off-by: Niklas Söderlund --- drivers/net/nfp/nfp_ethdev.c | 150 ++++++++++++++++---------------- drivers/net/nfp/nfp_ethdev_vf.c | 5 +- 2 files changed, 75 insertions(+), 80 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 9166f65da3..ea92ca3f68 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -340,8 +340,7 @@ nfp_net_close(struct rte_eth_dev *dev) /* unregister callback func from eal lib */ rte_intr_callback_unregister(pci_dev->intr_handle, - nfp_net_dev_interrupt_handler, - (void *)dev); + nfp_net_dev_interrupt_handler, (void *)dev); /* * The ixgbe PMD disables the pcie master on the @@ -388,8 +387,8 @@ nfp_net_init(struct rte_eth_dev *eth_dev) struct nfp_pf_dev *pf_dev; struct nfp_net_hw *hw; struct rte_ether_addr *tmp_ether_addr; - - uint64_t tx_bar_off = 0, rx_bar_off = 0; + uint64_t rx_bar_off = 0; + uint64_t tx_bar_off = 0; uint32_t start_q; int stride = 4; int port = 0; @@ -404,9 +403,8 @@ nfp_net_init(struct rte_eth_dev *eth_dev) /* NFP can not handle DMA addresses requiring more than 40 bits */ if (rte_mem_check_dma_mask(40)) { - RTE_LOG(ERR, PMD, "device %s can not be used:", - pci_dev->device.name); - RTE_LOG(ERR, PMD, "\trestricted dma mask to 40 bits!\n"); + RTE_LOG(ERR, PMD, "device %s can not be used: restricted dma " + "mask to 40 bits!\n", pci_dev->device.name); return -ENODEV; }; @@ -416,14 +414,14 @@ nfp_net_init(struct rte_eth_dev *eth_dev) return -ENODEV; } - /* Use PF array of physical ports to get pointer to + /* + * Use PF array of physical ports to get pointer to * this specific port */ hw = pf_dev->ports[port]; PMD_INIT_LOG(DEBUG, "Working with physical port number: %d, " - "NFP internal port number: %d", - port, hw->nfp_idx); + "NFP internal port number: %d", port, hw->nfp_idx); eth_dev->dev_ops = &nfp_net_eth_dev_ops; eth_dev->rx_queue_count = nfp_net_rx_queue_count; @@ -456,13 +454,10 @@ nfp_net_init(struct rte_eth_dev *eth_dev) if (port == 0) { hw->ctrl_bar = pf_dev->ctrl_bar; } else { - if (!pf_dev->ctrl_bar) + if (pf_dev->ctrl_bar == NULL) return -ENODEV; - /* Use port offset in pf ctrl_bar for this - * ports control bar - */ - hw->ctrl_bar = pf_dev->ctrl_bar + - (port * NFP_PF_CSR_SLICE_SIZE); + /* Use port offset in pf ctrl_bar for this ports control bar */ + hw->ctrl_bar = pf_dev->ctrl_bar + (port * NFP_PF_CSR_SLICE_SIZE); } PMD_INIT_LOG(DEBUG, "ctrl bar: %p", hw->ctrl_bar); @@ -557,8 +552,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev) tmp_ether_addr = (struct rte_ether_addr *)&hw->mac_addr; if (!rte_is_valid_assigned_ether_addr(tmp_ether_addr)) { - PMD_INIT_LOG(INFO, "Using random mac address for port %d", - port); + PMD_INIT_LOG(INFO, "Using random mac address for port %d", port); /* Using random mac addresses for VFs */ rte_eth_random_addr(&hw->mac_addr[0]); nfp_net_write_mac(hw, (uint8_t *)&hw->mac_addr); @@ -583,8 +577,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev) if (rte_eal_process_type() == RTE_PROC_PRIMARY) { /* Registering LSC interrupt handler */ rte_intr_callback_register(pci_dev->intr_handle, - nfp_net_dev_interrupt_handler, - (void *)eth_dev); + nfp_net_dev_interrupt_handler, (void *)eth_dev); /* Telling the firmware about the LSC interrupt entry */ nn_cfg_writeb(hw, NFP_NET_CFG_LSC, NFP_NET_IRQ_LSC_IDX); /* Recording current stats counters values */ @@ -656,8 +649,10 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card) } static int -nfp_fw_setup(struct rte_pci_device *dev, struct nfp_cpp *cpp, - struct nfp_eth_table *nfp_eth_table, struct nfp_hwinfo *hwinfo) +nfp_fw_setup(struct rte_pci_device *dev, + struct nfp_cpp *cpp, + struct nfp_eth_table *nfp_eth_table, + struct nfp_hwinfo *hwinfo) { struct nfp_nsp *nsp; const char *nfp_fw_model; @@ -675,12 +670,12 @@ nfp_fw_setup(struct rte_pci_device *dev, struct nfp_cpp *cpp, if (nfp_eth_table->count == 0 || nfp_eth_table->count > 8) { PMD_DRV_LOG(ERR, "NFP ethernet table reports wrong ports: %u", - nfp_eth_table->count); + nfp_eth_table->count); return -EIO; } PMD_DRV_LOG(INFO, "NFP ethernet port table reports %u ports", - nfp_eth_table->count); + nfp_eth_table->count); PMD_DRV_LOG(INFO, "Port speed: %u", nfp_eth_table->ports[0].speed); @@ -689,7 +684,7 @@ nfp_fw_setup(struct rte_pci_device *dev, struct nfp_cpp *cpp, nfp_eth_table->ports[0].speed / 1000); nsp = nfp_nsp_open(cpp); - if (!nsp) { + if (nsp == NULL) { PMD_DRV_LOG(ERR, "NFP error when obtaining NSP handle"); return -EIO; } @@ -701,32 +696,32 @@ nfp_fw_setup(struct rte_pci_device *dev, struct nfp_cpp *cpp, return err; } -static int nfp_init_phyports(struct nfp_pf_dev *pf_dev) +static int +nfp_init_phyports(struct nfp_pf_dev *pf_dev) { + int i; + int ret = 0; struct nfp_net_hw *hw; struct rte_eth_dev *eth_dev; - struct nfp_eth_table *nfp_eth_table = NULL; - int ret = 0; - int i; + struct nfp_eth_table *nfp_eth_table; + char port_name[RTE_ETH_NAME_MAX_LEN]; nfp_eth_table = nfp_eth_read_ports(pf_dev->cpp); - if (!nfp_eth_table) { + if (nfp_eth_table == NULL) { PMD_INIT_LOG(ERR, "Error reading NFP ethernet table"); - ret = -EIO; - goto error; + return -EIO; } /* Loop through all physical ports on PF */ for (i = 0; i < pf_dev->total_phyports; i++) { const unsigned int numa_node = rte_socket_id(); - char port_name[RTE_ETH_NAME_MAX_LEN]; snprintf(port_name, sizeof(port_name), "%s_port%d", pf_dev->pci_dev->device.name, i); /* Allocate a eth_dev for this phyport */ eth_dev = rte_eth_dev_allocate(port_name); - if (!eth_dev) { + if (eth_dev == NULL) { ret = -ENODEV; goto port_cleanup; } @@ -734,8 +729,8 @@ static int nfp_init_phyports(struct nfp_pf_dev *pf_dev) /* Allocate memory for this phyport */ eth_dev->data->dev_private = rte_zmalloc_socket(port_name, sizeof(struct nfp_net_hw), - RTE_CACHE_LINE_SIZE, numa_node); - if (!eth_dev->data->dev_private) { + RTE_CACHE_LINE_SIZE, numa_node); + if (eth_dev->data->dev_private == NULL) { ret = -ENOMEM; rte_eth_dev_release_port(eth_dev); goto port_cleanup; @@ -759,7 +754,6 @@ static int nfp_init_phyports(struct nfp_pf_dev *pf_dev) * nfp_net_init */ ret = nfp_net_init(eth_dev); - if (ret) { ret = -ENODEV; goto port_cleanup; @@ -782,24 +776,25 @@ static int nfp_init_phyports(struct nfp_pf_dev *pf_dev) } eth_table_cleanup: free(nfp_eth_table); -error: + return ret; } -static int nfp_pf_init(struct rte_pci_device *pci_dev) +static int +nfp_pf_init(struct rte_pci_device *pci_dev) { - struct nfp_pf_dev *pf_dev = NULL; + int err; + int ret = 0; + int total_ports; struct nfp_cpp *cpp; + struct nfp_pf_dev *pf_dev; struct nfp_hwinfo *hwinfo; - struct nfp_rtsym_table *sym_tbl; - struct nfp_eth_table *nfp_eth_table = NULL; char name[RTE_ETH_NAME_MAX_LEN]; - int total_ports; - int ret = -ENODEV; - int err; + struct nfp_rtsym_table *sym_tbl; + struct nfp_eth_table *nfp_eth_table; - if (!pci_dev) - return ret; + if (pci_dev == NULL) + return -ENODEV; /* * When device bound to UIO, the device could be used, by mistake, @@ -813,21 +808,21 @@ static int nfp_pf_init(struct rte_pci_device *pci_dev) else cpp = nfp_cpp_from_device_name(pci_dev, 1); - if (!cpp) { + if (cpp == NULL) { PMD_INIT_LOG(ERR, "A CPP handle can not be obtained"); ret = -EIO; goto error; } hwinfo = nfp_hwinfo_read(cpp); - if (!hwinfo) { + if (hwinfo == NULL) { PMD_INIT_LOG(ERR, "Error reading hwinfo table"); ret = -EIO; goto error; } nfp_eth_table = nfp_eth_read_ports(cpp); - if (!nfp_eth_table) { + if (nfp_eth_table == NULL) { PMD_INIT_LOG(ERR, "Error reading NFP ethernet table"); ret = -EIO; goto hwinfo_cleanup; @@ -841,7 +836,7 @@ static int nfp_pf_init(struct rte_pci_device *pci_dev) /* Now the symbol table should be there */ sym_tbl = nfp_rtsym_table_read(cpp); - if (!sym_tbl) { + if (sym_tbl == NULL) { PMD_INIT_LOG(ERR, "Something is wrong with the firmware" " symbol table"); ret = -EIO; @@ -865,7 +860,7 @@ static int nfp_pf_init(struct rte_pci_device *pci_dev) /* Allocate memory for the PF "device" */ snprintf(name, sizeof(name), "nfp_pf%d", 0); pf_dev = rte_zmalloc(name, sizeof(*pf_dev), 0); - if (!pf_dev) { + if (pf_dev == NULL) { ret = -ENOMEM; goto sym_tbl_cleanup; } @@ -883,9 +878,8 @@ static int nfp_pf_init(struct rte_pci_device *pci_dev) /* Map the symbol table */ pf_dev->ctrl_bar = nfp_rtsym_map(pf_dev->sym_tbl, "_pf0_net_bar0", - pf_dev->total_phyports * 32768, - &pf_dev->ctrl_area); - if (!pf_dev->ctrl_bar) { + pf_dev->total_phyports * 32768, &pf_dev->ctrl_area); + if (pf_dev->ctrl_bar == NULL) { PMD_INIT_LOG(ERR, "nfp_rtsym_map fails for _pf0_net_ctrl_bar"); ret = -EIO; goto pf_cleanup; @@ -895,10 +889,9 @@ static int nfp_pf_init(struct rte_pci_device *pci_dev) /* configure access to tx/rx vNIC BARs */ pf_dev->hw_queues = nfp_cpp_map_area(pf_dev->cpp, 0, 0, - NFP_PCIE_QUEUE(0), - NFP_QCP_QUEUE_AREA_SZ, - &pf_dev->hwqueues_area); - if (!pf_dev->hw_queues) { + NFP_PCIE_QUEUE(0), NFP_QCP_QUEUE_AREA_SZ, + &pf_dev->hwqueues_area); + if (pf_dev->hw_queues == NULL) { PMD_INIT_LOG(ERR, "nfp_rtsym_map fails for net.qc"); ret = -EIO; goto ctrl_area_cleanup; @@ -906,7 +899,8 @@ static int nfp_pf_init(struct rte_pci_device *pci_dev) PMD_INIT_LOG(DEBUG, "tx/rx bar address: 0x%p", pf_dev->hw_queues); - /* Initialize and prep physical ports now + /* + * Initialize and prep physical ports now * This will loop through all physical ports */ ret = nfp_init_phyports(pf_dev); @@ -941,15 +935,16 @@ static int nfp_pf_init(struct rte_pci_device *pci_dev) * is no need to initialise the PF again. Only minimal work is required * here */ -static int nfp_pf_secondary_init(struct rte_pci_device *pci_dev) +static int +nfp_pf_secondary_init(struct rte_pci_device *pci_dev) { - struct nfp_cpp *cpp; - struct nfp_rtsym_table *sym_tbl; - int total_ports; int i; int err; + int total_ports; + struct nfp_cpp *cpp; + struct nfp_rtsym_table *sym_tbl; - if (!pci_dev) + if (pci_dev == NULL) return -ENODEV; /* @@ -964,7 +959,7 @@ static int nfp_pf_secondary_init(struct rte_pci_device *pci_dev) else cpp = nfp_cpp_from_device_name(pci_dev, 1); - if (!cpp) { + if (cpp == NULL) { PMD_INIT_LOG(ERR, "A CPP handle can not be obtained"); return -EIO; } @@ -974,7 +969,7 @@ static int nfp_pf_secondary_init(struct rte_pci_device *pci_dev) * here so we have to read the number of ports from firmware */ sym_tbl = nfp_rtsym_table_read(cpp); - if (!sym_tbl) { + if (sym_tbl == NULL) { PMD_INIT_LOG(ERR, "Something is wrong with the firmware" " symbol table"); return -EIO; @@ -989,13 +984,11 @@ static int nfp_pf_secondary_init(struct rte_pci_device *pci_dev) snprintf(port_name, sizeof(port_name), "%s_port%d", pci_dev->device.name, i); - PMD_DRV_LOG(DEBUG, "Secondary attaching to port %s", - port_name); + PMD_DRV_LOG(DEBUG, "Secondary attaching to port %s", port_name); eth_dev = rte_eth_dev_attach_secondary(port_name); - if (!eth_dev) { - RTE_LOG(ERR, EAL, - "secondary process attach failed, " - "ethdev doesn't exist"); + if (eth_dev == NULL) { + RTE_LOG(ERR, EAL, "secondary process attach failed, " + "ethdev doesn't exist"); return -ENODEV; } eth_dev->process_private = cpp; @@ -1012,8 +1005,9 @@ static int nfp_pf_secondary_init(struct rte_pci_device *pci_dev) return 0; } -static int nfp_pf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, - struct rte_pci_device *dev) +static int +nfp_pf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, + struct rte_pci_device *dev) { if (rte_eal_process_type() == RTE_PROC_PRIMARY) return nfp_pf_init(dev); @@ -1035,7 +1029,8 @@ static const struct rte_pci_id pci_id_nfp_pf_net_map[] = { }, }; -static int nfp_pci_uninit(struct rte_eth_dev *eth_dev) +static int +nfp_pci_uninit(struct rte_eth_dev *eth_dev) { struct rte_pci_device *pci_dev; uint16_t port_id; @@ -1052,7 +1047,8 @@ static int nfp_pci_uninit(struct rte_eth_dev *eth_dev) return -ENOTSUP; } -static int eth_nfp_pci_remove(struct rte_pci_device *pci_dev) +static int +eth_nfp_pci_remove(struct rte_pci_device *pci_dev) { return rte_eth_dev_pci_generic_remove(pci_dev, nfp_pci_uninit); } diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index 0034d68ea6..4aaccc91df 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -296,9 +296,8 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) /* NFP can not handle DMA addresses requiring more than 40 bits */ if (rte_mem_check_dma_mask(40)) { - RTE_LOG(ERR, PMD, "device %s can not be used:", - pci_dev->device.name); - RTE_LOG(ERR, PMD, "\trestricted dma mask to 40 bits!\n"); + RTE_LOG(ERR, PMD, "device %s can not be used: restricted dma " + "mask to 40 bits!\n", pci_dev->device.name); return -ENODEV; }; -- 2.27.0