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 49C58A09E4 for ; Thu, 21 Jan 2021 08:15:06 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 28BBF140E9D; Thu, 21 Jan 2021 08:15:06 +0100 (CET) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mails.dpdk.org (Postfix) with ESMTP id 0E503140E9D; Thu, 21 Jan 2021 08:15:05 +0100 (CET) Received: by mail-pf1-f181.google.com with SMTP id y205so976073pfc.5; Wed, 20 Jan 2021 23:15:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ehxC5nEfggE19jPGhdafpnHnXgaS8+dCPE63dPwSVz0=; b=edHaCcQI6RwXJBBTdEfALr2EHXytYIU7ZSaufR0hexb1pApeMa+8xJov/77ktgeN5G ToD1UFtLb1wVE3sH7vtdr5+Hhltxaybf00k5h7IuS483jgzAYgt6gvj9iV2Xg/UnawRt WInkvLNYcKBM7g3XHLeMvnh5R7RfvIFiLDNBStWQL0QWGz8n2X34Xt1Qs+5TfWQ83pk9 B1Y8dQmMyvOGkTMiotIoEggpkTwKOrABuvBEy1q2PYlorzwQ1CSPkQjorqH8dngIAIV5 r+zD+T+ed1Af+xzP2LOVjqYksTg4VyN/xFHlWXhrHNoY7ISmpCVV3JoFMUdVBHj8ChdH w1pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ehxC5nEfggE19jPGhdafpnHnXgaS8+dCPE63dPwSVz0=; b=kMJfhlfNpkfF9rp8q4o1OLJ/OnHK2h1pXfWxZ8qEOqw3ZuOZ2Te9acuXqI09bbjjtu IrjzEC9horppdI1RjWiaoTD+D0/62vLSfCDyR0Tz0UPw1rt4iic2Bghwy+/mo475rne0 5akbgCl6ClL66QrOKj2wmIBSGnb1ukSTBjT4Fxa7RFSqAyrKoCRQCeukRoogRxfZE75C Bmg1i9AjG+D7udwrGgsHgszjnTO5Zv7pQ/dXAbGeQp6oMj5wAyoN7rCw78DrJblTQRXH qySXZUWlTDMDvhN+ECp0HiOcVRXN5hx/Q0/RGPn2+lngBFmxphvo/2OcKll4w2alkEpf FD8g== X-Gm-Message-State: AOAM531tIfv99hR9RY67lHgoCky7GiPuhCfVTQS6ohNV5AQ5VaqkSjwi 00S1uQTMiwqMaLu3d81+gXhhXIrhT6E7nw== X-Google-Smtp-Source: ABdhPJyQXfK9qKV1erK0kcK5G+gSapmZD/KmvOWntlA2zJ3kHRYPzA3NCk7DweeU+lJ5A9tJLjsW1Q== X-Received: by 2002:a62:5205:0:b029:19e:a0f:2c81 with SMTP id g5-20020a6252050000b029019e0a0f2c81mr12716416pfb.50.1611213303708; Wed, 20 Jan 2021 23:15:03 -0800 (PST) Received: from localhost.localdomain ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id f64sm4481881pfb.146.2021.01.20.23.15.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Jan 2021 23:15:02 -0800 (PST) From: Ajit Khaparde X-Google-Original-From: Ajit Khaparde To: dev@dpdk.org Cc: Somnath Kotur , stable@dpdk.org Date: Wed, 20 Jan 2021 23:14:58 -0800 Message-Id: <20210121071458.32732-1-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) In-Reply-To: <20210105045806.1001-1-somnath.kotur@broadcom.com> References: <20210105045806.1001-1-somnath.kotur@broadcom.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH v3] net/bnxt: code refactoring changes X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" From: Somnath Kotur Move all the individual driver fields allocation routines to one routine - bnxt_drv_init(). This houses all such routines where memory needs to be allocated once during the driver's lifetime and does not need to be torn down during error recovery. Rename some function names in accordance with their functionality. bnxt_init_board() is doing nothing more than mapping the PCI bars, so rename it as such. Given that there is a bnxt_shutdown_nic that is called in dev_stop_op, rename it's counterpart - bnxt_init_chip() that is called in dev_start_op, to bnxt_start_nic. Also helps avoid confusion with some of the other bnxt_init_xxx routines. Rename bnxt_init_fw() to bnxt_get_config() as that is what that routine is doing mostly functionality wise. Cc: stable@dpdk.org Signed-off-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- v1->v2: rebased against latest dpdk-next-net. v2->v3: rebased against latest dpdk-next-net. --- drivers/net/bnxt/bnxt_ethdev.c | 150 +++++++++++++++++++-------------- 1 file changed, 88 insertions(+), 62 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 74b0f3d1d..f439aeee4 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -679,7 +679,7 @@ static int bnxt_update_phy_setting(struct bnxt *bp) return rc; } -static int bnxt_init_chip(struct bnxt *bp) +static int bnxt_start_nic(struct bnxt *bp) { struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(bp->eth_dev); struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; @@ -1417,7 +1417,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev) bnxt_enable_int(bp); - rc = bnxt_init_chip(bp); + rc = bnxt_start_nic(bp); if (rc) goto error; @@ -1464,6 +1464,27 @@ bnxt_uninit_locks(struct bnxt *bp) } } +static void bnxt_drv_uninit(struct bnxt *bp) +{ + bnxt_free_switch_domain(bp); + bnxt_free_leds_info(bp); + bnxt_free_cos_queues(bp); + bnxt_free_link_info(bp); + bnxt_free_pf_info(bp); + bnxt_free_parent_info(bp); + bnxt_uninit_locks(bp); + + rte_memzone_free((const struct rte_memzone *)bp->tx_mem_zone); + bp->tx_mem_zone = NULL; + rte_memzone_free((const struct rte_memzone *)bp->rx_mem_zone); + bp->rx_mem_zone = NULL; + + bnxt_hwrm_free_vf_info(bp); + + rte_free(bp->grp_info); + bp->grp_info = NULL; +} + static int bnxt_dev_close_op(struct rte_eth_dev *eth_dev) { struct bnxt *bp = eth_dev->data->dev_private; @@ -1488,26 +1509,9 @@ static int bnxt_dev_close_op(struct rte_eth_dev *eth_dev) if (eth_dev->data->dev_started) ret = bnxt_dev_stop(eth_dev); - bnxt_free_switch_domain(bp); - bnxt_uninit_resources(bp, false); - bnxt_free_leds_info(bp); - bnxt_free_cos_queues(bp); - bnxt_free_link_info(bp); - bnxt_free_pf_info(bp); - bnxt_free_parent_info(bp); - bnxt_uninit_locks(bp); - - rte_memzone_free((const struct rte_memzone *)bp->tx_mem_zone); - bp->tx_mem_zone = NULL; - rte_memzone_free((const struct rte_memzone *)bp->rx_mem_zone); - bp->rx_mem_zone = NULL; - - bnxt_hwrm_free_vf_info(bp); - - rte_free(bp->grp_info); - bp->grp_info = NULL; + bnxt_drv_uninit(bp); return ret; } @@ -4086,7 +4090,7 @@ bool bnxt_stratus_device(struct bnxt *bp) } } -static int bnxt_init_board(struct rte_eth_dev *eth_dev) +static int bnxt_map_pci_bars(struct rte_eth_dev *eth_dev) { struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev); struct bnxt *bp = eth_dev->data->dev_private; @@ -4723,7 +4727,11 @@ static int bnxt_map_hcomm_fw_status_reg(struct bnxt *bp) return 0; } -static int bnxt_init_fw(struct bnxt *bp) +/* This function gets the FW version along with the + * capabilities(MAX and current) of the function, vnic, + * error recovery, phy and other chip related info + */ +static int bnxt_get_config(struct bnxt *bp) { uint16_t mtu; int rc = 0; @@ -4819,7 +4827,7 @@ static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev) { int rc = 0; - rc = bnxt_init_fw(bp); + rc = bnxt_get_config(bp); if (rc) return rc; @@ -5266,38 +5274,14 @@ static int bnxt_alloc_switch_domain(struct bnxt *bp) return rc; } -static int -bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused) +/* Allocate and initialize various fields in bnxt struct that + * need to be allocated/destroyed only once in the lifetime of the driver + */ +static int bnxt_drv_init(struct rte_eth_dev *eth_dev) { struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev); - static int version_printed; - struct bnxt *bp; - int rc; - - if (version_printed++ == 0) - PMD_DRV_LOG(INFO, "%s\n", bnxt_version); - - eth_dev->dev_ops = &bnxt_dev_ops; - eth_dev->rx_queue_count = bnxt_rx_queue_count_op; - eth_dev->rx_descriptor_status = bnxt_rx_descriptor_status_op; - eth_dev->tx_descriptor_status = bnxt_tx_descriptor_status_op; - eth_dev->rx_pkt_burst = &bnxt_recv_pkts; - eth_dev->tx_pkt_burst = &bnxt_xmit_pkts; - - /* - * For secondary processes, we don't initialise any further - * as primary has already done this work. - */ - if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return 0; - - rte_eth_copy_pci_info(eth_dev, pci_dev); - eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; - - bp = eth_dev->data->dev_private; - - /* Parse dev arguments passed on when starting the DPDK application. */ - bnxt_parse_dev_args(bp, pci_dev->device.devargs); + struct bnxt *bp = eth_dev->data->dev_private; + int rc = 0; bp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE; @@ -5329,7 +5313,7 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused) } } - rc = bnxt_init_board(eth_dev); + rc = bnxt_map_pci_bars(eth_dev); if (rc) { PMD_DRV_LOG(ERR, "Failed to initialize board rc: %x\n", rc); @@ -5338,31 +5322,75 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused) rc = bnxt_alloc_pf_info(bp); if (rc) - goto error_free; + return rc; rc = bnxt_alloc_link_info(bp); if (rc) - goto error_free; + return rc; rc = bnxt_alloc_parent_info(bp); if (rc) - goto error_free; + return rc; rc = bnxt_alloc_hwrm_resources(bp); if (rc) { PMD_DRV_LOG(ERR, "Failed to allocate hwrm resource rc: %x\n", rc); - goto error_free; + return rc; } rc = bnxt_alloc_leds_info(bp); if (rc) - goto error_free; + return rc; rc = bnxt_alloc_cos_queues(bp); if (rc) - goto error_free; + return rc; rc = bnxt_init_locks(bp); + if (rc) + return rc; + + rc = bnxt_alloc_switch_domain(bp); + if (rc) + return rc; + + return rc; +} + +static int +bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused) +{ + struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev); + static int version_printed; + struct bnxt *bp; + int rc; + + if (version_printed++ == 0) + PMD_DRV_LOG(INFO, "%s\n", bnxt_version); + + eth_dev->dev_ops = &bnxt_dev_ops; + eth_dev->rx_queue_count = bnxt_rx_queue_count_op; + eth_dev->rx_descriptor_status = bnxt_rx_descriptor_status_op; + eth_dev->tx_descriptor_status = bnxt_tx_descriptor_status_op; + eth_dev->rx_pkt_burst = &bnxt_recv_pkts; + eth_dev->tx_pkt_burst = &bnxt_xmit_pkts; + + /* + * For secondary processes, we don't initialise any further + * as primary has already done this work. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return 0; + + rte_eth_copy_pci_info(eth_dev, pci_dev); + eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; + + bp = eth_dev->data->dev_private; + + /* Parse dev arguments passed on when starting the DPDK application. */ + bnxt_parse_dev_args(bp, pci_dev->device.devargs); + + rc = bnxt_drv_init(eth_dev); if (rc) goto error_free; @@ -5374,8 +5402,6 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused) if (rc) goto error_free; - bnxt_alloc_switch_domain(bp); - PMD_DRV_LOG(INFO, DRV_MODULE_NAME "found at mem %" PRIX64 ", node addr %pM\n", pci_dev->mem_resource[0].phys_addr, -- 2.21.1 (Apple Git-122.3)