From patchwork Tue Jun 19 21:30:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 41285 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 23BFD1B43D; Tue, 19 Jun 2018 23:31:42 +0200 (CEST) Received: from rnd-relay.smtp.broadcom.com (rnd-relay.smtp.broadcom.com [192.19.229.170]) by dpdk.org (Postfix) with ESMTP id 031521B05B for ; Tue, 19 Jun 2018 23:31:08 +0200 (CEST) Received: from nis-sj1-27.broadcom.com (nis-sj1-27.lvn.broadcom.net [10.75.144.136]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 4D15330C067; Tue, 19 Jun 2018 14:31:05 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 4D15330C067 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1529443865; bh=aU1sitMD2uDHNusuJ2YwPsTdrGTZQm7JsRvBQDUdldc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ChUppl79JKjs2l08/CjNopPVvur2/3lRUX82YorGxuexqyCDmmLnKOYqOxTvIdNb7 agCcneGFQyv3OXhjrBJgYh9+1VQS+gF6y9l0Chk85uL2ugfRZNKPRIXgE9gSKIiv+x 4+HTiDYofnZYFZ5L7oaycxtKVGL1DHJqjTxZzyX8= Received: from C02VPB22HTD6.dhcp.broadcom.net (c02vpb22htd6.dhcp.broadcom.net [10.136.50.120]) by nis-sj1-27.broadcom.com (Postfix) with ESMTP id 2EE11AC06AD; Tue, 19 Jun 2018 14:31:05 -0700 (PDT) From: Ajit Khaparde To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Scott Branden Date: Tue, 19 Jun 2018 14:30:39 -0700 Message-Id: <20180619213058.12273-13-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.15.1 (Apple Git-101) In-Reply-To: <20180619213058.12273-1-ajit.khaparde@broadcom.com> References: <20180619213058.12273-1-ajit.khaparde@broadcom.com> Subject: [dpdk-dev] [PATCH 12/31] net/bnxt: code cleanup style of rte pmd bnxt file X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Scott Branden Cleanup alignment, brackets, debug string style of rte_pmd_bnxt Signed-off-by: Scott Branden Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/rte_pmd_bnxt.c | 97 +++++++++++++++++++++++++---------------- drivers/net/bnxt/rte_pmd_bnxt.h | 69 +++++++++++++++++++---------- 2 files changed, 105 insertions(+), 61 deletions(-) diff --git a/drivers/net/bnxt/rte_pmd_bnxt.c b/drivers/net/bnxt/rte_pmd_bnxt.c index c298de83c..e49dba465 100644 --- a/drivers/net/bnxt/rte_pmd_bnxt.c +++ b/drivers/net/bnxt/rte_pmd_bnxt.c @@ -77,6 +77,7 @@ static void rte_pmd_bnxt_set_all_queues_drop_en_cb(struct bnxt_vnic_info *vnic, void *onptr) { uint8_t *on = onptr; + vnic->bd_stall = !(*on); } @@ -119,9 +120,12 @@ int rte_pmd_bnxt_set_all_queues_drop_en(uint16_t port, uint8_t on) /* Stall all active VFs */ for (i = 0; i < bp->pf.active_vfs; i++) { - rc = bnxt_hwrm_func_vf_vnic_query_and_config(bp, i, - rte_pmd_bnxt_set_all_queues_drop_en_cb, &on, - bnxt_hwrm_vnic_cfg); + rc = bnxt_hwrm_func_vf_vnic_query_and_config + (bp, + i, + rte_pmd_bnxt_set_all_queues_drop_en_cb, + &on, + bnxt_hwrm_vnic_cfg); if (rc) { PMD_DRV_LOG(ERR, "Failed to update VF VNIC %d.\n", i); break; @@ -131,8 +135,9 @@ int rte_pmd_bnxt_set_all_queues_drop_en(uint16_t port, uint8_t on) return rc; } -int rte_pmd_bnxt_set_vf_mac_addr(uint16_t port, uint16_t vf, - struct ether_addr *mac_addr) +int rte_pmd_bnxt_set_vf_mac_addr(uint16_t port, + uint16_t vf, + struct ether_addr *mac_addr) { struct rte_eth_dev *dev; struct rte_eth_dev_info dev_info; @@ -163,8 +168,10 @@ int rte_pmd_bnxt_set_vf_mac_addr(uint16_t port, uint16_t vf, return rc; } -int rte_pmd_bnxt_set_vf_rate_limit(uint16_t port, uint16_t vf, - uint16_t tx_rate, uint64_t q_msk) +int rte_pmd_bnxt_set_vf_rate_limit(uint16_t port, + uint16_t vf, + uint16_t tx_rate, + uint64_t q_msk) { struct rte_eth_dev *eth_dev; struct rte_eth_dev_info dev_info; @@ -205,7 +212,7 @@ int rte_pmd_bnxt_set_vf_rate_limit(uint16_t port, uint16_t vf, return 0; rc = bnxt_hwrm_func_bw_cfg(bp, vf, tot_rate, - HWRM_FUNC_CFG_INPUT_ENABLES_MAX_BW); + HWRM_FUNC_CFG_INPUT_ENABLES_MAX_BW); if (!rc) bp->pf.vf_info[vf].max_tx_rate = tot_rate; @@ -247,8 +254,9 @@ int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint16_t port, uint16_t vf, uint8_t on) return 0; func_flags = bp->pf.vf_info[vf].func_cfg_flags; - func_flags &= ~(HWRM_FUNC_CFG_INPUT_FLAGS_SRC_MAC_ADDR_CHECK_ENABLE | - HWRM_FUNC_CFG_INPUT_FLAGS_SRC_MAC_ADDR_CHECK_DISABLE); + func_flags &= + ~(HWRM_FUNC_CFG_INPUT_FLAGS_SRC_MAC_ADDR_CHECK_ENABLE | + HWRM_FUNC_CFG_INPUT_FLAGS_SRC_MAC_ADDR_CHECK_DISABLE); if (on) func_flags |= @@ -298,10 +306,11 @@ int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint16_t port, uint16_t vf, uint8_t on) if (!rc) { bp->pf.vf_info[vf].vlan_spoof_en = on; if (on) { - if (bnxt_hwrm_cfa_vlan_antispoof_cfg(bp, - bp->pf.first_vf_id + vf, - bp->pf.vf_info[vf].vlan_count, - bp->pf.vf_info[vf].vlan_as_table)) + if (bnxt_hwrm_cfa_vlan_antispoof_cfg + (bp, + bp->pf.first_vf_id + vf, + bp->pf.vf_info[vf].vlan_count, + bp->pf.vf_info[vf].vlan_as_table)) rc = -1; } } else { @@ -315,6 +324,7 @@ static void rte_pmd_bnxt_set_vf_vlan_stripq_cb(struct bnxt_vnic_info *vnic, void *onptr) { uint8_t *on = onptr; + vnic->vlan_strip = *on; } @@ -345,17 +355,22 @@ rte_pmd_bnxt_set_vf_vlan_stripq(uint16_t port, uint16_t vf, uint8_t on) return -ENOTSUP; } - rc = bnxt_hwrm_func_vf_vnic_query_and_config(bp, vf, - rte_pmd_bnxt_set_vf_vlan_stripq_cb, &on, - bnxt_hwrm_vnic_cfg); + rc = bnxt_hwrm_func_vf_vnic_query_and_config + (bp, + vf, + rte_pmd_bnxt_set_vf_vlan_stripq_cb, + &on, + bnxt_hwrm_vnic_cfg); if (rc) PMD_DRV_LOG(ERR, "Failed to update VF VNIC %d.\n", vf); return rc; } -int rte_pmd_bnxt_set_vf_rxmode(uint16_t port, uint16_t vf, - uint16_t rx_mask, uint8_t on) +int rte_pmd_bnxt_set_vf_rxmode(uint16_t port, + uint16_t vf, + uint16_t rx_mask, + uint8_t on) { struct rte_eth_dev *dev; struct rte_eth_dev_info dev_info; @@ -397,10 +412,12 @@ int rte_pmd_bnxt_set_vf_rxmode(uint16_t port, uint16_t vf, else bp->pf.vf_info[vf].l2_rx_mask &= ~flag; - rc = bnxt_hwrm_func_vf_vnic_query_and_config(bp, vf, - vf_vnic_set_rxmask_cb, - &bp->pf.vf_info[vf].l2_rx_mask, - bnxt_set_rx_mask_no_vlan); + rc = bnxt_hwrm_func_vf_vnic_query_and_config + (bp, + vf, + vf_vnic_set_rxmask_cb, + &bp->pf.vf_info[vf].l2_rx_mask, + bnxt_set_rx_mask_no_vlan); if (rc) PMD_DRV_LOG(ERR, "bnxt_hwrm_func_vf_vnic_set_rxmask failed\n"); @@ -433,9 +450,11 @@ static int bnxt_set_vf_table(struct bnxt *bp, uint16_t vf) vnic.fw_vnic_id = dflt_vnic; if (bnxt_hwrm_vnic_qcfg(bp, &vnic, bp->pf.first_vf_id + vf) == 0) { - if (bnxt_hwrm_cfa_l2_set_rx_mask(bp, &vnic, - bp->pf.vf_info[vf].vlan_count, - bp->pf.vf_info[vf].vlan_table)) + if (bnxt_hwrm_cfa_l2_set_rx_mask + (bp, + &vnic, + bp->pf.vf_info[vf].vlan_count, + bp->pf.vf_info[vf].vlan_table)) rc = -1; } else { rc = -1; @@ -445,8 +464,10 @@ static int bnxt_set_vf_table(struct bnxt *bp, uint16_t vf) return rc; } -int rte_pmd_bnxt_set_vf_vlan_filter(uint16_t port, uint16_t vlan, - uint64_t vf_mask, uint8_t vlan_on) +int rte_pmd_bnxt_set_vf_vlan_filter(uint16_t port, + uint16_t vlan, + uint64_t vf_mask, + uint8_t vlan_on) { struct bnxt_vlan_table_entry *ve; struct bnxt_vlan_antispoof_table_entry *vase; @@ -482,8 +503,7 @@ int rte_pmd_bnxt_set_vf_vlan_filter(uint16_t port, uint16_t vlan, if (vlan_on) { /* First, search for a duplicate... */ for (j = 0; j < cnt; j++) { - if (rte_be_to_cpu_16( - bp->pf.vf_info[i].vlan_table[j].vid) == vlan) + if (rte_be_to_cpu_16(bp->pf.vf_info[i].vlan_table[j].vid) == vlan) break; } if (j == cnt) { @@ -491,7 +511,7 @@ int rte_pmd_bnxt_set_vf_vlan_filter(uint16_t port, uint16_t vlan, if (cnt == getpagesize() / sizeof(struct bnxt_vlan_antispoof_table_entry)) { PMD_DRV_LOG(ERR, - "VLAN anti-spoof table is full\n"); + "VLAN anti-spoof table is full\n"); PMD_DRV_LOG(ERR, "VF %d cannot add VLAN %u\n", i, vlan); @@ -517,13 +537,14 @@ int rte_pmd_bnxt_set_vf_vlan_filter(uint16_t port, uint16_t vlan, } } else { for (j = 0; j < cnt; j++) { - if (rte_be_to_cpu_16( - bp->pf.vf_info[i].vlan_table[j].vid) != vlan) + if (rte_be_to_cpu_16(bp->pf.vf_info[i].vlan_table[j].vid) != vlan) continue; + memmove(&bp->pf.vf_info[i].vlan_table[j], &bp->pf.vf_info[i].vlan_table[j + 1], getpagesize() - ((j + 1) * sizeof(struct bnxt_vlan_table_entry))); + memmove(&bp->pf.vf_info[i].vlan_as_table[j], &bp->pf.vf_info[i].vlan_as_table[j + 1], getpagesize() - ((j + 1) * sizeof(struct @@ -647,8 +668,9 @@ int rte_pmd_bnxt_get_vf_tx_drop_count(uint16_t port, uint16_t vf_id, count); } -int rte_pmd_bnxt_mac_addr_add(uint16_t port, struct ether_addr *addr, - uint32_t vf_id) +int rte_pmd_bnxt_mac_addr_add(uint16_t port, + struct ether_addr *addr, + uint32_t vf_id) { struct rte_eth_dev *dev; struct rte_eth_dev_info dev_info; @@ -724,8 +746,9 @@ int rte_pmd_bnxt_mac_addr_add(uint16_t port, struct ether_addr *addr, } int -rte_pmd_bnxt_set_vf_vlan_insert(uint16_t port, uint16_t vf, - uint16_t vlan_id) +rte_pmd_bnxt_set_vf_vlan_insert(uint16_t port, + uint16_t vf, + uint16_t vlan_id) { struct rte_eth_dev *dev; struct rte_eth_dev_info dev_info; diff --git a/drivers/net/bnxt/rte_pmd_bnxt.h b/drivers/net/bnxt/rte_pmd_bnxt.h index 68fbe34d6..f66c44c19 100644 --- a/drivers/net/bnxt/rte_pmd_bnxt.h +++ b/drivers/net/bnxt/rte_pmd_bnxt.h @@ -19,11 +19,11 @@ enum rte_pmd_bnxt_mb_event_rsp { }; /* mailbox message types */ -#define BNXT_VF_RESET 0x01 /* VF requests reset */ +#define BNXT_VF_RESET 0x01 /* VF requests reset */ #define BNXT_VF_SET_MAC_ADDR 0x02 /* VF requests PF to set MAC addr */ -#define BNXT_VF_SET_VLAN 0x03 /* VF requests PF to set VLAN */ -#define BNXT_VF_SET_MTU 0x04 /* VF requests PF to set MTU */ -#define BNXT_VF_SET_MRU 0x05 /* VF requests PF to set MRU */ +#define BNXT_VF_SET_VLAN 0x03 /* VF requests PF to set VLAN */ +#define BNXT_VF_SET_MTU 0x04 /* VF requests PF to set MTU */ +#define BNXT_VF_SET_MRU 0x05 /* VF requests PF to set MRU */ /* * Data sent to the caller when the callback is executed. @@ -50,7 +50,9 @@ struct rte_pmd_bnxt_mb_event_param { * - (-ENODEV) if *port* invalid. * - (-EINVAL) if bad parameter. */ -int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint16_t port, uint16_t vf, uint8_t on); +int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint16_t port, + uint16_t vf, + uint8_t on); /** * Set the VF MAC address. @@ -66,8 +68,9 @@ int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint16_t port, uint16_t vf, uint8_t on); * - (-ENODEV) if *port* invalid. * - (-EINVAL) if *vf* or *mac_addr* is invalid. */ -int rte_pmd_bnxt_set_vf_mac_addr(uint16_t port, uint16_t vf, - struct ether_addr *mac_addr); +int rte_pmd_bnxt_set_vf_mac_addr(uint16_t port, + uint16_t vf, + struct ether_addr *mac_addr); /** * Enable/Disable vf vlan strip for all queues in a pool @@ -87,7 +90,9 @@ int rte_pmd_bnxt_set_vf_mac_addr(uint16_t port, uint16_t vf, * - (-EINVAL) if bad parameter. */ int -rte_pmd_bnxt_set_vf_vlan_stripq(uint16_t port, uint16_t vf, uint8_t on); +rte_pmd_bnxt_set_vf_vlan_stripq(uint16_t port, + uint16_t vf, + uint8_t on); /** * Enable/Disable vf vlan insert @@ -106,8 +111,9 @@ rte_pmd_bnxt_set_vf_vlan_stripq(uint16_t port, uint16_t vf, uint8_t on); * - (-EINVAL) if bad parameter. */ int -rte_pmd_bnxt_set_vf_vlan_insert(uint16_t port, uint16_t vf, - uint16_t vlan_id); +rte_pmd_bnxt_set_vf_vlan_insert(uint16_t port, + uint16_t vf, + uint16_t vlan_id); /** * Enable/Disable hardware VF VLAN filtering by an Ethernet device of @@ -128,8 +134,10 @@ rte_pmd_bnxt_set_vf_vlan_insert(uint16_t port, uint16_t vf, * - (-ENODEV) if *port_id* invalid. * - (-EINVAL) if bad parameter. */ -int rte_pmd_bnxt_set_vf_vlan_filter(uint16_t port, uint16_t vlan, - uint64_t vf_mask, uint8_t vlan_on); +int rte_pmd_bnxt_set_vf_vlan_filter(uint16_t port, + uint16_t vlan, + uint64_t vf_mask, + uint8_t vlan_on); /** * Enable/Disable tx loopback @@ -145,7 +153,8 @@ int rte_pmd_bnxt_set_vf_vlan_filter(uint16_t port, uint16_t vlan, * - (-ENODEV) if *port* invalid. * - (-EINVAL) if bad parameter. */ -int rte_pmd_bnxt_set_tx_loopback(uint16_t port, uint8_t on); +int rte_pmd_bnxt_set_tx_loopback(uint16_t port, + uint8_t on); /** * set all queues drop enable bit @@ -161,7 +170,8 @@ int rte_pmd_bnxt_set_tx_loopback(uint16_t port, uint8_t on); * - (-ENODEV) if *port* invalid. * - (-EINVAL) if bad parameter. */ -int rte_pmd_bnxt_set_all_queues_drop_en(uint16_t port, uint8_t on); +int rte_pmd_bnxt_set_all_queues_drop_en(uint16_t port, + uint8_t on); /** * Set the VF rate limit. @@ -179,8 +189,10 @@ int rte_pmd_bnxt_set_all_queues_drop_en(uint16_t port, uint8_t on); * - (-ENODEV) if *port* invalid. * - (-EINVAL) if *vf* or *mac_addr* is invalid. */ -int rte_pmd_bnxt_set_vf_rate_limit(uint16_t port, uint16_t vf, - uint16_t tx_rate, uint64_t q_msk); +int rte_pmd_bnxt_set_vf_rate_limit(uint16_t port, + uint16_t vf, + uint16_t tx_rate, + uint64_t q_msk); /** * Get VF's statistics @@ -233,7 +245,9 @@ int rte_pmd_bnxt_reset_vf_stats(uint16_t port, * - (-ENODEV) if *port* invalid. * - (-EINVAL) if bad parameter. */ -int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint16_t port, uint16_t vf, uint8_t on); +int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint16_t port, + uint16_t vf, + uint8_t on); /** * Set RX L2 Filtering mode of a VF of an Ethernet device. @@ -252,8 +266,10 @@ int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint16_t port, uint16_t vf, uint8_t on); * - (-ENODEV) if *port_id* invalid. * - (-EINVAL) if bad parameter. */ -int rte_pmd_bnxt_set_vf_rxmode(uint16_t port, uint16_t vf, - uint16_t rx_mask, uint8_t on); +int rte_pmd_bnxt_set_vf_rxmode(uint16_t port, + uint16_t vf, + uint16_t rx_mask, + uint8_t on); /** * Returns the number of default RX queues on a VF @@ -269,7 +285,8 @@ int rte_pmd_bnxt_set_vf_rxmode(uint16_t port, uint16_t vf, * - (-ENOMEM) on an allocation failure * - (-1) firmware interface error */ -int rte_pmd_bnxt_get_vf_rx_status(uint16_t port, uint16_t vf_id); +int rte_pmd_bnxt_get_vf_rx_status(uint16_t port, + uint16_t vf_id); /** * Queries the TX drop counter for the function @@ -285,7 +302,8 @@ int rte_pmd_bnxt_get_vf_rx_status(uint16_t port, uint16_t vf_id); * - (-EINVAL) invalid vf_id specified. * - (-ENOTSUP) Ethernet device is not a PF */ -int rte_pmd_bnxt_get_vf_tx_drop_count(uint16_t port, uint16_t vf_id, +int rte_pmd_bnxt_get_vf_tx_drop_count(uint16_t port, + uint16_t vf_id, uint64_t *count); /** @@ -303,8 +321,9 @@ int rte_pmd_bnxt_get_vf_tx_drop_count(uint16_t port, uint16_t vf_id, * - (-ENOTSUP) Ethernet device is not a PF * - (-ENOMEM) on an allocation failure */ -int rte_pmd_bnxt_mac_addr_add(uint16_t port, struct ether_addr *mac_addr, - uint32_t vf_id); +int rte_pmd_bnxt_mac_addr_add(uint16_t port, + struct ether_addr *mac_addr, + uint32_t vf_id); /** * Enable/Disable VF statistics retention @@ -322,5 +341,7 @@ int rte_pmd_bnxt_mac_addr_add(uint16_t port, struct ether_addr *mac_addr, * - (-ENODEV) if *port* invalid. * - (-EINVAL) if bad parameter. */ -int rte_pmd_bnxt_set_vf_persist_stats(uint16_t port, uint16_t vf, uint8_t on); +int rte_pmd_bnxt_set_vf_persist_stats(uint16_t port, + uint16_t vf, + uint8_t on); #endif /* _PMD_BNXT_H_ */