bnxt patchset
cover bnxt patchset
This patchset amongst other changes adds support few more dev_ops, updates HWRM to version 1.7.5, switches to polling stats from the hardware, support for LRO etc..
bnxt: add various hwrm input/output structures
bnxt: code reorg to properly allocate resources in PF/VF modes
bnxt: add tunneling support
bnxt: support lack of huge pages
bnxt: add functions for tx_loopback, set_vf_mac and queues_drop_en
bnxt: add support for set VF QOS and MAC anti spoof
bnxt: add support for VLAN stripq, VLAN anti spoof and VLAN filtering for VFs
bnxt: add support to get and clear VF specific stats
bnxt: add code to determine the Rx status of VF
bnxt: add support to add a VF MAC address
bnxt: add support for xstats get/reset
bnxt: Add support for VLAN filter and strip dev_ops
bnxt: add code to configure a default VF VLAN
bnxt: add support for set_mc_addr_list and mac_addr_set
bnxt: add support for fw_version_get dev_op
bnxt: add support to set MTU
bnxt: add support for LRO
bnxt: add rxq_info_get and txq_info_get dev_ops
bnxt: add additonal HWRM debug info to error messages
bnxt: reorg the query stats code
bnxt: update to HWRM version 1.7.5
bnxt: Add support to set VF rxmode
bnxt: add code to support vlan_pvid_set dev_op
drivers/net/bnxt/Makefile | 4 + drivers/net/bnxt/bnxt.h | 104 +- drivers/net/bnxt/bnxt_cpr.c | 129 +- drivers/net/bnxt/bnxt_cpr.h | 17 + drivers/net/bnxt/bnxt_ethdev.c | 818 ++- drivers/net/bnxt/bnxt_filter.c | 58 +- drivers/net/bnxt/bnxt_filter.h | 3 + drivers/net/bnxt/bnxt_hwrm.c | 1523 ++++- drivers/net/bnxt/bnxt_hwrm.h | 62 +- drivers/net/bnxt/bnxt_irq.c | 21 +- drivers/net/bnxt/bnxt_ring.c | 159 +- drivers/net/bnxt/bnxt_ring.h | 4 +- drivers/net/bnxt/bnxt_rxq.c | 54 +- drivers/net/bnxt/bnxt_rxq.h | 3 + drivers/net/bnxt/bnxt_rxr.c | 396 +- drivers/net/bnxt/bnxt_rxr.h | 46 + drivers/net/bnxt/bnxt_stats.c | 261 +- drivers/net/bnxt/bnxt_stats.h | 10 + drivers/net/bnxt/bnxt_txr.c | 3 +- drivers/net/bnxt/bnxt_vnic.c | 70 +- drivers/net/bnxt/bnxt_vnic.h | 20 +- drivers/net/bnxt/hsi_struct_def_dpdk.h | 8633 ++++++++++++++++++++--------- drivers/net/bnxt/rte_pmd_bnxt.c | 701 +++ drivers/net/bnxt/rte_pmd_bnxt.h | 322 ++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 22 + 25 files changed, 10407 insertions(+), 3036 deletions(-) create mode 100644 drivers/net/bnxt/rte_pmd_bnxt.c create mode 100644 drivers/net/bnxt/rte_pmd_bnxt.h
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 1/23 bnxt: add various hwrm input/output structures
This patch adds various hwrm API which allows the configuration and allocation of resources for a PCI function depending on whether it is a PF or a VF. These structures will be used in subsequent patches.
--- drivers/net/bnxt/hsi_struct_def_dpdk.h | 1497 ++++++++++++++++++++++++++++++-- 1 file changed, 1417 insertions(+), 80 deletions(-)
drivers/net/bnxt/hsi_struct_def_dpdk.h +1417 -80
@@ -85,20 +85,63 @@ struct ctx_hw_stats64 {* Request types */ #define HWRM_VER_GET (UINT32_C(0x0)) +#define HWRM_FUNC_BUF_UNRGTR (UINT32_C(0xe)) +#define HWRM_FUNC_VF_CFG (UINT32_C(0xf)) +/* Reserved for future use */ +#define RESERVED1 (UINT32_C(0x10))#define HWRM_FUNC_RESET (UINT32_C(0x11)) +#define HWRM_FUNC_GETFID (UINT32_C(0x12)) +#define HWRM_FUNC_VF_ALLOC (UINT32_C(0x13)) +#define HWRM_FUNC_VF_FREE (UINT32_C(0x14))#define HWRM_FUNC_QCAPS (UINT32_C(0x15))#define HWRM_FUNC_QCFG (UINT32_C(0x16)) +#define HWRM_FUNC_CFG (UINT32_C(0x17)) +#define HWRM_FUNC_QSTATS (UINT32_C(0x18)) +#define HWRM_FUNC_CLR_STATS (UINT32_C(0x19))#define HWRM_FUNC_DRV_UNRGTR (UINT32_C(0x1a)) +#define HWRM_FUNC_VF_RESC_FREE (UINT32_C(0x1b)) +#define HWRM_FUNC_VF_VNIC_IDS_QUERY (UINT32_C(0x1c))#define HWRM_FUNC_DRV_RGTR (UINT32_C(0x1d)) +#define HWRM_FUNC_DRV_QVER (UINT32_C(0x1e)) +#define HWRM_FUNC_BUF_RGTR (UINT32_C(0x1f))#define HWRM_PORT_PHY_CFG (UINT32_C(0x20)) +#define HWRM_PORT_MAC_CFG (UINT32_C(0x21)) +#define HWRM_PORT_QSTATS (UINT32_C(0x23)) +#define HWRM_PORT_LPBK_QSTATS (UINT32_C(0x24))#define HWRM_PORT_PHY_QCFG (UINT32_C(0x27)) +#define HWRM_PORT_MAC_QCFG (UINT32_C(0x28)) +#define HWRM_PORT_PHY_QCAPS (UINT32_C(0x2a)) +#define HWRM_PORT_LED_CFG (UINT32_C(0x2d)) +#define HWRM_PORT_LED_QCFG (UINT32_C(0x2e)) +#define HWRM_PORT_LED_QCAPS (UINT32_C(0x2f))#define HWRM_QUEUE_QPORTCFG (UINT32_C(0x30)) +#define HWRM_QUEUE_QCFG (UINT32_C(0x31)) +#define HWRM_QUEUE_CFG (UINT32_C(0x32)) +/* Reserved for future use */ +#define RESERVED2 (UINT32_C(0x33)) +/* Reserved for future use */ +#define RESERVED3 (UINT32_C(0x34)) +#define HWRM_QUEUE_PFCENABLE_QCFG (UINT32_C(0x35)) +#define HWRM_QUEUE_PFCENABLE_CFG (UINT32_C(0x36)) +#define HWRM_QUEUE_PRI2COS_QCFG (UINT32_C(0x37)) +#define HWRM_QUEUE_PRI2COS_CFG (UINT32_C(0x38)) +#define HWRM_QUEUE_COS2BW_QCFG (UINT32_C(0x39)) +#define HWRM_QUEUE_COS2BW_CFG (UINT32_C(0x3a)) +#define HWRM_VNIC_ALLOC (UINT32_C(0x40))#define HWRM_VNIC_ALLOC (UINT32_C(0x40))#define HWRM_VNIC_FREE (UINT32_C(0x41))#define HWRM_VNIC_CFG (UINT32_C(0x42)) +#define HWRM_VNIC_QCFG (UINT32_C(0x43)) +#define HWRM_VNIC_TPA_CFG (UINT32_C(0x44))#define HWRM_VNIC_RSS_CFG (UINT32_C(0x46)) +#define HWRM_VNIC_RSS_QCFG (UINT32_C(0x47)) +#define HWRM_VNIC_PLCMODES_CFG (UINT32_C(0x48)) +#define HWRM_VNIC_PLCMODES_QCFG (UINT32_C(0x49))#define HWRM_RING_ALLOC (UINT32_C(0x50))#define HWRM_RING_FREE (UINT32_C(0x51)) +#define HWRM_RING_CMPL_RING_QAGGINT_PARAMS (UINT32_C(0x52)) +#define HWRM_RING_CMPL_RING_CFG_AGGINT_PARAM (UINT32_C(0x53)) +#define HWRM_RING_RESET (UINT32_C(0x5e))#define HWRM_RING_GRP_ALLOC (UINT32_C(0x60))#define HWRM_RING_GRP_FREE (UINT32_C(0x61))#define HWRM_VNIC_RSS_COS_LB_CTX_ALLOC (UINT32_C(0x70))
@@ -107,10 +150,46 @@ struct ctx_hw_stats64 {#define HWRM_CFA_L2_FILTER_FREE (UINT32_C(0x91))#define HWRM_CFA_L2_FILTER_CFG (UINT32_C(0x92))#define HWRM_CFA_L2_SET_RX_MASK (UINT32_C(0x93)) +/* Reserved for future use */ +#define RESERVED4 (UINT32_C(0x94)) +#define HWRM_CFA_TUNNEL_FILTER_ALLOC (UINT32_C(0x95)) +#define HWRM_CFA_TUNNEL_FILTER_FREE (UINT32_C(0x96)) +#define HWRM_CFA_NTUPLE_FILTER_ALLOC (UINT32_C(0x99)) +#define HWRM_CFA_NTUPLE_FILTER_FREE (UINT32_C(0x9a)) +#define HWRM_CFA_NTUPLE_FILTER_CFG (UINT32_C(0x9b)) +#define HWRM_TUNNEL_DST_PORT_QUERY (UINT32_C(0xa0)) +#define HWRM_TUNNEL_DST_PORT_ALLOC (UINT32_C(0xa1)) +#define HWRM_TUNNEL_DST_PORT_FREE (UINT32_C(0xa2))#define HWRM_STAT_CTX_ALLOC (UINT32_C(0xb0))#define HWRM_STAT_CTX_FREE (UINT32_C(0xb1))#define HWRM_STAT_CTX_CLR_STATS (UINT32_C(0xb3))#define HWRM_EXEC_FWD_RESP (UINT32_C(0xd0)) +#define HWRM_REJECT_FWD_RESP (UINT32_C(0xd1)) +#define HWRM_FWD_RESP (UINT32_C(0xd2)) +#define HWRM_FWD_ASYNC_EVENT_CMPL (UINT32_C(0xd3)) +#define HWRM_TEMP_MONITOR_QUERY (UINT32_C(0xe0)) +#define HWRM_WOL_FILTER_ALLOC (UINT32_C(0xf0)) +#define HWRM_WOL_FILTER_FREE (UINT32_C(0xf1)) +#define HWRM_WOL_FILTER_QCFG (UINT32_C(0xf2)) +#define HWRM_WOL_REASON_QCFG (UINT32_C(0xf3)) +#define HWRM_DBG_DUMP (UINT32_C(0xff14)) +#define HWRM_NVM_VALIDATE_OPTION (UINT32_C(0xffef)) +#define HWRM_NVM_FLUSH (UINT32_C(0xfff0)) +#define HWRM_NVM_GET_VARIABLE (UINT32_C(0xfff1)) +#define HWRM_NVM_SET_VARIABLE (UINT32_C(0xfff2)) +#define HWRM_NVM_INSTALL_UPDATE (UINT32_C(0xfff3)) +#define HWRM_NVM_MODIFY (UINT32_C(0xfff4)) +#define HWRM_NVM_VERIFY_UPDATE (UINT32_C(0xfff5)) +#define HWRM_NVM_GET_DEV_INFO (UINT32_C(0xfff6)) +#define HWRM_NVM_ERASE_DIR_ENTRY (UINT32_C(0xfff7)) +#define HWRM_NVM_MOD_DIR_ENTRY (UINT32_C(0xfff8)) +#define HWRM_NVM_FIND_DIR_ENTRY (UINT32_C(0xfff9)) +#define HWRM_NVM_GET_DIR_ENTRIES (UINT32_C(0xfffa)) +#define HWRM_NVM_GET_DIR_INFO (UINT32_C(0xfffb)) +#define HWRM_NVM_RAW_DUMP (UINT32_C(0xfffc)) +#define HWRM_NVM_READ (UINT32_C(0xfffd)) +#define HWRM_NVM_WRITE (UINT32_C(0xfffe)) +#define HWRM_NVM_RAW_WRITE_BLK (UINT32_C(0xffff))/* Return Codes */ #define HWRM_ERR_CODE_INVALID_PARAMS (UINT32_C(0x2))
@@ -2261,6 +2340,432 @@ struct hwrm_func_qcfg_output {*/ } __attribute__((packed)); +/* hwrm_func_cfg */ +/* +* Description: This command allows configuration of a PF by the corresponding +* PF driver. This command also allows configuration of a child VF by its parent +* PF driver. The input FID value is used to indicate what function is being +* configured. This allows a PF driver to configure the PF owned by itself or a +* virtual function that is a child of the PF. This command allows to reserve +* resources for a VF by its parent PF. To reverse the process, the command +* should be called with all enables flags cleared for resources. This will free +* allocated resources for the VF and return them to the resource pool. If this +* command is requested by a VF driver to configure or reserve resources, then +* the HWRM shall fail this command. If default MAC address and/or VLAN are +* provided in this command, then the HWRM shall set up appropriate MAC/VLAN +* filters for the function that is being configured. If source properties +* checks are enabled and default MAC address and/or IP address are provided in +* this command, then the HWRM shall set appropriate source property checks +* based on provided MAC and/or IP addresses. The parent PF driver should not +* set MTU/MRU for a VF using this command. This is to allow MTU/MRU setting by +* the VF driver. If the MTU or MRU for a VF is set by the PF driver, then the +* HWRM should ignore it. A function's MTU/MRU should be set prior to allocating +* RX VNICs or TX rings. A PF driver calls hwrm_func_cfg to allocate resources +* for itself or its children VFs. All function drivers shall call hwrm_func_cfg +* to reserve resources. A request to hwrm_func_cfg may not be fully granted; +* that is, a request for resources may be larger than what can be supported by +* the device and the HWRM will allocate the best set of resources available, +* but that may be less than requested. If all the amounts requested could not +* be fulfilled, the HWRM shall allocate what it could and return a status code +* of success. A function driver should call hwrm_func_qcfg immediately after +* hwrm_func_cfg to determine what resources were assigned to the configured +* function. A call by a PF driver to hwrm_func_cfg to allocate resources for +* itself shall only allocate resources for the PF driver to use, not for its +* children VFs. Likewise, a call to hwrm_func_qcfg shall return the resources +* available for the PF driver to use, not what is available to its children +* VFs. +*/ +/* Input (88 bytes) */ +struct hwrm_func_cfg_input { +uint16_t req_type; +/* +* This value indicates what type of request this is. The format +* for the rest of the command is determined by this field. +*/ +uint16_t cmpl_ring; +/* +* This value indicates the what completion ring the request +* will be optionally completed on. If the value is -1, then no +* CR completion will be generated. Any other value must be a +* valid CR ring_id value for this function. +*/ +uint16_t seq_id; +/* This value indicates the command sequence number. */ +uint16_t target_id; +/* +* Target ID of this command. 0x0 - 0xFFF8 - Used for function +* ids 0xFFF8 - 0xFFFE - Reserved for internal processors 0xFFFF +* - HWRM +*/ +uint64_t resp_addr; +/* +* This is the host address where the response will be written +* when the request is complete. This area must be 16B aligned +* and must be cleared to zero before the request is made. +*/ +uint16_t fid; +/* +* Function ID of the function that is being configured. If set +* to 0xFF... (All Fs), then the the configuration is for the +* requesting function. +*/ +uint8_t unused_0; +uint8_t unused_1; +uint32_t flags; +/* +* When this bit is '1', the function is disabled with source +* MAC address check. This is an anti-spoofing check. If this +* flag is set, then the function shall be configured to +* disallow transmission of frames with the source MAC address +* that is configured for this function. +*/ +#define HWRM_FUNC_CFG_INPUT_FLAGS_SRC_MAC_ADDR_CHECK_DISABLE \ + UINT32_C(0x1) +/* +* When this bit is '1', the function is enabled with source MAC +* address check. This is an anti-spoofing check. If this flag +* is set, then the function shall be configured to allow +* transmission of frames with the source MAC address that is +* configured for this function. +*/ +#define HWRM_FUNC_CFG_INPUT_FLAGS_SRC_MAC_ADDR_CHECK_ENABLE \ + UINT32_C(0x2) +/* reserved */ +#define HWRM_FUNC_CFG_INPUT_FLAGS_RSVD_MASK UINT32_C(0x1fc) +#define HWRM_FUNC_CFG_INPUT_FLAGS_RSVD_SFT 2 +/* +* Standard TX Ring mode is used for the allocation of TX ring +* and underlying scheduling resources that allow bandwidth +* reservation and limit settings on the queried function. If +* set to 1, then standard TX ring mode is requested to be +* enabled on the function being configured. +*/ +#define HWRM_FUNC_CFG_INPUT_FLAGS_STD_TX_RING_MODE_ENABLE \ + UINT32_C(0x200) +/* +* Standard TX Ring mode is used for the allocation of TX ring +* and underlying scheduling resources that allow bandwidth +* reservation and limit settings on the queried function. If +* set to 1, then the standard TX ring mode is requested to be +* disabled on the function being configured. In this extended +* TX ring resource mode, the minimum and maximum bandwidth +* settings are not supported to allow the allocation of TX +* rings to span multiple scheduler nodes. +*/ +#define HWRM_FUNC_CFG_INPUT_FLAGS_STD_TX_RING_MODE_DISABLE \ + UINT32_C(0x400) +uint32_t enables; +/* This bit must be '1' for the mtu field to be configured. */ +#define HWRM_FUNC_CFG_INPUT_ENABLES_MTU UINT32_C(0x1) +/* This bit must be '1' for the mru field to be configured. */ +#define HWRM_FUNC_CFG_INPUT_ENABLES_MRU UINT32_C(0x2) +/* +* This bit must be '1' for the num_rsscos_ctxs field to be +* configured. +*/ +#define HWRM_FUNC_CFG_INPUT_ENABLES_NUM_RSSCOS_CTXS UINT32_C(0x4) +/* +* This bit must be '1' for the num_cmpl_rings field to be +* configured. +*/ +#define HWRM_FUNC_CFG_INPUT_ENABLES_NUM_CMPL_RINGS UINT32_C(0x8) +/* This bit must be '1' for the num_tx_rings field to be configured. */ +#define HWRM_FUNC_CFG_INPUT_ENABLES_NUM_TX_RINGS UINT32_C(0x10) +/* This bit must be '1' for the num_rx_rings field to be configured. */ +#define HWRM_FUNC_CFG_INPUT_ENABLES_NUM_RX_RINGS UINT32_C(0x20) +/* This bit must be '1' for the num_l2_ctxs field to be configured. */ +#define HWRM_FUNC_CFG_INPUT_ENABLES_NUM_L2_CTXS UINT32_C(0x40) +/* This bit must be '1' for the num_vnics field to be configured. */ +#define HWRM_FUNC_CFG_INPUT_ENABLES_NUM_VNICS UINT32_C(0x80) +/* +* This bit must be '1' for the num_stat_ctxs field to be +* configured. +*/ +#define HWRM_FUNC_CFG_INPUT_ENABLES_NUM_STAT_CTXS UINT32_C(0x100) +/* +* This bit must be '1' for the dflt_mac_addr field to be +* configured. +*/ +#define HWRM_FUNC_CFG_INPUT_ENABLES_DFLT_MAC_ADDR UINT32_C(0x200) +/* This bit must be '1' for the dflt_vlan field to be configured. */ +#define HWRM_FUNC_CFG_INPUT_ENABLES_DFLT_VLAN UINT32_C(0x400) +/* This bit must be '1' for the dflt_ip_addr field to be configured. */ +#define HWRM_FUNC_CFG_INPUT_ENABLES_DFLT_IP_ADDR UINT32_C(0x800) +/* This bit must be '1' for the min_bw field to be configured. */ +#define HWRM_FUNC_CFG_INPUT_ENABLES_MIN_BW UINT32_C(0x1000) +/* This bit must be '1' for the max_bw field to be configured. */ +#define HWRM_FUNC_CFG_INPUT_ENABLES_MAX_BW UINT32_C(0x2000) +/* +* This bit must be '1' for the async_event_cr field to be +* configured. +*/ +#define HWRM_FUNC_CFG_INPUT_ENABLES_ASYNC_EVENT_CR UINT32_C(0x4000) +/* +* This bit must be '1' for the vlan_antispoof_mode field to be +* configured. +*/ +#define HWRM_FUNC_CFG_INPUT_ENABLES_VLAN_ANTISPOOF_MODE UINT32_C(0x8000) +/* +* This bit must be '1' for the allowed_vlan_pris field to be +* configured. +*/ +#define HWRM_FUNC_CFG_INPUT_ENABLES_ALLOWED_VLAN_PRIS UINT32_C(0x10000) +/* This bit must be '1' for the evb_mode field to be configured. */ +#define HWRM_FUNC_CFG_INPUT_ENABLES_EVB_MODE UINT32_C(0x20000) +/* +* This bit must be '1' for the num_mcast_filters field to be +* configured. +*/ +#define HWRM_FUNC_CFG_INPUT_ENABLES_NUM_MCAST_FILTERS UINT32_C(0x40000) +/* +* This bit must be '1' for the num_hw_ring_grps field to be +* configured. +*/ +#define HWRM_FUNC_CFG_INPUT_ENABLES_NUM_HW_RING_GRPS UINT32_C(0x80000) +uint16_t mtu; +/* +* The maximum transmission unit of the function. The HWRM +* should make sure that the mtu of the function does not exceed +* the mtu of the physical port that this function is associated +* with. In addition to configuring mtu per function, it is +* possible to configure mtu per transmit ring. By default, the +* mtu of each transmit ring associated with a function is equal +* to the mtu of the function. The HWRM should make sure that +* the mtu of each transmit ring that is assigned to a function +* has a valid mtu. +*/ +uint16_t mru; +/* +* The maximum receive unit of the function. The HWRM should +* make sure that the mru of the function does not exceed the +* mru of the physical port that this function is associated +* with. In addition to configuring mru per function, it is +* possible to configure mru per vnic. By default, the mru of +* each vnic associated with a function is equal to the mru of +* the function. The HWRM should make sure that the mru of each +* vnic that is assigned to a function has a valid mru. +*/ +uint16_t num_rsscos_ctxs; +/* The number of RSS/COS contexts requested for the function. */ +uint16_t num_cmpl_rings; +/* +* The number of completion rings requested for the function. +* This does not include the rings allocated to any children +* functions if any. +*/ +uint16_t num_tx_rings; +/* +* The number of transmit rings requested for the function. This +* does not include the rings allocated to any children +* functions if any. +*/ +uint16_t num_rx_rings; +/* +* The number of receive rings requested for the function. This +* does not include the rings allocated to any children +* functions if any. +*/ +uint16_t num_l2_ctxs; +/* The requested number of L2 contexts for the function. */ +uint16_t num_vnics; +/* The requested number of vnics for the function. */ +uint16_t num_stat_ctxs; +/* The requested number of statistic contexts for the function. */ +uint16_t num_hw_ring_grps; +/* +* The number of HW ring groups that should be reserved for this +* function. +*/ +uint8_t dflt_mac_addr[6 ]; +/* The default MAC address for the function being configured. */ +uint16_t dflt_vlan; +/* +* The default VLAN for the function being configured. This +* field's format is same as 802.1Q Tag's Tag Control +* Information (TCI) format that includes both Priority Code +* Point (PCP) and VLAN Identifier (VID). +*/ +uint32_t dflt_ip_addr[4 ]; +/* +* The default IP address for the function being configured. +* This address is only used in enabling source property check. +*/ +uint32_t min_bw; +/* +* Minimum BW allocated for this function. The HWRM will +* translate this value into byte counter and time interval used +* for the scheduler inside the device. +*/ +/* The bandwidth value. */ +#define HWRM_FUNC_CFG_INPUT_MIN_BW_BW_VALUE_MASK \ + UINT32_C(0xfffffff) +#define HWRM_FUNC_CFG_INPUT_MIN_BW_BW_VALUE_SFT 0 +/* The granularity of the value (bits or bytes). */ +#define HWRM_FUNC_CFG_INPUT_MIN_BW_SCALE UINT32_C(0x10000000) +/* Value is in bits. */ +#define HWRM_FUNC_CFG_INPUT_MIN_BW_SCALE_BITS (UINT32_C(0x0) << 28) +/* Value is in bytes. */ +#define HWRM_FUNC_CFG_INPUT_MIN_BW_SCALE_BYTES (UINT32_C(0x1) << 28) +#define HWRM_FUNC_CFG_INPUT_MIN_BW_SCALE_LAST \ + FUNC_CFG_INPUT_MIN_BW_SCALE_BYTES +/* bw_value_unit is 3 b */ +#define HWRM_FUNC_CFG_INPUT_MIN_BW_BW_VALUE_UNIT_MASK \ + UINT32_C(0xe0000000) +#define HWRM_FUNC_CFG_INPUT_MIN_BW_BW_VALUE_UNIT_SFT 29 +/* Value is in Mb or MB (base 10). */ +#define HWRM_FUNC_CFG_INPUT_MIN_BW_BW_VALUE_UNIT_MEGA \ + (UINT32_C(0x0) << 29) +/* Value is in Kb or KB (base 10). */ +#define HWRM_FUNC_CFG_INPUT_MIN_BW_BW_VALUE_UNIT_KILO \ + (UINT32_C(0x2) << 29) +/* Value is in bits or bytes. */ +#define HWRM_FUNC_CFG_INPUT_MIN_BW_BW_VALUE_UNIT_BASE \ + (UINT32_C(0x4) << 29) +/* Value is in Gb or GB (base 10). */ +#define HWRM_FUNC_CFG_INPUT_MIN_BW_BW_VALUE_UNIT_GIGA \ + (UINT32_C(0x6) << 29) +/* Value is in 1/100th of a percentage of total bandwidth. */ +#define HWRM_FUNC_CFG_INPUT_MIN_BW_BW_VALUE_UNIT_PERCENT1_100 \ + (UINT32_C(0x1) << 29) +/* Invalid unit */ +#define HWRM_FUNC_CFG_INPUT_MIN_BW_BW_VALUE_UNIT_INVALID \ + (UINT32_C(0x7) << 29) +#define HWRM_FUNC_CFG_INPUT_MIN_BW_BW_VALUE_UNIT_LAST \ + FUNC_CFG_INPUT_MIN_BW_BW_VALUE_UNIT_INVALID +uint32_t max_bw; +/* +* Maximum BW allocated for this function. The HWRM will +* translate this value into byte counter and time interval used +* for the scheduler inside the device. +*/ +/* The bandwidth value. */ +#define HWRM_FUNC_CFG_INPUT_MAX_BW_BW_VALUE_MASK \ + UINT32_C(0xfffffff) +#define HWRM_FUNC_CFG_INPUT_MAX_BW_BW_VALUE_SFT 0 +/* The granularity of the value (bits or bytes). */ +#define HWRM_FUNC_CFG_INPUT_MAX_BW_SCALE UINT32_C(0x10000000) +/* Value is in bits. */ +#define HWRM_FUNC_CFG_INPUT_MAX_BW_SCALE_BITS (UINT32_C(0x0) << 28) +/* Value is in bytes. */ +#define HWRM_FUNC_CFG_INPUT_MAX_BW_SCALE_BYTES (UINT32_C(0x1) << 28) +#define HWRM_FUNC_CFG_INPUT_MAX_BW_SCALE_LAST \ + FUNC_CFG_INPUT_MAX_BW_SCALE_BYTES +/* bw_value_unit is 3 b */ +#define HWRM_FUNC_CFG_INPUT_MAX_BW_BW_VALUE_UNIT_MASK \ + UINT32_C(0xe0000000) +#define HWRM_FUNC_CFG_INPUT_MAX_BW_BW_VALUE_UNIT_SFT 29 +/* Value is in Mb or MB (base 10). */ +#define HWRM_FUNC_CFG_INPUT_MAX_BW_BW_VALUE_UNIT_MEGA \ + (UINT32_C(0x0) << 29) +/* Value is in Kb or KB (base 10). */ +#define HWRM_FUNC_CFG_INPUT_MAX_BW_BW_VALUE_UNIT_KILO \ + (UINT32_C(0x2) << 29) +/* Value is in bits or bytes. */ +#define HWRM_FUNC_CFG_INPUT_MAX_BW_BW_VALUE_UNIT_BASE \ + (UINT32_C(0x4) << 29) +/* Value is in Gb or GB (base 10). */ +#define HWRM_FUNC_CFG_INPUT_MAX_BW_BW_VALUE_UNIT_GIGA \ + (UINT32_C(0x6) << 29) +/* Value is in 1/100th of a percentage of total bandwidth. */ +#define HWRM_FUNC_CFG_INPUT_MAX_BW_BW_VALUE_UNIT_PERCENT1_100 \ + (UINT32_C(0x1) << 29) +/* Invalid unit */ +#define HWRM_FUNC_CFG_INPUT_MAX_BW_BW_VALUE_UNIT_INVALID \ + (UINT32_C(0x7) << 29) +#define HWRM_FUNC_CFG_INPUT_MAX_BW_BW_VALUE_UNIT_LAST \ + FUNC_CFG_INPUT_MAX_BW_BW_VALUE_UNIT_INVALID +uint16_t async_event_cr; +/* +* ID of the target completion ring for receiving asynchronous +* event completions. If this field is not valid, then the HWRM +* shall use the default completion ring of the function that is +* being configured as the target completion ring for providing +* any asynchronous event completions for that function. If this +* field is valid, then the HWRM shall use the completion ring +* identified by this ID as the target completion ring for +* providing any asynchronous event completions for the function +* that is being configured. +*/ +uint8_t vlan_antispoof_mode; +/* VLAN Anti-spoofing mode. */ +/* No VLAN anti-spoofing checks are enabled */ +#define HWRM_FUNC_CFG_INPUT_VLAN_ANTISPOOF_MODE_NOCHECK UINT32_C(0x0) +/* Validate VLAN against the configured VLAN(s) */ +#define HWRM_FUNC_CFG_INPUT_VLAN_ANTISPOOF_MODE_VALIDATE_VLAN \ + UINT32_C(0x1) +/* Insert VLAN if it does not exist, otherwise discard */ +#define HWRM_FUNC_CFG_INPUT_VLAN_ANTISPOOF_MODE_INSERT_IF_VLANDNE \ + UINT32_C(0x2) +/* +* Insert VLAN if it does not exist, override +* VLAN if it exists +*/ +#define \ +HWRM_FUNC_CFG_INPUT_VLAN_ANTISPOOF_MODE_INSERT_OR_OVERRIDE_VLAN \ + UINT32_C(0x3) +uint8_t allowed_vlan_pris; +/* +* This bit field defines VLAN PRIs that are allowed on this +* function. If nth bit is set, then VLAN PRI n is allowed on +* this function. +*/ +uint8_t evb_mode; +/* +* The HWRM shall allow a PF driver to change EVB mode for the +* partition it belongs to. The HWRM shall not allow a VF driver +* to change the EVB mode. The HWRM shall take into account the +* switching of EVB mode from one to another and reconfigure +* hardware resources as appropriately. The switching from VEB +* to VEPA mode requires the disabling of the loopback traffic. +* Additionally, source knock outs are handled differently in +* VEB and VEPA modes. +*/ +/* No Edge Virtual Bridging (EVB) */ +#define HWRM_FUNC_CFG_INPUT_EVB_MODE_NO_EVB UINT32_C(0x0) +/* Virtual Ethernet Bridge (VEB) */ +#define HWRM_FUNC_CFG_INPUT_EVB_MODE_VEB UINT32_C(0x1) +/* Virtual Ethernet Port Aggregator (VEPA) */ +#define HWRM_FUNC_CFG_INPUT_EVB_MODE_VEPA UINT32_C(0x2) +uint8_t unused_2; +uint16_t num_mcast_filters; +/* +* The number of multicast filters that should be reserved for +* this function on the RX side. +*/ +} __attribute__((packed)); + +/* Output (16 bytes) */ +struct hwrm_func_cfg_output { +uint16_t error_code; +/* +* Pass/Fail or error type Note: receiver to verify the in +* parameters, and fail the call with an error when appropriate +*/ +uint16_t req_type; +/* This field returns the type of original request. */ +uint16_t seq_id; +/* This field provides original sequence number of the command. */ +uint16_t resp_len; +/* +* This field is the length of the response in bytes. The last +* byte of the response is a valid flag that will read as '1' +* when the command has been completely written to memory. +*/ +uint32_t unused_0; +uint8_t unused_1; +uint8_t unused_2; +uint8_t unused_3; +uint8_t valid; +/* +* This field is used in Output records to indicate that the +* output is completely written to RAM. This field should be +* read as '1' to indicate that the output has been completely +* written. When writing a command completion or response to an +* internal processor, the order of writes has to be such that +* this field is written last. +*/ +} __attribute__((packed)); +/* hwrm_func_drv_rgtr */ /* * Description: This command is used by the function driver to register its
@@ -2491,17 +2996,16 @@ struct hwrm_func_drv_unrgtr_output {*/ } __attribute__((packed)); -/* hwrm_port_phy_cfg */ +/* hwrm_func_buf_rgtr */ /* -* Description: This command configures the PHY device for the port. It allows -* setting of the most generic settings for the PHY. The HWRM shall complete -* this command as soon as PHY settings are configured. They may not be applied -* when the command response is provided. A VF driver shall not be allowed to -* configure PHY using this command. In a network partition mode, a PF driver -* shall not be allowed to configure PHY using this command. +* Description: This command is used by the PF driver to register buffers used +* in the PF-VF communication with the HWRM. The PF driver uses this command to +* register buffers for each PF-VF channel. A parent PF may issue this command +* per child VF. If VF ID is not valid, then this command is used to register +* buffers for all children VFs of the PF. */ -/* Input (56 bytes) */ -struct hwrm_port_phy_cfg_input { +/* Input (128 bytes) */ +struct hwrm_func_buf_rgtr_input {uint16_t req_type;/* * This value indicates what type of request this is. The format
@@ -2528,64 +3032,378 @@ struct hwrm_port_phy_cfg_input {* when the request is complete. This area must be 16B aligned * and must be cleared to zero before the request is made. */ -uint32_t flags; +uint32_t enables; +/* This bit must be '1' for the vf_id field to be configured. */ +#define HWRM_FUNC_BUF_RGTR_INPUT_ENABLES_VF_ID UINT32_C(0x1) +/* This bit must be '1' for the err_buf_addr field to be configured. */ +#define HWRM_FUNC_BUF_RGTR_INPUT_ENABLES_ERR_BUF_ADDR UINT32_C(0x2) +uint16_t vf_id;/* -* When this bit is set to '1', the PHY for the port shall be -* reset. # If this bit is set to 1, then the HWRM shall reset -* the PHY after applying PHY configuration changes specified in -* this command. # In order to guarantee that PHY configuration -* changes specified in this command take effect, the HWRM -* client should set this flag to 1. # If this bit is not set to -* 1, then the HWRM may reset the PHY depending on the current -* PHY configuration and settings specified in this command. -*/ -#define HWRM_PORT_PHY_CFG_INPUT_FLAGS_RESET_PHY UINT32_C(0x1) +* This value is used to identify a Virtual Function (VF). The +* scope of VF ID is local within a PF. +*/ +uint16_t req_buf_num_pages; +/* +* This field represents the number of pages used for request +* buffer(s). +*/ +uint16_t req_buf_page_size; +/* This field represents the page size used for request buffer(s). */ +/* 16 bytes */ +#define HWRM_FUNC_BUF_RGTR_INPUT_INPUT_BUF_PAGE_SIZE_16B UINT32_C(0x4) +/* 4 Kbytes */ +#define HWRM_FUNC_BUF_RGTR_INPUT_INPUT_BUF_PAGE_SIZE_4K UINT32_C(0xc) +/* 8 Kbytes */ +#define HWRM_FUNC_BUF_RGTR_INPUT_INPUT_BUF_PAGE_SIZE_8K UINT32_C(0xd) +/* 64 Kbytes */ +#define HWRM_FUNC_BUF_RGTR_INPUT_INPUT_BUF_PAGE_SIZE_64K UINT32_C(0x10) +/* 2 Mbytes */ +#define HWRM_FUNC_BUF_RGTR_INPUT_INPUT_BUF_PAGE_SIZE_2M UINT32_C(0x15) +/* 4 Mbytes */ +#define HWRM_FUNC_BUF_RGTR_INPUT_INPUT_BUF_PAGE_SIZE_4M UINT32_C(0x16) +/* 1 Gbytes */ +#define HWRM_FUNC_BUF_RGTR_INPUT_INPUT_BUF_PAGE_SIZE_1G UINT32_C(0x1e) +uint16_t req_buf_len; +/* The length of the request buffer per VF in bytes. */ +uint16_t resp_buf_len; +/* The length of the response buffer in bytes. */ +uint8_t unused_0; +uint8_t unused_1; +uint64_t req_buf_page_addr[10 ]; +/* This field represents the page address of req buffer. */ +uint64_t error_buf_addr;/* -* When this bit is set to '1', the link shall be forced to be -* taken down. # When this bit is set to '1", all other command -* input settings related to the link speed shall be ignored. -* Once the link state is forced down, it can be explicitly -* cleared from that state by setting this flag to '0'. # If -* this flag is set to '0', then the link shall be cleared from -* forced down state if the link is in forced down state. There -* may be conditions (e.g. out-of-band or sideband configuration -* changes for the link) outside the scope of the HWRM -* implementation that may clear forced down link state. +* This field is used to receive the error reporting from the +* chipset. Only applicable for PFs. */ -#define HWRM_PORT_PHY_CFG_INPUT_FLAGS_FORCE_LINK_DOWN UINT32_C(0x2) +uint64_t resp_buf_addr; +/* This field is used to receive the response forwarded by the HWRM. */ +} __attribute__((packed)); + +/* Output (16 bytes) */ +struct hwrm_func_buf_rgtr_output { +uint16_t error_code;/* -* When this bit is set to '1', the link shall be forced to the -* force_link_speed value. When this bit is set to '1', the HWRM -* client should not enable any of the auto negotiation related -* fields represented by auto_XXX fields in this command. When -* this bit is set to '1' and the HWRM client has enabled a -* auto_XXX field in this command, then the HWRM shall ignore -* the enabled auto_XXX field. When this bit is set to zero, the -* link shall be allowed to autoneg. +* Pass/Fail or error type Note: receiver to verify the in +* parameters, and fail the call with an error when appropriate */ -#define HWRM_PORT_PHY_CFG_INPUT_FLAGS_FORCE UINT32_C(0x4) +uint16_t req_type; +/* This field returns the type of original request. */ +uint16_t seq_id; +/* This field provides original sequence number of the command. */ +uint16_t resp_len;/* -* When this bit is set to '1', the auto-negotiation process -* shall be restarted on the link. +* This field is the length of the response in bytes. The last +* byte of the response is a valid flag that will read as '1' +* when the command has been completely written to memory. */ -#define HWRM_PORT_PHY_CFG_INPUT_FLAGS_RESTART_AUTONEG UINT32_C(0x8) +uint32_t unused_0; +uint8_t unused_1; +uint8_t unused_2; +uint8_t unused_3; +uint8_t valid;/* -* When this bit is set to '1', Energy Efficient Ethernet (EEE) -* is requested to be enabled on this link. If EEE is not -* supported on this port, then this flag shall be ignored by -* the HWRM. +* This field is used in Output records to indicate that the +* output is completely written to RAM. This field should be +* read as '1' to indicate that the output has been completely +* written. When writing a command completion or response to an +* internal processor, the order of writes has to be such that +* this field is written last. */ -#define HWRM_PORT_PHY_CFG_INPUT_FLAGS_EEE_ENABLE UINT32_C(0x10) +} __attribute__((packed)); + +/* hwrm_func_buf_unrgtr */ +/* +* Description: This command is used by the PF driver to unregister buffers used +* in the PF-VF communication with the HWRM. The PF driver uses this command to +* unregister buffers for PF-VF communication. A parent PF may issue this +* command to unregister buffers for communication between the PF and a specific +* VF. If the VF ID is not valid, then this command is used to unregister +* buffers used for communications with all children VFs of the PF. +*/ +/* Input (24 bytes) */ +struct hwrm_func_buf_unrgtr_input { +uint16_t req_type;/* -* When this bit is set to '1', Energy Efficient Ethernet (EEE) -* is requested to be disabled on this link. If EEE is not -* supported on this port, then this flag shall be ignored by -* the HWRM. +* This value indicates what type of request this is. The format +* for the rest of the command is determined by this field. */ -#define HWRM_PORT_PHY_CFG_INPUT_FLAGS_EEE_DISABLE UINT32_C(0x20) +uint16_t cmpl_ring;/* -* When this bit is set to '1' and EEE is enabled on this link, -* then TX LPI is requested to be enabled on the link. If EEE is +* This value indicates the what completion ring the request +* will be optionally completed on. If the value is -1, then no +* CR completion will be generated. Any other value must be a +* valid CR ring_id value for this function. +*/ +uint16_t seq_id; +/* This value indicates the command sequence number. */ +uint16_t target_id; +/* +* Target ID of this command. 0x0 - 0xFFF8 - Used for function +* ids 0xFFF8 - 0xFFFE - Reserved for internal processors 0xFFFF +* - HWRM +*/ +uint64_t resp_addr; +/* +* This is the host address where the response will be written +* when the request is complete. This area must be 16B aligned +* and must be cleared to zero before the request is made. +*/ +uint32_t enables; +/* This bit must be '1' for the vf_id field to be configured. */ +#define HWRM_FUNC_BUF_UNRGTR_INPUT_ENABLES_VF_ID UINT32_C(0x1) +uint16_t vf_id; +/* +* This value is used to identify a Virtual Function (VF). The +* scope of VF ID is local within a PF. +*/ +uint16_t unused_0; +} __attribute__((packed)); + +/* Output (16 bytes) */ +struct hwrm_func_buf_unrgtr_output { +uint16_t error_code; +/* +* Pass/Fail or error type Note: receiver to verify the in +* parameters, and fail the call with an error when appropriate +*/ +uint16_t req_type; +/* This field returns the type of original request. */ +uint16_t seq_id; +/* This field provides original sequence number of the command. */ +uint16_t resp_len; +/* +* This field is the length of the response in bytes. The last +* byte of the response is a valid flag that will read as '1' +* when the command has been completely written to memory. +*/ +uint32_t unused_0; +uint8_t unused_1; +uint8_t unused_2; +uint8_t unused_3; +uint8_t valid; +/* +* This field is used in Output records to indicate that the +* output is completely written to RAM. This field should be +* read as '1' to indicate that the output has been completely +* written. When writing a command completion or response to an +* internal processor, the order of writes has to be such that +* this field is written last. +*/ +} __attribute__((packed)); + +/* hwrm_func_vf_cfg */ +/* +* Description: This command allows configuration of a VF by its driver. If this +* function is called by a PF driver, then the HWRM shall fail this command. If +* guest VLAN and/or MAC address are provided in this command, then the HWRM +* shall set up appropriate MAC/VLAN filters for the VF that is being +* configured. A VF driver should set VF MTU/MRU using this command prior to +* allocating RX VNICs or TX rings for the corresponding VF. +*/ +/* Input (32 bytes) */ + +struct hwrm_func_vf_cfg_input { +uint16_t req_type; +/* +* This value indicates what type of request this is. The format for the +* rest of the command is determined by this field. +*/ +uint16_t cmpl_ring; +/* +* This value indicates the what completion ring the request will be +* optionally completed on. If the value is -1, then no CR completion +* will be generated. Any other value must be a valid CR ring_id value +* for this function. +*/ +uint16_t seq_id; +/* This value indicates the command sequence number. */ +uint16_t target_id; +/* +* Target ID of this command. 0x0 - 0xFFF8 - Used for function ids +* 0xFFF8 - 0xFFFE - Reserved for internal processors 0xFFFF - HWRM +*/ +uint64_t resp_addr; +/* +* This is the host address where the response will be written when the +* request is complete. This area must be 16B aligned and must be +* cleared to zero before the request is made. +*/ +uint32_t enables; +/* This bit must be '1' for the mtu field to be configured. */ +#define HWRM_FUNC_VF_CFG_INPUT_ENABLES_MTU UINT32_C(0x1) +/* This bit must be '1' for the guest_vlan field to be configured. */ +#define HWRM_FUNC_VF_CFG_INPUT_ENABLES_GUEST_VLAN UINT32_C(0x2) +/* +* This bit must be '1' for the async_event_cr field to be configured. +*/ +#define HWRM_FUNC_VF_CFG_INPUT_ENABLES_ASYNC_EVENT_CR UINT32_C(0x4) +/* This bit must be '1' for the dflt_mac_addr field to be configured. */ +#define HWRM_FUNC_VF_CFG_INPUT_ENABLES_DFLT_MAC_ADDR UINT32_C(0x8) +uint16_t mtu; +/* +* The maximum transmission unit requested on the function. The HWRM +* should make sure that the mtu of the function does not exceed the mtu +* of the physical port that this function is associated with. In +* addition to requesting mtu per function, it is possible to configure +* mtu per transmit ring. By default, the mtu of each transmit ring +* associated with a function is equal to the mtu of the function. The +* HWRM should make sure that the mtu of each transmit ring that is +* assigned to a function has a valid mtu. +*/ +uint16_t guest_vlan; +/* +* The guest VLAN for the function being configured. This field's format +* is same as 802.1Q Tag's Tag Control Information (TCI) format that +* includes both Priority Code Point (PCP) and VLAN Identifier (VID). +*/ +uint16_t async_event_cr; +/* +* ID of the target completion ring for receiving asynchronous event +* completions. If this field is not valid, then the HWRM shall use the +* default completion ring of the function that is being configured as +* the target completion ring for providing any asynchronous event +* completions for that function. If this field is valid, then the HWRM +* shall use the completion ring identified by this ID as the target +* completion ring for providing any asynchronous event completions for +* the function that is being configured. +*/ +uint8_t dflt_mac_addr[6 ]; +/* +* This value is the current MAC address requested by the VF driver to +* be configured on this VF. A value of 00-00-00-00-00-00 indicates no +* MAC address configuration is requested by the VF driver. The parent +* PF driver may reject or overwrite this MAC address. +*/ +} __attribute__((packed)); + +/* Output (16 bytes) */ + +struct hwrm_func_vf_cfg_output { +uint16_t error_code; +/* +* Pass/Fail or error type Note: receiver to verify the in parameters, +* and fail the call with an error when appropriate +*/ +uint16_t req_type; +/* This field returns the type of original request. */ +uint16_t seq_id; +/* This field provides original sequence number of the command. */ +uint16_t resp_len; +/* +* This field is the length of the response in bytes. The last byte of +* the response is a valid flag that will read as '1' when the command +* has been completely written to memory. +*/ +uint32_t unused_0; +uint8_t unused_1; +uint8_t unused_2; +uint8_t unused_3; +uint8_t valid; +/* +* This field is used in Output records to indicate that the output is +* completely written to RAM. This field should be read as '1' to +* indicate that the output has been completely written. When writing a +* command completion or response to an internal processor, the order of +* writes has to be such that this field is written last. +*/ +} __attribute__((packed)); + +/* hwrm_port_phy_cfg */ +/* +* Description: This command configures the PHY device for the port. It allows +* setting of the most generic settings for the PHY. The HWRM shall complete +* this command as soon as PHY settings are configured. They may not be applied +* when the command response is provided. A VF driver shall not be allowed to +* configure PHY using this command. In a network partition mode, a PF driver +* shall not be allowed to configure PHY using this command. +*/ +/* Input (56 bytes) */ +struct hwrm_port_phy_cfg_input { +uint16_t req_type; +/* +* This value indicates what type of request this is. The format +* for the rest of the command is determined by this field. +*/ +uint16_t cmpl_ring; +/* +* This value indicates the what completion ring the request +* will be optionally completed on. If the value is -1, then no +* CR completion will be generated. Any other value must be a +* valid CR ring_id value for this function. +*/ +uint16_t seq_id; +/* This value indicates the command sequence number. */ +uint16_t target_id; +/* +* Target ID of this command. 0x0 - 0xFFF8 - Used for function +* ids 0xFFF8 - 0xFFFE - Reserved for internal processors 0xFFFF +* - HWRM +*/ +uint64_t resp_addr; +/* +* This is the host address where the response will be written +* when the request is complete. This area must be 16B aligned +* and must be cleared to zero before the request is made. +*/ +uint32_t flags; +/* +* When this bit is set to '1', the PHY for the port shall be +* reset. # If this bit is set to 1, then the HWRM shall reset +* the PHY after applying PHY configuration changes specified in +* this command. # In order to guarantee that PHY configuration +* changes specified in this command take effect, the HWRM +* client should set this flag to 1. # If this bit is not set to +* 1, then the HWRM may reset the PHY depending on the current +* PHY configuration and settings specified in this command. +*/ +#define HWRM_PORT_PHY_CFG_INPUT_FLAGS_RESET_PHY UINT32_C(0x1) +/* +* When this bit is set to '1', the link shall be forced to be +* taken down. # When this bit is set to '1", all other command +* input settings related to the link speed shall be ignored. +* Once the link state is forced down, it can be explicitly +* cleared from that state by setting this flag to '0'. # If +* this flag is set to '0', then the link shall be cleared from +* forced down state if the link is in forced down state. There +* may be conditions (e.g. out-of-band or sideband configuration +* changes for the link) outside the scope of the HWRM +* implementation that may clear forced down link state. +*/ +#define HWRM_PORT_PHY_CFG_INPUT_FLAGS_FORCE_LINK_DOWN UINT32_C(0x2) +/* +* When this bit is set to '1', the link shall be forced to the +* force_link_speed value. When this bit is set to '1', the HWRM +* client should not enable any of the auto negotiation related +* fields represented by auto_XXX fields in this command. When +* this bit is set to '1' and the HWRM client has enabled a +* auto_XXX field in this command, then the HWRM shall ignore +* the enabled auto_XXX field. When this bit is set to zero, the +* link shall be allowed to autoneg. +*/ +#define HWRM_PORT_PHY_CFG_INPUT_FLAGS_FORCE UINT32_C(0x4) +/* +* When this bit is set to '1', the auto-negotiation process +* shall be restarted on the link. +*/ +#define HWRM_PORT_PHY_CFG_INPUT_FLAGS_RESTART_AUTONEG UINT32_C(0x8) +/* +* When this bit is set to '1', Energy Efficient Ethernet (EEE) +* is requested to be enabled on this link. If EEE is not +* supported on this port, then this flag shall be ignored by +* the HWRM. +*/ +#define HWRM_PORT_PHY_CFG_INPUT_FLAGS_EEE_ENABLE UINT32_C(0x10) +/* +* When this bit is set to '1', Energy Efficient Ethernet (EEE) +* is requested to be disabled on this link. If EEE is not +* supported on this port, then this flag shall be ignored by +* the HWRM. +*/ +#define HWRM_PORT_PHY_CFG_INPUT_FLAGS_EEE_DISABLE UINT32_C(0x20) +/* +* When this bit is set to '1' and EEE is enabled on this link, +* then TX LPI is requested to be enabled on the link. If EEE is * not supported on this port, then this flag shall be ignored * by the HWRM. If EEE is disabled on this port, then this flag * shall be ignored by the HWRM.
@@ -4366,10 +5184,14 @@ struct hwrm_vnic_cfg_output {*/ } __attribute__((packed)); -/* hwrm_vnic_rss_cfg */ -/* Description: This function is used to enable RSS configuration. */ -/* Input (48 bytes) */ -struct hwrm_vnic_rss_cfg_input { +/* hwrm_vnic_qcfg */ +/* +* Description: Query the RX VNIC structure. This function can be used by a PF +* driver to query its own VNIC resource or VNIC resource of its child VF. This +* function can also be used by a VF driver to query its own VNIC resource. +*/ +/* Input (32 bytes) */ +struct hwrm_vnic_qcfg_input {uint16_t req_type;/* * This value indicates what type of request this is. The format
@@ -4396,36 +5218,176 @@ struct hwrm_vnic_rss_cfg_input {* when the request is complete. This area must be 16B aligned * and must be cleared to zero before the request is made. */ -uint32_t hash_type; +uint32_t enables; +/* This bit must be '1' for the vf_id_valid field to be configured. */ +#define HWRM_VNIC_QCFG_INPUT_ENABLES_VF_ID_VALID UINT32_C(0x1) +uint32_t vnic_id; +/* Logical vnic ID */ +uint16_t vf_id; +/* ID of Virtual Function whose VNIC resource is being queried. */ +uint16_t unused_0[3 ]; +} __attribute__((packed)); + +/* Output (32 bytes) */ +struct hwrm_vnic_qcfg_output { +uint16_t error_code;/* -* When this bit is '1', the RSS hash shall be computed over -* source and destination IPv4 addresses of IPv4 packets. +* Pass/Fail or error type Note: receiver to verify the in +* parameters, and fail the call with an error when appropriate */ -#define HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV4 UINT32_C(0x1) +uint16_t req_type; +/* This field returns the type of original request. */ +uint16_t seq_id; +/* This field provides original sequence number of the command. */ +uint16_t resp_len;/* -* When this bit is '1', the RSS hash shall be computed over -* source/destination IPv4 addresses and source/destination -* ports of TCP/IPv4 packets. +* This field is the length of the response in bytes. The last +* byte of the response is a valid flag that will read as '1' +* when the command has been completely written to memory. */ -#define HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV4 UINT32_C(0x2) +uint16_t dflt_ring_grp; +/* Default Completion ring for the VNIC. */ +uint16_t rss_rule;/* -* When this bit is '1', the RSS hash shall be computed over -* source/destination IPv4 addresses and source/destination -* ports of UDP/IPv4 packets. +* RSS ID for RSS rule/table structure. 0xFF... (All Fs) if +* there is no RSS rule. */ -#define HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV4 UINT32_C(0x4) +uint16_t cos_rule;/* -* When this bit is '1', the RSS hash shall be computed over -* source and destination IPv4 addresses of IPv6 packets. +* RSS ID for COS rule/table structure. 0xFF... (All Fs) if +* there is no COS rule. */ -#define HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV6 UINT32_C(0x8) +uint16_t lb_rule;/* -* When this bit is '1', the RSS hash shall be computed over -* source/destination IPv6 addresses and source/destination -* ports of TCP/IPv6 packets. +* RSS ID for load balancing rule/table structure. 0xFF... (All +* Fs) if there is no LB rule. */ -#define HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV6 UINT32_C(0x10) -/* +uint16_t mru; +/* The maximum receive unit of the vnic. */ +uint8_t unused_0; +uint8_t unused_1; +uint32_t flags; +/* +* When this bit is '1', the VNIC is the default VNIC for the +* function. +*/ +#define HWRM_VNIC_QCFG_OUTPUT_FLAGS_DEFAULT UINT32_C(0x1) +/* +* When this bit is '1', the VNIC is configured to strip VLAN in +* the RX path. If set to '0', then VLAN stripping is disabled +* on this VNIC. +*/ +#define HWRM_VNIC_QCFG_OUTPUT_FLAGS_VLAN_STRIP_MODE UINT32_C(0x2) +/* +* When this bit is '1', the VNIC is configured to buffer +* receive packets in the hardware until the host posts new +* receive buffers. If set to '0', then bd_stall is disabled on +* this VNIC. +*/ +#define HWRM_VNIC_QCFG_OUTPUT_FLAGS_BD_STALL_MODE UINT32_C(0x4) +/* +* When this bit is '1', the VNIC is configured to receive both +* RoCE and non-RoCE traffic. If set to '0', then this VNIC is +* not configured to operate in dual VNIC mode. +*/ +#define HWRM_VNIC_QCFG_OUTPUT_FLAGS_ROCE_DUAL_VNIC_MODE UINT32_C(0x8) +/* +* When this flag is set to '1', the VNIC is configured to +* receive only RoCE traffic. When this flag is set to '0', the +* VNIC is not configured to receive only RoCE traffic. If +* roce_dual_vnic_mode flag and this flag both are set to '1', +* then it is an invalid configuration of the VNIC. The HWRM +* should not allow that type of mis-configuration by HWRM +* clients. +*/ +#define HWRM_VNIC_QCFG_OUTPUT_FLAGS_ROCE_ONLY_VNIC_MODE UINT32_C(0x10) +/* +* When a VNIC uses one destination ring group for certain +* application (e.g. Receive Flow Steering) where exact match is +* used to direct packets to a VNIC with one destination ring +* group only, there is no need to configure RSS indirection +* table for that VNIC as only one destination ring group is +* used. When this bit is set to '1', then the VNIC is enabled +* in a mode where RSS is enabled in the VNIC using a RSS +* context for computing RSS hash but the RSS indirection table +* is not configured. +*/ +#define HWRM_VNIC_QCFG_OUTPUT_FLAGS_RSS_DFLT_CR_MODE UINT32_C(0x20) +uint32_t unused_2; +uint8_t unused_3; +uint8_t unused_4; +uint8_t unused_5; +uint8_t valid; +/* +* This field is used in Output records to indicate that the +* output is completely written to RAM. This field should be +* read as '1' to indicate that the output has been completely +* written. When writing a command completion or response to an +* internal processor, the order of writes has to be such that +* this field is written last. +*/ +} __attribute__((packed)); + +/* hwrm_vnic_rss_cfg */ +/* Description: This function is used to enable RSS configuration. */ +/* Input (48 bytes) */ +struct hwrm_vnic_rss_cfg_input { +uint16_t req_type; +/* +* This value indicates what type of request this is. The format +* for the rest of the command is determined by this field. +*/ +uint16_t cmpl_ring; +/* +* This value indicates the what completion ring the request +* will be optionally completed on. If the value is -1, then no +* CR completion will be generated. Any other value must be a +* valid CR ring_id value for this function. +*/ +uint16_t seq_id; +/* This value indicates the command sequence number. */ +uint16_t target_id; +/* +* Target ID of this command. 0x0 - 0xFFF8 - Used for function +* ids 0xFFF8 - 0xFFFE - Reserved for internal processors 0xFFFF +* - HWRM +*/ +uint64_t resp_addr; +/* +* This is the host address where the response will be written +* when the request is complete. This area must be 16B aligned +* and must be cleared to zero before the request is made. +*/ +uint32_t hash_type; +/* +* When this bit is '1', the RSS hash shall be computed over +* source and destination IPv4 addresses of IPv4 packets. +*/ +#define HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV4 UINT32_C(0x1) +/* +* When this bit is '1', the RSS hash shall be computed over +* source/destination IPv4 addresses and source/destination +* ports of TCP/IPv4 packets. +*/ +#define HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV4 UINT32_C(0x2) +/* +* When this bit is '1', the RSS hash shall be computed over +* source/destination IPv4 addresses and source/destination +* ports of UDP/IPv4 packets. +*/ +#define HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV4 UINT32_C(0x4) +/* +* When this bit is '1', the RSS hash shall be computed over +* source and destination IPv4 addresses of IPv6 packets. +*/ +#define HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV6 UINT32_C(0x8) +/* +* When this bit is '1', the RSS hash shall be computed over +* source/destination IPv6 addresses and source/destination +* ports of TCP/IPv6 packets. +*/ +#define HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV6 UINT32_C(0x10) +/* * When this bit is '1', the RSS hash shall be computed over * source/destination IPv6 addresses and source/destination * ports of UDP/IPv6 packets.
@@ -4473,8 +5435,296 @@ struct hwrm_vnic_rss_cfg_output {*/ } __attribute__((packed)); +/* hwrm_vnic_plcmodes_cfg */ +/* +* Description: This function can be used to set placement mode configuration of +* the VNIC. +*/ +/* Input (40 bytes) */ + +struct hwrm_vnic_plcmodes_cfg_input { +uint16_t req_type; +/* +* This value indicates what type of request this is. The format for the +* rest of the command is determined by this field. +*/ +uint16_t cmpl_ring; +/* +* This value indicates the what completion ring the request will be +* optionally completed on. If the value is -1, then no CR completion +* will be generated. Any other value must be a valid CR ring_id value +* for this function. +*/ +uint16_t seq_id; +/* This value indicates the command sequence number. */ +uint16_t target_id; +/* +* Target ID of this command. 0x0 - 0xFFF8 - Used for function ids +* 0xFFF8 - 0xFFFE - Reserved for internal processors 0xFFFF - HWRM +*/ +uint64_t resp_addr; +/* +* This is the host address where the response will be written when the +* request is complete. This area must be 16B aligned and must be +* cleared to zero before the request is made. +*/ +uint32_t flags; +/* +* When this bit is '1', the VNIC shall be configured to use regular +* placement algorithm. By default, the regular placement algorithm +* shall be enabled on the VNIC. +*/ +#define HWRM_VNIC_PLCMODES_CFG_INPUT_FLAGS_REGULAR_PLACEMENT \ + UINT32_C(0x1) +/* +* When this bit is '1', the VNIC shall be configured use the jumbo +* placement algorithm. +*/ +#define HWRM_VNIC_PLCMODES_CFG_INPUT_FLAGS_JUMBO_PLACEMENT \ + UINT32_C(0x2) +/* +* When this bit is '1', the VNIC shall be configured to enable Header- +* Data split for IPv4 packets according to the following rules: # If +* the packet is identified as TCP/IPv4, then the packet is split at the +* beginning of the TCP payload. # If the packet is identified as +* UDP/IPv4, then the packet is split at the beginning of UDP payload. # +* If the packet is identified as non-TCP and non-UDP IPv4 packet, then +* the packet is split at the beginning of the upper layer protocol +* header carried in the IPv4 packet. +*/ +#define HWRM_VNIC_PLCMODES_CFG_INPUT_FLAGS_HDS_IPV4 UINT32_C(0x4) +/* +* When this bit is '1', the VNIC shall be configured to enable Header- +* Data split for IPv6 packets according to the following rules: # If +* the packet is identified as TCP/IPv6, then the packet is split at the +* beginning of the TCP payload. # If the packet is identified as +* UDP/IPv6, then the packet is split at the beginning of UDP payload. # +* If the packet is identified as non-TCP and non-UDP IPv6 packet, then +* the packet is split at the beginning of the upper layer protocol +* header carried in the IPv6 packet. +*/ +#define HWRM_VNIC_PLCMODES_CFG_INPUT_FLAGS_HDS_IPV6 UINT32_C(0x8) +/* +* When this bit is '1', the VNIC shall be configured to enable Header- +* Data split for FCoE packets at the beginning of FC payload. +*/ +#define HWRM_VNIC_PLCMODES_CFG_INPUT_FLAGS_HDS_FCOE UINT32_C(0x10) +/* +* When this bit is '1', the VNIC shall be configured to enable Header- +* Data split for RoCE packets at the beginning of RoCE payload (after +* BTH/GRH headers). +*/ +#define HWRM_VNIC_PLCMODES_CFG_INPUT_FLAGS_HDS_ROCE UINT32_C(0x20) +uint32_t enables; +/* +* This bit must be '1' for the jumbo_thresh_valid field to be +* configured. +*/ +#define HWRM_VNIC_PLCMODES_CFG_INPUT_ENABLES_JUMBO_THRESH_VALID \ + UINT32_C(0x1) +/* +* This bit must be '1' for the hds_offset_valid field to be configured. +*/ +#define HWRM_VNIC_PLCMODES_CFG_INPUT_ENABLES_HDS_OFFSET_VALID \ + UINT32_C(0x2) +/* +* This bit must be '1' for the hds_threshold_valid field to be +* configured. +*/ +#define HWRM_VNIC_PLCMODES_CFG_INPUT_ENABLES_HDS_THRESHOLD_VALID \ + UINT32_C(0x4) +uint32_t vnic_id; +/* Logical vnic ID */ +uint16_t jumbo_thresh; +/* +* When jumbo placement algorithm is enabled, this value is used to +* determine the threshold for jumbo placement. Packets with length +* larger than this value will be placed according to the jumbo +* placement algorithm. +*/ +uint16_t hds_offset; +/* +* This value is used to determine the offset into packet buffer where +* the split data (payload) will be placed according to one of of HDS +* placement algorithm. The lengths of packet buffers provided for split +* data shall be larger than this value. +*/ +uint16_t hds_threshold; +/* +* When one of the HDS placement algorithm is enabled, this value is +* used to determine the threshold for HDS placement. Packets with +* length larger than this value will be placed according to the HDS +* placement algorithm. This value shall be in multiple of 4 bytes. +*/ +uint16_t unused_0[3 ]; +} __attribute__((packed)); + +/* Output (16 bytes) */ + +struct hwrm_vnic_plcmodes_cfg_output { +uint16_t error_code; +/* +* Pass/Fail or error type Note: receiver to verify the in parameters, +* and fail the call with an error when appropriate +*/ +uint16_t req_type; +/* This field returns the type of original request. */ +uint16_t seq_id; +/* This field provides original sequence number of the command. */ +uint16_t resp_len; +/* +* This field is the length of the response in bytes. The last byte of +* the response is a valid flag that will read as '1' when the command +* has been completely written to memory. +*/ +uint32_t unused_0; +uint8_t unused_1; +uint8_t unused_2; +uint8_t unused_3; +uint8_t valid; +/* +* This field is used in Output records to indicate that the output is +* completely written to RAM. This field should be read as '1' to +* indicate that the output has been completely written. When writing a +* command completion or response to an internal processor, the order of +* writes has to be such that this field is written last. +*/ +} __attribute__((packed)); + +/* hwrm_vnic_plcmodes_qcfg */ +/* +* Description: This function can be used to query placement mode configuration +* of the VNIC. +*/ +/* Input (24 bytes) */ + +struct hwrm_vnic_plcmodes_qcfg_input { +uint16_t req_type; +/* +* This value indicates what type of request this is. The format for the +* rest of the command is determined by this field. +*/ +uint16_t cmpl_ring; +/* +* This value indicates the what completion ring the request will be +* optionally completed on. If the value is -1, then no CR completion +* will be generated. Any other value must be a valid CR ring_id value +* for this function. +*/ +uint16_t seq_id; +/* This value indicates the command sequence number. */ +uint16_t target_id; +/* +* Target ID of this command. 0x0 - 0xFFF8 - Used for function ids +* 0xFFF8 - 0xFFFE - Reserved for internal processors 0xFFFF - HWRM +*/ +uint64_t resp_addr; +/* +* This is the host address where the response will be written when the +* request is complete. This area must be 16B aligned and must be +* cleared to zero before the request is made. +*/ +uint32_t vnic_id; +/* Logical vnic ID */ +uint32_t unused_0; +} __attribute__((packed)); + +/* Output (24 bytes) */ + +struct hwrm_vnic_plcmodes_qcfg_output { +uint16_t error_code; +/* +* Pass/Fail or error type Note: receiver to verify the in parameters, +* and fail the call with an error when appropriate +*/ +uint16_t req_type; +/* This field returns the type of original request. */ +uint16_t seq_id; +/* This field provides original sequence number of the command. */ +uint16_t resp_len; +/* +* This field is the length of the response in bytes. The last byte of +* the response is a valid flag that will read as '1' when the command +* has been completely written to memory. +*/ +uint32_t flags; +/* +* When this bit is '1', the VNIC is configured to use regular placement +* algorithm. +*/ +#define HWRM_VNIC_PLCMODES_QCFG_OUTPUT_FLAGS_REGULAR_PLACEMENT \ + UINT32_C(0x1) +/* +* When this bit is '1', the VNIC is configured to use the jumbo +* placement algorithm. +*/ +#define HWRM_VNIC_PLCMODES_QCFG_OUTPUT_FLAGS_JUMBO_PLACEMENT \ + UINT32_C(0x2) +/* +* When this bit is '1', the VNIC is configured to enable Header-Data +* split for IPv4 packets. +*/ +#define HWRM_VNIC_PLCMODES_QCFG_OUTPUT_FLAGS_HDS_IPV4 UINT32_C(0x4) +/* +* When this bit is '1', the VNIC is configured to enable Header-Data +* split for IPv6 packets. +*/ +#define HWRM_VNIC_PLCMODES_QCFG_OUTPUT_FLAGS_HDS_IPV6 UINT32_C(0x8) +/* +* When this bit is '1', the VNIC is configured to enable Header-Data +* split for FCoE packets. +*/ +#define HWRM_VNIC_PLCMODES_QCFG_OUTPUT_FLAGS_HDS_FCOE UINT32_C(0x10) +/* +* When this bit is '1', the VNIC is configured to enable Header-Data +* split for RoCE packets. +*/ +#define HWRM_VNIC_PLCMODES_QCFG_OUTPUT_FLAGS_HDS_ROCE UINT32_C(0x20) +/* +* When this bit is '1', the VNIC is configured to be the default VNIC +* of the requesting function. +*/ +#define HWRM_VNIC_PLCMODES_QCFG_OUTPUT_FLAGS_DFLT_VNIC UINT32_C(0x40) +uint16_t jumbo_thresh; +/* +* When jumbo placement algorithm is enabled, this value is used to +* determine the threshold for jumbo placement. Packets with length +* larger than this value will be placed according to the jumbo +* placement algorithm. +*/ +uint16_t hds_offset; +/* +* This value is used to determine the offset into packet buffer where +* the split data (payload) will be placed according to one of of HDS +* placement algorithm. The lengths of packet buffers provided for split +* data shall be larger than this value. +*/ +uint16_t hds_threshold; +/* +* When one of the HDS placement algorithm is enabled, this value is +* used to determine the threshold for HDS placement. Packets with +* length larger than this value will be placed according to the HDS +* placement algorithm. This value shall be in multiple of 4 bytes. +*/ +uint8_t unused_0; +uint8_t unused_1; +uint8_t unused_2; +uint8_t unused_3; +uint8_t unused_4; +uint8_t valid; +/* +* This field is used in Output records to indicate that the output is +* completely written to RAM. This field should be read as '1' to +* indicate that the output has been completely written. When writing a +* command completion or response to an internal processor, the order of +* writes has to be such that this field is written last. +*/ +} __attribute__((packed)); +/* hwrm_vnic_rss_cos_lb_ctx_alloc */ -/* Description: This function is used to allocate COS/Load Balance context. */ +/* +* Description: This function is used to allocate COS/Load Balance context. +*/ /* Input (16 bytes) */ struct hwrm_vnic_rss_cos_lb_ctx_alloc_input {uint16_t req_type;
@@ -6040,4 +7290,91 @@ struct hwrm_exec_fwd_resp_output {*/ } __attribute__((packed)); +/* hwrm_reject_fwd_resp */ +/* +* Description: This command is used to send an encapsulated request to the +* HWRM. This command instructs the HWRM to reject the request and forward the +* error response of the encapsulated request to the location specified in the +* original request that is encapsulated. The target id of this command shall be +* set to 0xFFFF (HWRM). The response location in this command shall be used to +* acknowledge the receipt of the encapsulated request and forwarding of the +* response. +*/ +/* Input (128 bytes) */ +struct hwrm_reject_fwd_resp_input { +uint16_t req_type; +/* +* This value indicates what type of request this is. The format +* for the rest of the command is determined by this field. +*/ +uint16_t cmpl_ring; +/* +* This value indicates the what completion ring the request +* will be optionally completed on. If the value is -1, then no +* CR completion will be generated. Any other value must be a +* valid CR ring_id value for this function. +*/ +uint16_t seq_id; +/* This value indicates the command sequence number. */ +uint16_t target_id; +/* +* Target ID of this command. 0x0 - 0xFFF8 - Used for function +* ids 0xFFF8 - 0xFFFE - Reserved for internal processors 0xFFFF +* - HWRM +*/ +uint64_t resp_addr; +/* +* This is the host address where the response will be written +* when the request is complete. This area must be 16B aligned +* and must be cleared to zero before the request is made. +*/ +uint32_t encap_request[26 ]; +/* +* This is an encapsulated request. This request should be +* rejected by the HWRM and the error response should be +* provided in the response buffer inside the encapsulated +* request. +*/ +uint16_t encap_resp_target_id; +/* +* This value indicates the target id of the response to the +* encapsulated request. 0x0 - 0xFFF8 - Used for function ids +* 0xFFF8 - 0xFFFE - Reserved for internal processors 0xFFFF - +* HWRM +*/ +uint16_t unused_0[3 ]; +} __attribute__((packed)); + +/* Output (16 bytes) */ +struct hwrm_reject_fwd_resp_output { +uint16_t error_code; +/* +* Pass/Fail or error type Note: receiver to verify the in +* parameters, and fail the call with an error when appropriate +*/ +uint16_t req_type; +/* This field returns the type of original request. */ +uint16_t seq_id; +/* This field provides original sequence number of the command. */ +uint16_t resp_len; +/* +* This field is the length of the response in bytes. The last +* byte of the response is a valid flag that will read as '1' +* when the command has been completely written to memory. +*/ +uint32_t unused_0; +uint8_t unused_1; +uint8_t unused_2; +uint8_t unused_3; +uint8_t valid; +/* +* This field is used in Output records to indicate that the +* output is completely written to RAM. This field should be +* read as '1' to indicate that the output has been completely +* written. When writing a command completion or response to an +* internal processor, the order of writes has to be such that +* this field is written last. +*/ +} __attribute__((packed)); +#endif
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 2/23 bnxt: code reorg to properly allocate resources in PF/VF modes
In reply to Ajit Khaparde1) Move the function reset to bnxt_dev_init()
2) After a function reset, configure the VFs. Distribute resources evenly between all functions (PF and VF) for now. In the future, this should be controllable.
3) Since PF/VF need to allocate resources from a pool in the hardware, use func_qcaps and func_qcfg to appropriately query the capabilities and available resources.
4) If a PF is being initialized and no VFs are allocated, explicitly call func_cfg to allocate the resources.
5) The bnxt_vf_info and bnxt_pf_info had lot of duplication. Move the common items to struct bnxt. And only unique items specific to PF remain in the struct bnxt_pf_info.
6) Once resources are requested from the firmware, update local copy of resource count in struct bnxt only after sending the func_qcfg to make sure the allocation request in the firmware went through.
7) Do not initialize the default completion ring in bnxt_alloc_hwrm_rings().
--- drivers/net/bnxt/bnxt.h | 81 +++-- drivers/net/bnxt/bnxt_cpr.c | 128 +++++-- drivers/net/bnxt/bnxt_cpr.h | 17 + drivers/net/bnxt/bnxt_ethdev.c | 187 +++++++--- drivers/net/bnxt/bnxt_filter.c | 36 +- drivers/net/bnxt/bnxt_hwrm.c | 760 +++++++++++++++++++++++++++++++++++++---- drivers/net/bnxt/bnxt_hwrm.h | 20 +- drivers/net/bnxt/bnxt_irq.c | 21 +- drivers/net/bnxt/bnxt_ring.c | 17 +- drivers/net/bnxt/bnxt_vnic.c | 47 +-- drivers/net/bnxt/bnxt_vnic.h | 11 +- 11 files changed, 1045 insertions(+), 280 deletions(-)
drivers/net/bnxt/bnxt.h +60 -21
@@ -35,6 +35,7 @@#define _BNXT_H_#include <inttypes.h> +#include <stdbool.h> #include <sys/queue.h> #include <rte_ethdev.h>
@@ -54,17 +55,19 @@ enum bnxt_hw_context { HW_CONTEXT_IS_LB = 3, }; -struct bnxt_vf_info { -uint16_t fw_fid; -uint8_t mac_addr[ETHER_ADDR_LEN ]; -uint16_t max_rsscos_ctx; -uint16_t max_cp_rings; -uint16_t max_tx_rings; -uint16_t max_rx_rings; -uint16_t max_l2_ctx; -uint16_t max_vnics; -uint16_t vlan; -struct bnxt_pf_info *pf; +struct bnxt_vlan_table_entry { +uint16_t tpid; +uint16_t vid; +} __attribute__((packed)); + +struct bnxt_child_vf_info { +void *req_buf; +struct bnxt_vlan_table_entry *vlan_table; + STAILQ_HEAD(, bnxt_filter_info) filter; +uint32_t func_cfg_flags; +uint32_t l2_rx_mask; +uint16_t fid; +bool random_mac; };struct bnxt_pf_info {
@@ -73,22 +76,20 @@ struct bnxt_pf_info {#define BNXT_FIRST_VF_FID 128#define BNXT_PF_RINGS_USED (bp) bnxt_get_num_queues(bp)#define BNXT_PF_RINGS_AVAIL (bp) (bp->pf.max_cp_rings - BNXT_PF_RINGS_USED(bp)) -uint32_t fw_fid;uint8_t port_id; -uint8_t mac_addr[ETHER_ADDR_LEN ]; -uint16_t max_rsscos_ctx; -uint16_t max_cp_rings; -uint16_t max_tx_rings; -uint16_t max_rx_rings; -uint16_t max_l2_ctx; -uint16_t max_vnics;uint16_t first_vf_id;uint16_t active_vfs;uint16_t max_vfs; +uint32_t func_cfg_flags;void *vf_req_buf;phys_addr_t vf_req_buf_dma_addr;uint32_t vf_req_fwd[8 ]; -struct bnxt_vf_info *vf; +uint16_t total_vnics; +struct bnxt_child_vf_info *vf_info; +#define BNXT_EVB_MODE_NONE 0 +#define BNXT_EVB_MODE_VEB 1 +#define BNXT_EVB_MODE_VEPA 2 +uint8_t evb_mode; };/* Max wait time is 10 * 100ms = 1s */
@@ -174,12 +175,50 @@ struct bnxt {struct bnxt_link_info link_info;struct bnxt_cos_queue_info cos_queue[BNXT_COS_QUEUE_COUNT ]; +uint16_t fw_fid; +uint8_t dflt_mac_addr[ETHER_ADDR_LEN ]; +uint16_t max_rsscos_ctx; +uint16_t max_cp_rings; +uint16_t max_tx_rings; +uint16_t max_rx_rings; +uint16_t max_l2_ctx; +uint16_t max_vnics; +uint16_t max_stat_ctx; +uint16_t vlan;struct bnxt_pf_info pf; -struct bnxt_vf_info vf;uint8_t port_partition_type;uint8_t dev_stopped; + uint32_t fw_ver; +}; + +/* +* Response sent back to the caller after callback +*/ +enum rte_pmd_bnxt_mb_event_rsp { +RTE_PMD_BNXT_MB_EVENT_NOOP_ACK ,/**< skip mbox request and ACK */ +RTE_PMD_BNXT_MB_EVENT_NOOP_NACK ,/**< skip mbox request and NACK */ +RTE_PMD_BNXT_MB_EVENT_PROCEED ,/**< proceed with mbox request */ +RTE_PMD_BNXT_MB_EVENT_MAX /**< max value of this enum */ +}; + +/* mailbox message types */ +#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 */ +/* TODO expose more */ + +/* +* Data sent to the caller when the callback is executed. +*/ +struct rte_pmd_bnxt_mb_event_param { +uint16_t vf_id;/* Virtual Function number */ +int retval;/* return value */ +void *msg;/* pointer to message */ };int bnxt_link_update_op (struct rte_eth_dev *eth_dev,int wait_to_complete); +int bnxt_rcv_msg_from_vf (struct bnxt *bp,uint16_t vf_id,void *msg);#endif
drivers/net/bnxt/bnxt_cpr.c +92 -36
148 lines not on this page · raw message
drivers/net/bnxt/bnxt_cpr.h +17 -0
@@ -33,6 +33,7 @@#ifndef _BNXT_CPR_H_#define _BNXT_CPR_H_ +#include <stdbool.h> #include <rte_io.h>
@@ -56,6 +57,19 @@ RING_CMP(((cpr)->cp_ring_struct), raw_cons)), \ ((cpr)->cp_doorbell)) +#define B_CP_DB_ARM (cpr) rte_write32((DB_KEY_CP), ((cpr)->cp_doorbell)) +#define B_CP_DB_DISARM (cpr) (*(uint32_t *)((cpr)->cp_doorbell) = \ + DB_KEY_CP | DB_IRQ_DIS) + +#define B_CP_DB_IDX_ARM (cpr, cons) \ + (*(uint32_t *)((cpr)->cp_doorbell) = (DB_CP_REARM_FLAGS | \ + (cons))) + +#define B_CP_DB_IDX_DISARM (cpr, cons) do { \ + rte_smp_wmb(); \ + (*(uint32_t *)((cpr)->cp_doorbell) = (DB_CP_FLAGS | \ + (cons)); \ +} while (0)#define B_CP_DIS_DB (cpr, raw_cons) \ rte_write32((DB_CP_FLAGS | \ RING_CMP(((cpr)->cp_ring_struct), raw_cons)), \
@@ -75,6 +89,8 @@ struct bnxt_cp_ring_info {uint32_t hw_stats_ctx_id;struct bnxt_ring *cp_ring_struct; +uint16_t cp_cons; +bool v; };#define RX_CMP_L2_ERRORS \
@@ -82,6 +98,7 @@ struct bnxt_cp_ring_info {struct bnxt ; +int bnxt_alloc_def_cp_ring (struct bnxt *bp);void bnxt_free_def_cp_ring (struct bnxt *bp);int bnxt_init_def_ring_struct (struct bnxt *bp,unsigned int socket_id);void bnxt_handle_async_event (struct bnxt *bp,struct cmpl_base *cmp);
drivers/net/bnxt/bnxt_ethdev.c +131 -56
319 lines not on this page · raw message
drivers/net/bnxt/bnxt_filter.c +6 -30
@@ -73,19 +73,11 @@ void bnxt_init_filters(struct bnxt *bp)struct bnxt_filter_info *filter;int i, max_filters; -if (BNXT_PF (bp)) { -struct bnxt_pf_info *pf = &bp->pf; - - max_filters = pf->max_l2_ctx; - }else { -struct bnxt_vf_info *vf = &bp->vf; - - max_filters = vf->max_l2_ctx; - } + max_filters = bp->max_l2_ctx;STAILQ_INIT (&bp->free_filter_list);for (i =0 ; i < max_filters; i++) { filter = &bp->filter_info[i]; - filter->fw_l2_filter_id =-1 ; + filter->fw_l2_filter_id =UINT64_MAX ;STAILQ_INSERT_TAIL (&bp->free_filter_list, filter, next); } }
@@ -122,15 +114,7 @@ void bnxt_free_filter_mem(struct bnxt *bp)return ;/* Ensure that all filters are freed */ -if (BNXT_PF (bp)) { -struct bnxt_pf_info *pf = &bp->pf; - - max_filters = pf->max_l2_ctx; - }else { -struct bnxt_vf_info *vf = &bp->vf; - - max_filters = vf->max_l2_ctx; - } + max_filters = bp->max_l2_ctx;for (i =0 ; i < max_filters; i++) { filter = &bp->filter_info[i];if (filter->fw_l2_filter_id != ((uint64_t )-1 )) {
@@ -142,7 +126,7 @@ void bnxt_free_filter_mem(struct bnxt *bp)"HWRM filter cannot be freed rc = %d\n" , rc); } - filter->fw_l2_filter_id =-1 ; + filter->fw_l2_filter_id =UINT64_MAX ; }STAILQ_INIT (&bp->free_filter_list);
@@ -155,21 +139,13 @@ int bnxt_alloc_filter_mem(struct bnxt *bp)struct bnxt_filter_info *filter_mem;uint16_t max_filters; -if (BNXT_PF (bp)) { -struct bnxt_pf_info *pf = &bp->pf; - - max_filters = pf->max_l2_ctx; - }else { -struct bnxt_vf_info *vf = &bp->vf; - - max_filters = vf->max_l2_ctx; - } + max_filters = bp->max_l2_ctx;/* Allocate memory for VNIC pool and filter pool */ filter_mem =rte_zmalloc ("bnxt_filter_info" , max_filters *sizeof (struct bnxt_filter_info ),0 );if (filter_mem ==NULL ) { -RTE_LOG (ERR ,PMD ,"Failed to alloc memory for %d filters" , +RTE_LOG (ERR ,PMD ,"Failed to alloc memory for %d filters\n" , max_filters);return -ENOMEM ; }
drivers/net/bnxt/bnxt_hwrm.c +689 -71
893 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +16 -4
@@ -51,14 +51,18 @@ int bnxt_hwrm_clear_filter(struct bnxt *bp,int bnxt_hwrm_set_filter (struct bnxt *bp,struct bnxt_vnic_info *vnic,struct bnxt_filter_info *filter); +int bnxt_hwrm_exec_fwd_resp (struct bnxt *bp,uint16_t target_id, +void *encaped,size_t ec_size); +int bnxt_hwrm_reject_fwd_resp (struct bnxt *bp,uint16_t target_id, +void *encaped,size_t ec_size); -int bnxt_hwrm_exec_fwd_resp (struct bnxt *bp,void *fwd_cmd); - -int bnxt_hwrm_func_driver_register (struct bnxt *bp,uint32_t flags, -uint32_t *vf_req_fwd); +int bnxt_hwrm_func_buf_rgtr (struct bnxt *bp); +int bnxt_hwrm_func_buf_unrgtr (struct bnxt *bp); +int bnxt_hwrm_func_driver_register (struct bnxt *bp);int bnxt_hwrm_func_qcaps (struct bnxt *bp);int bnxt_hwrm_func_reset (struct bnxt *bp);int bnxt_hwrm_func_driver_unregister (struct bnxt *bp,uint32_t flags); +int bnxt_hwrm_func_cfg_def_cp (struct bnxt *bp);int bnxt_hwrm_queue_qportcfg (struct bnxt *bp);
@@ -81,6 +85,8 @@ int bnxt_hwrm_ver_get(struct bnxt *bp);int bnxt_hwrm_vnic_alloc (struct bnxt *bp,struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_cfg (struct bnxt *bp,struct bnxt_vnic_info *vnic); +int bnxt_hwrm_vnic_qcfg (struct bnxt *bp,struct bnxt_vnic_info *vnic, +int16_t fw_vf_id);int bnxt_hwrm_vnic_ctx_alloc (struct bnxt *bp,struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_ctx_free (struct bnxt *bp,struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_free (struct bnxt *bp,struct bnxt_vnic_info *vnic);
@@ -101,5 +107,11 @@ int bnxt_alloc_hwrm_resources(struct bnxt *bp);int bnxt_get_hwrm_link_config (struct bnxt *bp,struct rte_eth_link *link);int bnxt_set_hwrm_link_config (struct bnxt *bp,bool link_up);int bnxt_hwrm_func_qcfg (struct bnxt *bp); +int bnxt_hwrm_allocate_pf_only (struct bnxt *bp); +int bnxt_hwrm_allocate_vfs (struct bnxt *bp,int num_vfs); +int bnxt_hwrm_func_vf_mac (struct bnxt *bp,uint16_t vf, +const uint8_t *mac_addr); +int bnxt_hwrm_func_qcfg_vf_default_mac (struct bnxt *bp,uint16_t vf, +struct ether_addr *mac);#endif
drivers/net/bnxt/bnxt_irq.c +16 -5
@@ -66,16 +66,26 @@ static void bnxt_int_handler(void *param)/* Handle any async event */ bnxt_handle_async_event (bp, cmp);break ; -case CMPL_BASE_TYPE_HWRM_FWD_RESP : +case CMPL_BASE_TYPE_HWRM_FWD_REQ :/* Handle HWRM forwarded responses */ bnxt_handle_fwd_req (bp, cmp);break ;default :/* Ignore any other events */ +if (cmp->type &rte_cpu_to_le_16 (0x01 )) { +if (!CMP_VALID (cmp, raw_cons, + cpr->cp_ring_struct)) + goto no_more; + } +RTE_LOG (INFO ,PMD , +"Ignoring %02x completion\n" ,CMP_TYPE (cmp));break ; } raw_cons =NEXT_RAW_CMP (raw_cons); - } + + }; +no_more: + cpr->cp_raw_cons = raw_cons;B_CP_DB_REARM (cpr, cpr->cp_raw_cons); }
@@ -102,14 +112,15 @@ void bnxt_disable_int(struct bnxt *bp)struct bnxt_cp_ring_info *cpr = bp->def_cp_ring;/* Only the default completion ring */ -B_CP_DIS_DB (cpr, cpr->cp_raw_cons); +if (cpr !=NULL && cpr->cp_doorbell !=NULL ) +B_CP_DB_DISARM (cpr); }void bnxt_enable_int (struct bnxt *bp) {struct bnxt_cp_ring_info *cpr = bp->def_cp_ring; -B_CP_DB_REARM (cpr, cpr->cp_raw_cons); +B_CP_DB_ARM (cpr); }int bnxt_setup_int (struct bnxt *bp)
@@ -136,7 +147,7 @@ int bnxt_setup_int(struct bnxt *bp)return 0 ; setup_exit: -RTE_LOG (ERR ,PMD ,"bnxt_irq_tbl setup failed" ); +RTE_LOG (ERR ,PMD ,"bnxt_irq_tbl setup failed\n" );return rc; }
drivers/net/bnxt/bnxt_ring.c +1 -16
@@ -213,21 +213,6 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)unsigned int i;int rc =0 ; -/* Default completion ring */ - { -struct bnxt_cp_ring_info *cpr = bp->def_cp_ring; -struct bnxt_ring *cp_ring = cpr->cp_ring_struct; - - rc =bnxt_hwrm_ring_alloc (bp, cp_ring, -HWRM_RING_ALLOC_INPUT_RING_TYPE_CMPL , -0 ,HWRM_NA_SIGNATURE ); -if (rc) - goto err_out; - cpr->cp_doorbell = pci_dev->mem_resource[2 ].addr; -B_CP_DIS_DB (cpr, cpr->cp_raw_cons); - bp->grp_info[0 ].cp_fw_ring_id = cp_ring->fw_ring_id; - } -for (i =0 ; i < bp->rx_cp_nr_rings; i++) {struct bnxt_rx_queue *rxq = bp->rx_queues[i];struct bnxt_cp_ring_info *cpr = rxq->cp_ring;
@@ -259,7 +244,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp) bp->grp_info[idx].rx_fw_ring_id = ring->fw_ring_id;B_RX_DB (rxr->rx_doorbell, rxr->rx_prod);if (bnxt_init_one_rx_ring (rxq)) { -RTE_LOG (ERR ,PMD ,"bnxt_init_one_rx_ring failed!" ); +RTE_LOG (ERR ,PMD ,"bnxt_init_one_rx_ring failed!\n" );bnxt_rx_queue_release_op (rxq);return -ENOMEM ; }
drivers/net/bnxt/bnxt_vnic.c +8 -39
79 lines not on this page · raw message
drivers/net/bnxt/bnxt_vnic.h +9 -2
@@ -42,8 +42,7 @@ struct bnxt_vnic_info {uint8_t ff_pool_idx;uint16_t fw_vnic_id;/* returned by Chimp during alloc */ -uint16_t fw_rss_cos_lb_ctx; -uint16_t ctx_is_rss_cos_lb; +uint16_t rss_rule;#define MAX_NUM_TRAFFIC_CLASSES 8#define MAX_NUM_RSS_QUEUES_PER_VNIC 16#define MAX_QUEUES_PER_VNIC (MAX_NUM_RSS_QUEUES_PER_VNIC + \
@@ -51,6 +50,8 @@ struct bnxt_vnic_info {uint16_t start_grp_id;uint16_t end_grp_id;uint16_t fw_grp_ids[MAX_QUEUES_PER_VNIC ]; +uint16_t dflt_ring_grp; +uint16_t mru;uint16_t hash_type;phys_addr_t rss_table_dma_addr;uint16_t *rss_table;
@@ -60,8 +61,14 @@ struct bnxt_vnic_info {#define BNXT_VNIC_INFO_PROMISC (1 << 0)#define BNXT_VNIC_INFO_ALLMULTI (1 << 1) +uint16_t cos_rule; +uint16_t lb_rule;bool vlan_strip;bool func_default; +bool bd_stall; +bool roce_dual; +bool roce_only; +bool rss_dflt_cr; STAILQ_HEAD(, bnxt_filter_info) filter; };
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 3/23 bnxt: add tunneling support
In reply to Ajit KhapardeAdd support for udp_tunnel_port_add/del dev_ops to configure a UDP port for VXLAN and Geneve Tunnel protocols.
The HWRM supports only one global destination port for a tunnel type, use a referene counter to keep track of its usage.
Cache the configured VXLAN/Geneve ports and use that value to check if the right UDP port is being freed up.
Skip calling bnxt_hwrm_tunnel_dst_port_alloc if the same UDP port is being programmed.
Skip calling bnxt_hwrm_tunnel_dst_port_free if no UDP port has been configured.
Also update tx offload capabilities
--- drivers/net/bnxt/bnxt.h | 6 + drivers/net/bnxt/bnxt_ethdev.c | 119 +++++++++++++- drivers/net/bnxt/bnxt_hwrm.c | 56 +++++++ drivers/net/bnxt/bnxt_hwrm.h | 5 + drivers/net/bnxt/bnxt_txr.c | 3 +- drivers/net/bnxt/hsi_struct_def_dpdk.h | 273 +++++++++++++++++++++++++++++++++ 6 files changed, 460 insertions(+), 2 deletions(-)
drivers/net/bnxt/bnxt.h +6 -0
@@ -188,6 +188,12 @@ struct bnxt {struct bnxt_pf_info pf;uint8_t port_partition_type;uint8_t dev_stopped; +uint8_t vxlan_port_cnt; +uint8_t geneve_port_cnt; +uint16_t vxlan_port; +uint16_t geneve_port; +uint16_t vxlan_fw_dst_port_id; +uint16_t geneve_fw_dst_port_id;uint32_t fw_ver; };
drivers/net/bnxt/bnxt_ethdev.c +118 -1
137 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.c +56 -0
74 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +5 -0
@@ -113,5 +113,10 @@ int bnxt_hwrm_func_vf_mac(struct bnxt *bp, uint16_t vf, const uint8_t *mac_addr);int bnxt_hwrm_func_qcfg_vf_default_mac (struct bnxt *bp,uint16_t vf,struct ether_addr *mac); +int bnxt_hwrm_tunnel_dst_port_alloc (struct bnxt *bp,uint16_t port, +uint8_t tunnel_type); +int bnxt_hwrm_tunnel_dst_port_free (struct bnxt *bp,uint16_t port, +uint8_t tunnel_type); +void bnxt_free_tunnel_ports (struct bnxt *bp);#endif
drivers/net/bnxt/bnxt_txr.c +2 -1
@@ -213,7 +213,8 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,/* TSO */ txbd1->lflags =TX_BD_LONG_LFLAGS_LSO ; txbd1->hdr_size = tx_pkt->l2_len + tx_pkt->l3_len + - tx_pkt->l4_len; + tx_pkt->l4_len + tx_pkt->outer_l2_len + + tx_pkt->outer_l3_len; txbd1->mss = tx_pkt->tso_segsz; } else if (tx_pkt->ol_flags & (PKT_TX_TCP_CKSUM |
drivers/net/bnxt/hsi_struct_def_dpdk.h +273 -0
279 lines not on this page · raw message
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 4/23 bnxt: support lack of huge pages
In reply to Ajit Khaparderte_malloc_virt2phy() does not return a physical address if huge pages aren't in use. Further, rte_memzone->phys_addr is not a physical address.
Use rte_mem_virt2phy() and manually lock pages to support lack of huge pages.
Also check the return value of rte_mem_virt2phy()
Verify the function returns an address. Otherwise return an error and log a message.
--- drivers/net/bnxt/bnxt_hwrm.c | 17 +++++++++++++++-- drivers/net/bnxt/bnxt_ring.c | 31 +++++++++++++++++++++++++------ drivers/net/bnxt/bnxt_vnic.c | 16 +++++++++++++++- 3 files changed, 55 insertions(+), 9 deletions(-)
drivers/net/bnxt/bnxt_hwrm.c +15 -2
@@ -487,8 +487,15 @@ int bnxt_hwrm_ver_get(struct bnxt *bp) rc = -ENOMEM ; goto error; } +rte_mem_lock_page (bp->hwrm_cmd_resp_addr); bp->hwrm_cmd_resp_dma_addr = -rte_malloc_virt2phy (bp->hwrm_cmd_resp_addr); +rte_mem_virt2phy (bp->hwrm_cmd_resp_addr); +if (bp->hwrm_cmd_resp_dma_addr ==0 ) { +RTE_LOG (ERR ,PMD , +"Unable to map response buffer to physical memory.\n" ); + rc = -ENOMEM ; + goto error; + } bp->max_resp_len = max_resp_len; }
@@ -1361,10 +1368,16 @@ int bnxt_alloc_hwrm_resources(struct bnxt *bp) bp->max_req_len =HWRM_MAX_REQ_LEN ; bp->max_resp_len =HWRM_MAX_RESP_LEN ; bp->hwrm_cmd_resp_addr =rte_malloc (type, bp->max_resp_len,0 ); +rte_mem_lock_page (bp->hwrm_cmd_resp_addr);if (bp->hwrm_cmd_resp_addr ==NULL )return -ENOMEM ; bp->hwrm_cmd_resp_dma_addr = -rte_malloc_virt2phy (bp->hwrm_cmd_resp_addr); +rte_mem_virt2phy (bp->hwrm_cmd_resp_addr); +if (bp->hwrm_cmd_resp_dma_addr ==0 ) { +RTE_LOG (ERR ,PMD , +"unable to map response address to physical memory\n" ); +return -ENOMEM ; + }rte_spinlock_init (&bp->hwrm_lock);return 0 ;
drivers/net/bnxt/bnxt_ring.c +25 -6
@@ -32,6 +32,7 @@*/ #include <rte_memzone.h> +#include <unistd.h> #include "bnxt.h" #include "bnxt_cpr.h"
@@ -96,6 +97,8 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,struct rte_pci_device *pdev = bp->pdev;const struct rte_memzone *mz =NULL ;char mz_name[RTE_MEMZONE_NAMESIZE ]; +phys_addr_t mz_phys_addr; +int sz;int stats_len = (tx_ring_info || rx_ring_info) ?RTE_CACHE_LINE_ROUNDUP (sizeof (struct ctx_hw_stats64 )) :0 ;
@@ -136,21 +139,37 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx, mz_name[RTE_MEMZONE_NAMESIZE -1 ] =0 ; mz =rte_memzone_lookup (mz_name);if (!mz) { - mz =rte_memzone_reserve (mz_name, total_alloc_len, + mz =rte_memzone_reserve_aligned (mz_name, total_alloc_len,SOCKET_ID_ANY ,RTE_MEMZONE_2MB | -RTE_MEMZONE_SIZE_HINT_ONLY ); +RTE_MEMZONE_SIZE_HINT_ONLY , +getpagesize ());if (mz ==NULL )return -ENOMEM ; }memset (mz->addr,0 , mz->len); + mz_phys_addr = mz->phys_addr; +if ((unsigned long )mz->addr == mz_phys_addr) { +RTE_LOG (WARNING ,PMD , +"Memzone physical address same as virtual.\n" ); +RTE_LOG (WARNING ,PMD , +"Using rte_mem_virt2phy()\n" ); +for (sz =0 ; sz < total_alloc_len; sz +=getpagesize ()) +rte_mem_lock_page (((char *)mz->addr) + sz); + mz_phys_addr =rte_mem_virt2phy (mz->addr); +if (mz_phys_addr ==0 ) { +RTE_LOG (ERR ,PMD , +"unable to map ring address to physical memory\n" ); +return -ENOMEM ; + } + }if (tx_ring_info) { tx_ring = tx_ring_info->tx_ring_struct; tx_ring->bd = ((char *)mz->addr + tx_ring_start); tx_ring_info->tx_desc_ring = (struct tx_bd_long *)tx_ring->bd; - tx_ring->bd_dma = mz->phys_addr + tx_ring_start; + tx_ring->bd_dma = mz_phys_addr + tx_ring_start; tx_ring_info->tx_desc_mapping = tx_ring->bd_dma; tx_ring->mem_zone = (const void *)mz;
@@ -170,7 +189,7 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx, rx_ring->bd = ((char *)mz->addr + rx_ring_start); rx_ring_info->rx_desc_ring = (struct rx_prod_pkt_bd *)rx_ring->bd; - rx_ring->bd_dma = mz->phys_addr + rx_ring_start; + rx_ring->bd_dma = mz_phys_addr + rx_ring_start; rx_ring_info->rx_desc_mapping = rx_ring->bd_dma; rx_ring->mem_zone = (const void *)mz;
@@ -185,7 +204,7 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx, } cp_ring->bd = ((char *)mz->addr + cp_ring_start); - cp_ring->bd_dma = mz->phys_addr + cp_ring_start; + cp_ring->bd_dma = mz_phys_addr + cp_ring_start; cp_ring_info->cp_desc_ring = cp_ring->bd; cp_ring_info->cp_desc_mapping = cp_ring->bd_dma; cp_ring->mem_zone = (const void *)mz;
@@ -196,7 +215,7 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx, *cp_ring->vmem = ((char *)mz->addr + stats_len);if (stats_len) { cp_ring_info->hw_stats = mz->addr; - cp_ring_info->hw_stats_map = mz->phys_addr; + cp_ring_info->hw_stats_map = mz_phys_addr; } cp_ring_info->hw_stats_ctx_id =HWRM_NA_SIGNATURE ;return 0 ;
drivers/net/bnxt/bnxt_vnic.c +15 -1
@@ -173,6 +173,7 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp) HW_HASH_KEY_SIZE);uint16_t max_vnics;int i; +phys_addr_t mz_phys_addr; max_vnics = bp->max_vnics; snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
@@ -189,6 +190,19 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)if (!mz)return -ENOMEM ; } + mz_phys_addr = mz->phys_addr; +if ((unsigned long )mz->addr == mz_phys_addr) { +RTE_LOG (WARNING ,PMD , +"Memzone physical address same as virtual.\n" ); +RTE_LOG (WARNING ,PMD , +"Using rte_mem_virt2phy()\n" ); + mz_phys_addr =rte_mem_virt2phy (mz->addr); +if (mz_phys_addr ==0 ) { +RTE_LOG (ERR ,PMD , +"unable to map vnic address to physical memory\n" ); +return -ENOMEM ; + } + }for (i =0 ; i < max_vnics; i++) { vnic = &bp->vnic_info[i];
@@ -198,7 +212,7 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp) (void *)((char *)mz->addr + (entry_length * i));memset (vnic->rss_table,-1 , entry_length); - vnic->rss_table_dma_addr = mz->phys_addr + (entry_length * i); + vnic->rss_table_dma_addr = mz_phys_addr + (entry_length * i); vnic->rss_hash_key = (void *)((char *)vnic->rss_table +HW_HASH_INDEX_SIZE *sizeof (*vnic->rss_table));
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 5/23 bnxt: add functions for tx_loopback, set_vf_mac and queues_drop_en
In reply to Ajit KhapardeAdd functions rte_pmd_bnxt_set_tx_loopback, rte_pmd_bnxt_set_all_queues_drop_en and rte_pmd_bnxt_set_vf_mac_addr to configure tx_loopback, queue_drop and VF MAC address setting in the hardware. It also adds the necessary functions to send the HWRM commands to the firmware.
--- drivers/net/bnxt/Makefile | 4 + drivers/net/bnxt/bnxt_hwrm.c | 108 ++++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 4 + drivers/net/bnxt/hsi_struct_def_dpdk.h | 79 +++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.c | 163 ++++++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 87 ++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 9 ++ 7 files changed, 454 insertions(+) create mode 100644 drivers/net/bnxt/rte_pmd_bnxt.c create mode 100644 drivers/net/bnxt/rte_pmd_bnxt.h
drivers/net/bnxt/Makefile +4 -0
@@ -38,6 +38,8 @@ include $(RTE_SDK)/mk/rte.vars.mk # LIB = librte_pmd_bnxt.a +EXPORT_MAP := rte_pmd_bnxt_version.map + LIBABIVER := 1 CFLAGS += -O3
@@ -60,10 +62,12 @@ SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_txq.c SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_txr.c SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_vnic.c SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_irq.c +SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += rte_pmd_bnxt.c # # Export include files # SYMLINK-y-include += +SYMLINK-$(CONFIG_RTE_LIBRTE_BNXT_PMD)-include := rte_pmd_bnxt.h include $(RTE_SDK)/mk/rte.lib.mk
drivers/net/bnxt/bnxt_hwrm.c +108 -0
117 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +4 -0
@@ -111,6 +111,7 @@ int bnxt_hwrm_allocate_pf_only(struct bnxt *bp);int bnxt_hwrm_allocate_vfs (struct bnxt *bp,int num_vfs);int bnxt_hwrm_func_vf_mac (struct bnxt *bp,uint16_t vf,const uint8_t *mac_addr); +int bnxt_hwrm_pf_evb_mode (struct bnxt *bp);int bnxt_hwrm_func_qcfg_vf_default_mac (struct bnxt *bp,uint16_t vf,struct ether_addr *mac); int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,
@@ -118,5 +119,8 @@ int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,int bnxt_hwrm_tunnel_dst_port_free (struct bnxt *bp,uint16_t port,uint8_t tunnel_type);void bnxt_free_tunnel_ports (struct bnxt *bp); +int bnxt_hwrm_func_vf_vnic_query_and_config (struct bnxt *bp,uint16_t vf, +void (*vnic_cb)(struct bnxt_vnic_info *,void *),void *cbdata, +int (*hwrm_cb)(struct bnxt *bp,struct bnxt_vnic_info *vnic));#endif
drivers/net/bnxt/hsi_struct_def_dpdk.h +79 -0
85 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt.c new file +163 -0
163 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt.h new file +87 -0
87 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt_version.map +9 -0
@@ -1,4 +1,13 @@ DPDK_16.04 { local: *; + +}; + +DPDK_17.08 { + global: + + rte_pmd_bnxt_set_tx_loopback; + rte_pmd_bnxt_set_all_queues_drop_en; + rte_pmd_bnxt_set_vf_mac_addr; };
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 6/23 bnxt: add support for set VF QOS and MAC anti spoof
In reply to Ajit KhapardeThis patch adds support to
1) enable VF MAC anti spoof.
2) QOS configuration for specified VF.
--- drivers/net/bnxt/bnxt.h | 2 + drivers/net/bnxt/bnxt_hwrm.c | 33 +++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 3 + drivers/net/bnxt/rte_pmd_bnxt.c | 95 +++++++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 37 ++++++++++++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 2 + 6 files changed, 172 insertions(+)
drivers/net/bnxt/bnxt.h +2 -0
@@ -67,6 +67,8 @@ struct bnxt_child_vf_info {uint32_t func_cfg_flags;uint32_t l2_rx_mask;uint16_t fid; +uint16_t max_tx_rate; +uint8_t mac_spoof_en;bool random_mac; };
drivers/net/bnxt/bnxt_hwrm.c +33 -0
@@ -2133,6 +2133,21 @@ int bnxt_hwrm_tunnel_dst_port_free(struct bnxt *bp, uint16_t port,return rc; } +int bnxt_hwrm_func_cfg_vf_set_flags (struct bnxt *bp,uint16_t vf) +{ +struct hwrm_func_cfg_output *resp = bp->hwrm_cmd_resp_addr; +struct hwrm_func_cfg_input req = {0 }; +int rc; + +HWRM_PREP (req,FUNC_CFG ,-1 , resp); + req.fid =rte_cpu_to_le_16 (bp->pf.vf_info[vf].fid); + req.flags =rte_cpu_to_le_32 (bp->pf.vf_info[vf].func_cfg_flags); + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); +HWRM_CHECK_RESULT ; + +return rc; +} +int bnxt_hwrm_func_buf_rgtr (struct bnxt *bp) {int rc =0 ;
@@ -2194,6 +2209,24 @@ int bnxt_hwrm_func_cfg_def_cp(struct bnxt *bp)return rc; } +int bnxt_hwrm_func_bw_cfg (struct bnxt *bp,uint16_t vf, +uint16_t max_bw,uint16_t enables) +{ +struct hwrm_func_cfg_output *resp = bp->hwrm_cmd_resp_addr; +struct hwrm_func_cfg_input req = {0 }; +int rc; + +HWRM_PREP (req,FUNC_CFG ,-1 , resp); + req.fid =rte_cpu_to_le_16 (bp->pf.vf_info[vf].fid); + req.enables |=rte_cpu_to_le_32 (enables); + req.flags =rte_cpu_to_le_32 (bp->pf.vf_info[vf].func_cfg_flags); + req.max_bw =rte_cpu_to_le_32 (max_bw); + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); +HWRM_CHECK_RESULT ; + +return rc; +} +int bnxt_hwrm_reject_fwd_resp (struct bnxt *bp,uint16_t target_id,void *encaped,size_t ec_size) {
drivers/net/bnxt/bnxt_hwrm.h +3 -0
@@ -112,6 +112,8 @@ int bnxt_hwrm_allocate_vfs(struct bnxt *bp, int num_vfs);int bnxt_hwrm_func_vf_mac (struct bnxt *bp,uint16_t vf,const uint8_t *mac_addr);int bnxt_hwrm_pf_evb_mode (struct bnxt *bp); +int bnxt_hwrm_func_bw_cfg (struct bnxt *bp,uint16_t vf, +uint16_t max_bw,uint16_t enables);int bnxt_hwrm_func_qcfg_vf_default_mac (struct bnxt *bp,uint16_t vf,struct ether_addr *mac); int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,
@@ -119,6 +121,7 @@ int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,int bnxt_hwrm_tunnel_dst_port_free (struct bnxt *bp,uint16_t port,uint8_t tunnel_type);void bnxt_free_tunnel_ports (struct bnxt *bp); +int bnxt_hwrm_func_cfg_vf_set_flags (struct bnxt *bp,uint16_t vf);int bnxt_hwrm_func_vf_vnic_query_and_config (struct bnxt *bp,uint16_t vf,void (*vnic_cb)(struct bnxt_vnic_info *,void *),void *cbdata,int (*hwrm_cb)(struct bnxt *bp,struct bnxt_vnic_info *vnic));
drivers/net/bnxt/rte_pmd_bnxt.c +95 -0
98 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt.h +37 -0
@@ -37,6 +37,24 @@#include <rte_ethdev.h> /** +* Enable/Disable VF MAC anti spoof +* +* @param port +* The port identifier of the Ethernet device. +* @param vf +* VF id. +* @param on +* 1 - Enable VF MAC anti spoof. +* 0 - Disable VF MAC anti spoof. +* +* @return +* - (0) if successful. +* - (-ENODEV) if *port* invalid. +* - (-EINVAL) if bad parameter. +*/ +int rte_pmd_bnxt_set_vf_mac_anti_spoof (uint8_t port,uint16_t vf,uint8_t on); + +/** * Set the VF MAC address. * * @param port
@@ -84,4 +102,23 @@ int rte_pmd_bnxt_set_tx_loopback(uint8_t port, uint8_t on);* - (-EINVAL) if bad parameter. */ int rte_pmd_bnxt_set_all_queues_drop_en (uint8_t port,uint8_t on); + +/** +* Set the VF rate limit. +* +* @param port +* The port identifier of the Ethernet device. +* @param vf +* VF id. +* @param tx_rate +* Tx rate for the VF +* @param q_msk +* Mask of the Tx queue +* @return +* - (0) if successful. +* - (-ENODEV) if *port* invalid. +* - (-EINVAL) if *vf* or *mac_addr* is invalid. +*/ +int rte_pmd_bnxt_set_vf_rate_limit (uint8_t port,uint16_t vf, +uint16_t tx_rate,uint64_t q_msk);#endif /* _PMD_BNXT_H_ */
drivers/net/bnxt/rte_pmd_bnxt_version.map +2 -0
@@ -10,4 +10,6 @@ DPDK_17.08 { rte_pmd_bnxt_set_tx_loopback; rte_pmd_bnxt_set_all_queues_drop_en; rte_pmd_bnxt_set_vf_mac_addr; + rte_pmd_bnxt_set_vf_mac_anti_spoof; + rte_pmd_bnxt_set_vf_rate_limit; };
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 7/23 bnxt: add support for VLAN stripq, VLAN anti spoof and VLAN filtering for VFs
In reply to Ajit KhapardeThis patch adds support for VF VLAN stripq, VF VLAN anti spoof and VF VLAN filtering.
The VF VLAN filtering needs the VLAN anti spoof setting to be set first before the command to program the VLAN table is sent to the firmware.
--- drivers/net/bnxt/bnxt.h | 2 + drivers/net/bnxt/bnxt_ethdev.c | 12 +-- drivers/net/bnxt/bnxt_filter.h | 2 + drivers/net/bnxt/bnxt_hwrm.c | 89 ++++++++++++++- drivers/net/bnxt/bnxt_hwrm.h | 9 +- drivers/net/bnxt/rte_pmd_bnxt.c | 174 ++++++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 60 +++++++++++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 3 + 8 files changed, 339 insertions(+), 12 deletions(-)
drivers/net/bnxt/bnxt.h +2 -0
@@ -68,7 +68,9 @@ struct bnxt_child_vf_info {uint32_t l2_rx_mask;uint16_t fid;uint16_t max_tx_rate; +uint16_t vlan_count;uint8_t mac_spoof_en; +uint8_t vlan_spoof_en;bool random_mac; };
drivers/net/bnxt/bnxt_ethdev.c +6 -6
@@ -278,7 +278,7 @@ static int bnxt_init_chip(struct bnxt *bp) } } } - rc =bnxt_hwrm_cfa_l2_set_rx_mask (bp, &bp->vnic_info[0 ]); + rc =bnxt_hwrm_cfa_l2_set_rx_mask (bp, &bp->vnic_info[0 ],0 ,NULL );if (rc) {RTE_LOG (ERR ,PMD ,"HWRM cfa l2 rx mask failure rc: %x\n" , rc);
@@ -628,7 +628,7 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,STAILQ_INSERT_TAIL (&vnic->filter, filter, next); filter->mac_index = index;memcpy (filter->l2_addr, mac_addr,ETHER_ADDR_LEN ); -return bnxt_hwrm_set_filter (bp, vnic, filter); +return bnxt_hwrm_set_filter (bp, vnic->fw_vnic_id, filter); }int bnxt_link_update_op (struct rte_eth_dev *eth_dev,int wait_to_complete)
@@ -677,7 +677,7 @@ static void bnxt_promiscuous_enable_op(struct rte_eth_dev *eth_dev) vnic = &bp->vnic_info[0 ]; vnic->flags |=BNXT_VNIC_INFO_PROMISC ; -bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic); +bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic,0 ,NULL ); }static void bnxt_promiscuous_disable_op (struct rte_eth_dev *eth_dev)
@@ -691,7 +691,7 @@ static void bnxt_promiscuous_disable_op(struct rte_eth_dev *eth_dev) vnic = &bp->vnic_info[0 ]; vnic->flags &= ~BNXT_VNIC_INFO_PROMISC ; -bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic); +bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic,0 ,NULL ); }static void bnxt_allmulticast_enable_op (struct rte_eth_dev *eth_dev)
@@ -705,7 +705,7 @@ static void bnxt_allmulticast_enable_op(struct rte_eth_dev *eth_dev) vnic = &bp->vnic_info[0 ]; vnic->flags |=BNXT_VNIC_INFO_ALLMULTI ; -bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic); +bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic,0 ,NULL ); }static void bnxt_allmulticast_disable_op (struct rte_eth_dev *eth_dev)
@@ -719,7 +719,7 @@ static void bnxt_allmulticast_disable_op(struct rte_eth_dev *eth_dev) vnic = &bp->vnic_info[0 ]; vnic->flags &= ~BNXT_VNIC_INFO_ALLMULTI ; -bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic); +bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic,0 ,NULL ); } static int bnxt_reta_update_op(struct rte_eth_dev *eth_dev,
drivers/net/bnxt/bnxt_filter.h +2 -0
@@ -63,6 +63,8 @@ struct bnxt_filter_info {uint32_t vni;uint8_t pri_hint;uint64_t l2_filter_id_hint; +uint32_t src_id; +uint8_t src_type; };struct bnxt_filter_info *bnxt_alloc_filter (struct bnxt *bp);
drivers/net/bnxt/bnxt_hwrm.c +85 -4
128 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +7 -2
@@ -45,11 +45,13 @@ struct bnxt_cp_ring_info;int bnxt_hwrm_cfa_l2_clear_rx_mask (struct bnxt *bp,struct bnxt_vnic_info *vnic); -int bnxt_hwrm_cfa_l2_set_rx_mask (struct bnxt *bp,struct bnxt_vnic_info *vnic); +int bnxt_hwrm_cfa_l2_set_rx_mask (struct bnxt *bp,struct bnxt_vnic_info *vnic, +uint16_t vlan_count, +struct bnxt_vlan_table_entry *vlan_table);int bnxt_hwrm_clear_filter (struct bnxt *bp,struct bnxt_filter_info *filter);int bnxt_hwrm_set_filter (struct bnxt *bp, -struct bnxt_vnic_info *vnic, +uint16_t dst_id,struct bnxt_filter_info *filter);int bnxt_hwrm_exec_fwd_resp (struct bnxt *bp,uint16_t target_id,void *encaped,size_t ec_size);
@@ -125,5 +127,8 @@ int bnxt_hwrm_func_cfg_vf_set_flags(struct bnxt *bp, uint16_t vf);int bnxt_hwrm_func_vf_vnic_query_and_config (struct bnxt *bp,uint16_t vf,void (*vnic_cb)(struct bnxt_vnic_info *,void *),void *cbdata,int (*hwrm_cb)(struct bnxt *bp,struct bnxt_vnic_info *vnic)); +int bnxt_hwrm_func_cfg_vf_set_vlan_anti_spoof (struct bnxt *bp,uint16_t vf, +bool on); +int bnxt_hwrm_func_qcfg_vf_dflt_vnic_id (struct bnxt *bp,int vf);#endif
drivers/net/bnxt/rte_pmd_bnxt.c +174 -0
183 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt.h +60 -0
70 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt_version.map +3 -0
@@ -12,4 +12,7 @@ DPDK_17.08 { rte_pmd_bnxt_set_vf_mac_addr; rte_pmd_bnxt_set_vf_mac_anti_spoof; rte_pmd_bnxt_set_vf_rate_limit; + rte_pmd_bnxt_set_vf_vlan_stripq; + rte_pmd_bnxt_set_vf_vlan_filter; + rte_pmd_bnxt_set_vf_vlan_anti_spoof; };
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 8/23 bnxt: add support to get and clear VF specific stats
In reply to Ajit KhapardeThis patch adds code to get and clear VF stats.
It also adds the necessary HWRM structures to send the command to the firmware.
--- drivers/net/bnxt/bnxt_hwrm.c | 75 ++++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 5 + drivers/net/bnxt/hsi_struct_def_dpdk.h | 217 +++++++++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.c | 87 +++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 64 ++++++++++ 5 files changed, 448 insertions(+)
drivers/net/bnxt/bnxt_hwrm.c +75 -0
@@ -1164,6 +1164,81 @@ int bnxt_hwrm_func_vf_mac(struct bnxt *bp, uint16_t vf, const uint8_t *mac_addr)return rc; } +int bnxt_hwrm_func_qstats_tx_drop (struct bnxt *bp,uint16_t fid, +uint64_t *dropped) +{ +int rc =0 ; +struct hwrm_func_qstats_input req = {.req_type =0 }; +struct hwrm_func_qstats_output *resp = bp->hwrm_cmd_resp_addr; + +HWRM_PREP (req,FUNC_QSTATS ,-1 , resp); + + req.fid =rte_cpu_to_le_16 (fid); + + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); + +HWRM_CHECK_RESULT ; + +if (dropped) + *dropped =rte_le_to_cpu_64 (resp->tx_drop_pkts); + +return rc; +} + +int bnxt_hwrm_func_qstats (struct bnxt *bp,uint16_t fid, +struct rte_eth_stats *stats) +{ +int rc =0 ; +struct hwrm_func_qstats_input req = {.req_type =0 }; +struct hwrm_func_qstats_output *resp = bp->hwrm_cmd_resp_addr; + +HWRM_PREP (req,FUNC_QSTATS ,-1 , resp); + + req.fid =rte_cpu_to_le_16 (fid); + + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); + +HWRM_CHECK_RESULT ; + + stats->ipackets =rte_le_to_cpu_64 (resp->rx_ucast_pkts); + stats->ipackets +=rte_le_to_cpu_64 (resp->rx_mcast_pkts); + stats->ipackets +=rte_le_to_cpu_64 (resp->rx_bcast_pkts); + stats->ibytes =rte_le_to_cpu_64 (resp->rx_ucast_bytes); + stats->ibytes +=rte_le_to_cpu_64 (resp->rx_mcast_bytes); + stats->ibytes +=rte_le_to_cpu_64 (resp->rx_bcast_bytes); + + stats->opackets =rte_le_to_cpu_64 (resp->tx_ucast_pkts); + stats->opackets +=rte_le_to_cpu_64 (resp->tx_mcast_pkts); + stats->opackets +=rte_le_to_cpu_64 (resp->tx_bcast_pkts); + stats->obytes =rte_le_to_cpu_64 (resp->tx_ucast_bytes); + stats->obytes +=rte_le_to_cpu_64 (resp->tx_mcast_bytes); + stats->obytes +=rte_le_to_cpu_64 (resp->tx_bcast_bytes); + + stats->ierrors =rte_le_to_cpu_64 (resp->rx_err_pkts); + stats->oerrors =rte_le_to_cpu_64 (resp->tx_err_pkts); + + stats->imissed =rte_le_to_cpu_64 (resp->rx_drop_pkts); + +return rc; +} + +int bnxt_hwrm_func_clr_stats (struct bnxt *bp,uint16_t fid) +{ +int rc =0 ; +struct hwrm_func_clr_stats_input req = {.req_type =0 }; +struct hwrm_func_clr_stats_output *resp = bp->hwrm_cmd_resp_addr; + +HWRM_PREP (req,FUNC_CLR_STATS ,-1 , resp); + + req.fid =rte_cpu_to_le_16 (fid); + + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); + +HWRM_CHECK_RESULT ; + +return rc; +} +/* * HWRM utility functions */
drivers/net/bnxt/bnxt_hwrm.h +5 -0
@@ -64,6 +64,11 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp);int bnxt_hwrm_func_qcaps (struct bnxt *bp);int bnxt_hwrm_func_reset (struct bnxt *bp);int bnxt_hwrm_func_driver_unregister (struct bnxt *bp,uint32_t flags); +int bnxt_hwrm_func_qstats (struct bnxt *bp,uint16_t fid, +struct rte_eth_stats *stats); +int bnxt_hwrm_func_qstats_tx_drop (struct bnxt *bp,uint16_t fid, +uint64_t *dropped); +int bnxt_hwrm_func_clr_stats (struct bnxt *bp,uint16_t fid);int bnxt_hwrm_func_cfg_def_cp (struct bnxt *bp);int bnxt_hwrm_queue_qportcfg (struct bnxt *bp);
drivers/net/bnxt/hsi_struct_def_dpdk.h +217 -0
223 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt.c +87 -0
90 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt.h +64 -0
74 lines not on this page · raw message
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 9/23 bnxt: add code to determine the Rx status of VF
In reply to Ajit KhapardeThis patch adds code to determine the Rx status of a VF. It adds the rte_pmd_bnxt_get_vf_rx_status call, which calculates the VNIC count of the function to get the Rx status.
--- drivers/net/bnxt/bnxt_hwrm.c | 24 ++++++++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 1 + drivers/net/bnxt/rte_pmd_bnxt.c | 23 +++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 17 +++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 5 +++++ 5 files changed, 70 insertions(+)
drivers/net/bnxt/bnxt_hwrm.c +24 -0
@@ -2359,6 +2359,30 @@ int bnxt_hwrm_exec_fwd_resp(struct bnxt *bp, uint16_t target_id,return rc; } +static void bnxt_vnic_count (struct bnxt_vnic_info *vnic,void *cbdata) +{ +uint32_t *count = cbdata; + +if (vnic->func_default) + *count = *count +1 ; +} + +static int bnxt_vnic_count_hwrm_stub(struct bnxt *bp __rte_unused, + struct bnxt_vnic_info *vnic __rte_unused) +{ +return 0 ; +} + +int bnxt_vf_default_vnic_count (struct bnxt *bp,uint16_t vf) +{ +uint32_t count =0 ; + +bnxt_hwrm_func_vf_vnic_query_and_config (bp, vf, bnxt_vnic_count, + &count, bnxt_vnic_count_hwrm_stub); + +return count; +} +static int bnxt_hwrm_func_vf_vnic_query (struct bnxt *bp,uint16_t vf,uint16_t *vnic_ids) {
drivers/net/bnxt/bnxt_hwrm.h +1 -0
@@ -129,6 +129,7 @@ int bnxt_hwrm_tunnel_dst_port_free(struct bnxt *bp, uint16_t port, uint8_t tunnel_type);void bnxt_free_tunnel_ports (struct bnxt *bp);int bnxt_hwrm_func_cfg_vf_set_flags (struct bnxt *bp,uint16_t vf); +int bnxt_vf_default_vnic_count (struct bnxt *bp,uint16_t vf);int bnxt_hwrm_func_vf_vnic_query_and_config (struct bnxt *bp,uint16_t vf,void (*vnic_cb)(struct bnxt_vnic_info *,void *),void *cbdata,int (*hwrm_cb)(struct bnxt *bp,struct bnxt_vnic_info *vnic));
drivers/net/bnxt/rte_pmd_bnxt.c +23 -0
@@ -480,6 +480,29 @@ int rte_pmd_bnxt_reset_vf_stats(uint8_t port,return bnxt_hwrm_func_clr_stats (bp, bp->pf.first_vf_id + vf_id); } +int rte_pmd_bnxt_get_vf_rx_status (uint8_t port,uint16_t vf_id) +{ +struct rte_eth_dev *dev; +struct rte_eth_dev_info dev_info; +struct bnxt *bp; + + dev = &rte_eth_devices[port]; +rte_eth_dev_info_get (port, &dev_info); + bp = (struct bnxt *)dev->data->dev_private; + +if (vf_id >= dev_info.max_vfs) +return -EINVAL ; + +if (!BNXT_PF (bp)) { +RTE_LOG (ERR ,PMD , +"Attempt to query VF %d RX stats on non-PF port %d!\n" , + vf_id, port); +return -ENOTSUP ; + } + +return bnxt_vf_default_vnic_count (bp, vf_id); +} +int rte_pmd_bnxt_get_tx_drop_count (uint8_t port,uint64_t *count) {struct rte_eth_dev *dev;
drivers/net/bnxt/rte_pmd_bnxt.h +17 -0
@@ -217,6 +217,23 @@ int rte_pmd_bnxt_reset_vf_stats(uint8_t port,*/ int rte_pmd_bnxt_set_vf_vlan_anti_spoof (uint8_t port,uint16_t vf,uint8_t on); + +/** +* Returns the number of default RX queues on a VF +* +* @param port +* The port identifier of the Ethernet device. +* @param vf +* VF id. +* @return +* - Non-negative value - Number of default RX queues +* - (-EINVAL) if bad parameter. +* - (-ENOTSUP) if on a function without VFs +* - (-ENOMEM) on an allocation failure +* - (-1) firmware interface error +*/ +int rte_pmd_bnxt_get_vf_rx_status (uint8_t port,uint16_t vf_id); +/** * Queries the TX drop counter for the function *
drivers/net/bnxt/rte_pmd_bnxt_version.map +5 -0
@@ -9,6 +9,11 @@ DPDK_17.08 { rte_pmd_bnxt_set_tx_loopback; rte_pmd_bnxt_set_all_queues_drop_en; + rte_pmd_bnxt_get_vf_stats; + rte_pmd_bnxt_reset_vf_stats; + rte_pmd_bnxt_get_vf_rx_status; + rte_pmd_bnxt_get_vf_tx_drop_count; + rte_pmd_bnxt_get_tx_drop_count; rte_pmd_bnxt_set_vf_mac_addr; rte_pmd_bnxt_set_vf_mac_anti_spoof; rte_pmd_bnxt_set_vf_rate_limit;
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 10/23 bnxt: add support to add a VF MAC address
In reply to Ajit KhapardeThis patch adds support to allocate a filter and program it in the hardware for every MAC address added to the specified function.
--- drivers/net/bnxt/bnxt_filter.c | 22 ++++++++++ drivers/net/bnxt/bnxt_filter.h | 1 + drivers/net/bnxt/rte_pmd_bnxt.c | 73 +++++++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 18 ++++++++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 1 + 5 files changed, 115 insertions(+)
drivers/net/bnxt/bnxt_filter.c +22 -0
@@ -68,6 +68,22 @@ struct bnxt_filter_info *bnxt_alloc_filter(struct bnxt *bp)return filter; } +struct bnxt_filter_info *bnxt_alloc_vf_filter (struct bnxt *bp,uint16_t vf) +{ +struct bnxt_filter_info *filter; + + filter =rte_zmalloc ("bnxt_vf_filter_info" ,sizeof (*filter),0 ); +if (!filter) { +RTE_LOG (ERR ,PMD ,"Failed to alloc memory for VF %hu filters\n" , + vf); +return NULL ; + } + + filter->fw_l2_filter_id =UINT64_MAX ; +STAILQ_INSERT_TAIL (&bp->pf.vf_info[vf].filter, filter, next); +return filter; +} +void bnxt_init_filters (struct bnxt *bp) {struct bnxt_filter_info *filter;
@@ -102,6 +118,12 @@ void bnxt_free_all_filters(struct bnxt *bp)STAILQ_INIT (&vnic->filter); } } + +for (i =0 ; i < bp->pf.max_vfs; i++) { + STAILQ_FOREACH(filter, &bp->pf.vf_info[i].filter, next) { +bnxt_hwrm_clear_filter (bp, filter); + } + } }void bnxt_free_filter_mem (struct bnxt *bp)
drivers/net/bnxt/bnxt_filter.h +1 -0
@@ -68,6 +68,7 @@ struct bnxt_filter_info { };struct bnxt_filter_info *bnxt_alloc_filter (struct bnxt *bp); +struct bnxt_filter_info *bnxt_alloc_vf_filter (struct bnxt *bp,uint16_t vf);void bnxt_init_filters (struct bnxt *bp);void bnxt_free_all_filters (struct bnxt *bp);void bnxt_free_filter_mem (struct bnxt *bp);
drivers/net/bnxt/rte_pmd_bnxt.c +73 -0
76 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt.h +18 -0
@@ -262,4 +262,22 @@ int rte_pmd_bnxt_get_tx_drop_count(uint8_t port, uint64_t *count);*/ int rte_pmd_bnxt_get_vf_tx_drop_count (uint8_t port,uint16_t vf_id,uint64_t *count); + +/** +* Programs the MAC address for the function specified +* +* @param port +* The port identifier of the Ethernet device. +* @param mac_addr +* The MAC address to be programmed in the filter. +* @param vf_id +* VF on which to get. +* @return +* - Positive Non-zero value - Error code from HWRM +* - (-EINVAL) invalid vf_id specified. +* - (-ENOTSUP) Ethernet device is not a PF +* - (-ENOMEM) on an allocation failure +*/ +int rte_pmd_bnxt_mac_addr_add (uint8_t port,struct ether_addr *mac_addr, +uint32_t vf_id);#endif /* _PMD_BNXT_H_ */
drivers/net/bnxt/rte_pmd_bnxt_version.map +1 -0
@@ -14,6 +14,7 @@ DPDK_17.08 { rte_pmd_bnxt_get_vf_rx_status; rte_pmd_bnxt_get_vf_tx_drop_count; rte_pmd_bnxt_get_tx_drop_count; + rte_pmd_bnxt_mac_addr_add; rte_pmd_bnxt_set_vf_mac_addr; rte_pmd_bnxt_set_vf_mac_anti_spoof; rte_pmd_bnxt_set_vf_rate_limit;
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 11/23 bnxt: add support for xstats get/reset
In reply to Ajit KhapardeThis patch adds support to get and reset xstats dev_ops
dev_ops added:xstats_get, xstats_get_name, xstats_reset
HWRM commands added:hwrm_port_qstats, hwrm_port_clr_stats
--- drivers/net/bnxt/bnxt.h | 7 + drivers/net/bnxt/bnxt_ethdev.c | 84 ++++++ drivers/net/bnxt/bnxt_hwrm.c | 33 +++ drivers/net/bnxt/bnxt_hwrm.h | 2 + drivers/net/bnxt/bnxt_stats.c | 202 ++++++++++++++ drivers/net/bnxt/bnxt_stats.h | 10 + drivers/net/bnxt/hsi_struct_def_dpdk.h | 495 +++++++++++++++++++++++++++++++++ 7 files changed, 833 insertions(+)
drivers/net/bnxt/bnxt.h +7 -0
@@ -134,6 +134,7 @@ struct bnxt {uint32_t flags;#define BNXT_FLAG_REGISTERED (1 << 0)#define BNXT_FLAG_VF (1 << 1) +#define BNXT_FLAG_PORT_STATS (1 << 2)#define BNXT_PF (bp) (!((bp)->flags & BNXT_FLAG_VF))#define BNXT_VF (bp) ((bp)->flags & BNXT_FLAG_VF)#define BNXT_NPAR_ENABLED (bp) ((bp)->port_partition_type)
@@ -142,10 +143,16 @@ struct bnxt {unsigned int rx_nr_rings;unsigned int rx_cp_nr_rings;struct bnxt_rx_queue **rx_queues; +const void *rx_mem_zone; +struct rx_port_stats *hw_rx_port_stats; +phys_addr_t hw_rx_port_stats_map;unsigned int tx_nr_rings;unsigned int tx_cp_nr_rings;struct bnxt_tx_queue **tx_queues; +const void *tx_mem_zone; +struct tx_port_stats *hw_tx_port_stats; +phys_addr_t hw_tx_port_stats_map;/* Default completion ring */ struct bnxt_cp_ring_info *def_cp_ring;
drivers/net/bnxt/bnxt_ethdev.c +84 -0
115 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.c +33 -0
@@ -2472,6 +2472,39 @@ int bnxt_hwrm_func_vf_vnic_query_and_config(struct bnxt *bp, uint16_t vf,return rc; } +int bnxt_hwrm_port_qstats (struct bnxt *bp) +{ +struct hwrm_port_qstats_input req = {0 }; +struct hwrm_port_qstats_output *resp = bp->hwrm_cmd_resp_addr; +struct bnxt_pf_info *pf = &bp->pf; +int rc; + +if (!(bp->flags &BNXT_FLAG_PORT_STATS )) +return 0 ; + +HWRM_PREP (req,PORT_QSTATS ,-1 , resp); + req.port_id =rte_cpu_to_le_16 (pf->port_id); + req.tx_stat_host_addr =rte_cpu_to_le_64 (bp->hw_tx_port_stats_map); + req.rx_stat_host_addr =rte_cpu_to_le_64 (bp->hw_rx_port_stats_map); + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); +HWRM_CHECK_RESULT ; +return rc; +} + +int bnxt_hwrm_port_clr_stats (struct bnxt *bp) +{ +struct hwrm_port_clr_stats_input req = {0 }; +struct hwrm_port_clr_stats_output *resp = bp->hwrm_cmd_resp_addr; +struct bnxt_pf_info *pf = &bp->pf; +int rc; + +HWRM_PREP (req,PORT_CLR_STATS ,-1 , resp); + req.port_id =rte_cpu_to_le_16 (pf->port_id); + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); +HWRM_CHECK_RESULT ; +return rc; +} +int bnxt_hwrm_func_cfg_vf_set_vlan_anti_spoof (struct bnxt *bp,uint16_t vf,bool on) {
drivers/net/bnxt/bnxt_hwrm.h +2 -0
@@ -133,6 +133,8 @@ int bnxt_vf_default_vnic_count(struct bnxt *bp, uint16_t vf);int bnxt_hwrm_func_vf_vnic_query_and_config (struct bnxt *bp,uint16_t vf,void (*vnic_cb)(struct bnxt_vnic_info *,void *),void *cbdata,int (*hwrm_cb)(struct bnxt *bp,struct bnxt_vnic_info *vnic)); +int bnxt_hwrm_port_qstats (struct bnxt *bp); +int bnxt_hwrm_port_clr_stats (struct bnxt *bp);int bnxt_hwrm_func_cfg_vf_set_vlan_anti_spoof (struct bnxt *bp,uint16_t vf,bool on);int bnxt_hwrm_func_qcfg_vf_dflt_vnic_id (struct bnxt *bp,int vf);
drivers/net/bnxt/bnxt_stats.c +202 -0
211 lines not on this page · raw message
drivers/net/bnxt/bnxt_stats.h +10 -0
@@ -40,5 +40,15 @@ void bnxt_free_stats(struct bnxt *bp);void bnxt_stats_get_op (struct rte_eth_dev *eth_dev,struct rte_eth_stats *bnxt_stats);void bnxt_stats_reset_op (struct rte_eth_dev *eth_dev); +int bnxt_dev_xstats_get_names_op(__rte_unused struct rte_eth_dev *eth_dev, +struct rte_eth_xstat_name *xstats_names, + __rte_unused unsigned int limit); +int bnxt_dev_xstats_get_op (struct rte_eth_dev *eth_dev, +struct rte_eth_xstat *xstats,unsigned int n); +void bnxt_dev_xstats_reset_op (struct rte_eth_dev *eth_dev); +struct bnxt_xstats_name_off { +char name[RTE_ETH_XSTATS_NAME_SIZE ]; +uint64_t offset; +};#endif
drivers/net/bnxt/hsi_struct_def_dpdk.h +495 -0
513 lines not on this page · raw message
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 12/23 bnxt: Add support for VLAN filter and strip dev_ops
In reply to Ajit KhapardeThis patch adds VLAN strip and offload callbacks.
To add a VLAN filter:
For each VNIC and each associated filter(s)
if VLAN exists:
if VLAN matches vlan_id
VLAN filter already exists, just skip and continue
else
add a new MAC+VLAN filter
else
Remove the old MAC only filter
Add a new MAC+VLAN filter
To remove a VLAN filter:
For each VNIC and each associated filter(s)
if VLAN exists && VLAN matches vlan_id
remove the MAC+VLAN filter
add a new MAC only filter
else
VLAN filter doesn't exist, just skip and continue
--- drivers/net/bnxt/bnxt_ethdev.c | 201 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+)
drivers/net/bnxt/bnxt_ethdev.c +201 -0
@@ -141,6 +141,7 @@ static const struct rte_pci_id bnxt_pci_id_map[] = { ETH_RSS_NONFRAG_IPV6_TCP | \ ETH_RSS_NONFRAG_IPV6_UDP) +static void bnxt_vlan_offload_set_op (struct rte_eth_dev *dev,int mask);/***********************/ /*
@@ -487,6 +488,7 @@ static int bnxt_dev_lsc_intr_setup(struct rte_eth_dev *eth_dev)static int bnxt_dev_start_op (struct rte_eth_dev *eth_dev) {struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private; +int vlan_mask =0 ;int rc; bp->dev_stopped =0 ;
@@ -496,6 +498,13 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev) goto error;bnxt_link_update_op (eth_dev,0 ); + +if (eth_dev->data->dev_conf.rxmode.hw_vlan_filter) + vlan_mask |=ETH_VLAN_FILTER_MASK ; +if (eth_dev->data->dev_conf.rxmode.hw_vlan_strip) + vlan_mask |=ETH_VLAN_STRIP_MASK ; +bnxt_vlan_offload_set_op (eth_dev, vlan_mask); +return 0 ; error:
@@ -1091,6 +1100,196 @@ bnxt_udp_tunnel_port_del_op(struct rte_eth_dev *eth_dev,return rc; } +static int bnxt_del_vlan_filter (struct bnxt *bp,uint16_t vlan_id) +{ +struct bnxt_filter_info *filter, *temp_filter, *new_filter; +struct bnxt_vnic_info *vnic; +unsigned int i; +int rc =0 ; +uint32_t chk =HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_OVLAN ; + +/* Cycle through all VNICs */ +for (i =0 ; i < bp->nr_vnics; i++) { +/* +* For each VNIC and each associated filter(s) +* if VLAN exists && VLAN matches vlan_id +* remove the MAC+VLAN filter +* add a new MAC only filter +* else +* VLAN filter doesn't exist, just skip and continue +*/ + STAILQ_FOREACH(vnic, &bp->ff_pool[i], next) { + filter =STAILQ_FIRST (&vnic->filter); +while (filter) { + temp_filter =STAILQ_NEXT (filter, next); + +if (filter->enables & chk && + filter->l2_ovlan == vlan_id) { +/* Must delete the filter */ +STAILQ_REMOVE (&vnic->filter, filter, + bnxt_filter_info, next); +bnxt_hwrm_clear_filter (bp, filter); +STAILQ_INSERT_TAIL ( + &bp->free_filter_list, + filter, next); + +/* +* Need to examine to see if the MAC +* filter already existed or not before +* allocating a new one +*/ + + new_filter =bnxt_alloc_filter (bp); +if (!new_filter) { +RTE_LOG (ERR ,PMD , +"MAC/VLAN filter alloc failed\n" ); + rc = -ENOMEM ; + goto exit; + } +STAILQ_INSERT_TAIL (&vnic->filter, + new_filter, next); +/* Inherit MAC from previous filter */ + new_filter->mac_index = + filter->mac_index; +memcpy (new_filter->l2_addr, + filter->l2_addr,ETHER_ADDR_LEN ); +/* MAC only filter */ + rc =bnxt_hwrm_set_filter (bp, + vnic->fw_vnic_id, + new_filter); +if (rc) + goto exit; +RTE_LOG (INFO ,PMD , +"Del Vlan filter for %d\n" , + vlan_id); + } + filter = temp_filter; + } + } + } +exit: +return rc; +} + +static int bnxt_add_vlan_filter (struct bnxt *bp,uint16_t vlan_id) +{ +struct bnxt_filter_info *filter, *temp_filter, *new_filter; +struct bnxt_vnic_info *vnic; +unsigned int i; +int rc =0 ; +uint32_t en =HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_OVLAN | +HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_OVLAN_MASK ; +uint32_t chk =HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_OVLAN ; + +/* Cycle through all VNICs */ +for (i =0 ; i < bp->nr_vnics; i++) { +/* +* For each VNIC and each associated filter(s) +* if VLAN exists: +* if VLAN matches vlan_id +* VLAN filter already exists, just skip and continue +* else +* add a new MAC+VLAN filter +* else +* Remove the old MAC only filter +* Add a new MAC+VLAN filter +*/ + STAILQ_FOREACH(vnic, &bp->ff_pool[i], next) { + filter =STAILQ_FIRST (&vnic->filter); +while (filter) { + temp_filter =STAILQ_NEXT (filter, next); + +if (filter->enables & chk) { +if (filter->l2_ovlan == vlan_id) + goto cont; + }else { +/* Must delete the MAC filter */ +STAILQ_REMOVE (&vnic->filter, filter, + bnxt_filter_info, next); +bnxt_hwrm_clear_filter (bp, filter); + filter->l2_ovlan =0 ; +STAILQ_INSERT_TAIL ( + &bp->free_filter_list, + filter, next); + } + new_filter =bnxt_alloc_filter (bp); +if (!new_filter) { +RTE_LOG (ERR ,PMD , +"MAC/VLAN filter alloc failed\n" ); + rc = -ENOMEM ; + goto exit; + } +STAILQ_INSERT_TAIL (&vnic->filter, new_filter, + next); +/* Inherit MAC from the previous filter */ + new_filter->mac_index = filter->mac_index; +memcpy (new_filter->l2_addr, filter->l2_addr, +ETHER_ADDR_LEN ); +/* MAC + VLAN ID filter */ + new_filter->l2_ovlan = vlan_id; + new_filter->l2_ovlan_mask =0xF000 ; + new_filter->enables |= en; + rc =bnxt_hwrm_set_filter (bp, vnic->fw_vnic_id, + new_filter); +if (rc) + goto exit; +RTE_LOG (INFO ,PMD , +"Added Vlan filter for %d\n" , vlan_id); +cont: + filter = temp_filter; + } + } + } +exit: +return rc; +} + +static int bnxt_vlan_filter_set_op (struct rte_eth_dev *eth_dev, +uint16_t vlan_id,int on) +{ +struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private; + +/* These operations apply to ALL existing MAC/VLAN filters */ +if (on) +return bnxt_add_vlan_filter (bp, vlan_id); +else +return bnxt_del_vlan_filter (bp, vlan_id); +} + +static void +bnxt_vlan_offload_set_op (struct rte_eth_dev *dev,int mask) +{ +struct bnxt *bp = (struct bnxt *)dev->data->dev_private; +unsigned int i; + +if (mask Ð_VLAN_FILTER_MASK ) { +if (!dev->data->dev_conf.rxmode.hw_vlan_filter) { +/* Remove any VLAN filters programmed */ +for (i =0 ; i <4095 ; i++) +bnxt_del_vlan_filter (bp, i); + } +RTE_LOG (INFO ,PMD ,"VLAN Filtering: %d\n" , + dev->data->dev_conf.rxmode.hw_vlan_filter); + } + +if (mask Ð_VLAN_STRIP_MASK ) { +/* Enable or disable VLAN stripping */ +for (i =0 ; i < bp->nr_vnics; i++) { +struct bnxt_vnic_info *vnic = &bp->vnic_info[i]; +if (dev->data->dev_conf.rxmode.hw_vlan_strip) + vnic->vlan_strip = true; +else + vnic->vlan_strip = false; +bnxt_hwrm_vnic_cfg (bp, vnic); + } +RTE_LOG (INFO ,PMD ,"VLAN Strip Offload: %d\n" , + dev->data->dev_conf.rxmode.hw_vlan_strip); + } + +if (mask Ð_VLAN_EXTEND_MASK ) +RTE_LOG (ERR ,PMD ,"Extend VLAN Not supported\n" ); +} +/* * Initialization */
@@ -1124,6 +1323,8 @@ static const struct eth_dev_ops bnxt_dev_ops = { .flow_ctrl_set = bnxt_flow_ctrl_set_op, .udp_tunnel_port_add = bnxt_udp_tunnel_port_add_op, .udp_tunnel_port_del = bnxt_udp_tunnel_port_del_op, + .vlan_filter_set = bnxt_vlan_filter_set_op, + .vlan_offload_set = bnxt_vlan_offload_set_op, .xstats_get = bnxt_dev_xstats_get_op, .xstats_get_names = bnxt_dev_xstats_get_names_op, .xstats_reset = bnxt_dev_xstats_reset_op,
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 13/23 bnxt: add code to configure a default VF VLAN
In reply to Ajit KhapardeThis patch adds code to insert a default VF VLAN.
Also track the current default VLAN per vnic for the VF. When setting the default VLAN, avoid setting it to the current value.
--- drivers/net/bnxt/bnxt.h | 1 + drivers/net/bnxt/bnxt_hwrm.c | 39 +++++++++++++++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 2 ++ drivers/net/bnxt/rte_pmd_bnxt.c | 35 +++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 20 ++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 1 + 6 files changed, 98 insertions(+)
drivers/net/bnxt/bnxt.h +1 -0
@@ -68,6 +68,7 @@ struct bnxt_child_vf_info {uint32_t l2_rx_mask;uint16_t fid;uint16_t max_tx_rate; +uint16_t dflt_vlan;uint16_t vlan_count;uint8_t mac_spoof_en;uint8_t vlan_spoof_en;
drivers/net/bnxt/bnxt_hwrm.c +39 -0
@@ -2002,6 +2002,27 @@ static void reserve_resources_from_vf(struct bnxt *bp, bp->max_ring_grps -=rte_le_to_cpu_16 (resp->max_hw_ring_grps); } +int bnxt_hwrm_func_qcfg_current_vf_vlan (struct bnxt *bp,int vf) +{ +struct hwrm_func_qcfg_input req = {0 }; +struct hwrm_func_qcfg_output *resp = bp->hwrm_cmd_resp_addr; +int rc; + +/* Check for zero MAC address */ +HWRM_PREP (req,FUNC_QCFG ,-1 , resp); + req.fid =rte_cpu_to_le_16 (bp->pf.vf_info[vf].fid); + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); +if (rc) { +RTE_LOG (ERR ,PMD ,"hwrm_func_qcfg failed rc:%d\n" , rc); +return -1 ; + }else if (resp->error_code) { + rc =rte_le_to_cpu_16 (resp->error_code); +RTE_LOG (ERR ,PMD ,"hwrm_func_qcfg error %d\n" , rc); +return -1 ; + } +return rte_le_to_cpu_16 (resp->vlan); +} +static int update_pf_resource_max (struct bnxt *bp) {struct hwrm_func_qcfg_input req = {0 };
@@ -2315,6 +2336,24 @@ int bnxt_hwrm_func_bw_cfg(struct bnxt *bp, uint16_t vf,return rc; } +int bnxt_hwrm_set_vf_vlan (struct bnxt *bp,int vf) +{ +struct hwrm_func_cfg_input req = {0 }; +struct hwrm_func_cfg_output *resp = bp->hwrm_cmd_resp_addr; +int rc =0 ; + +HWRM_PREP (req,FUNC_CFG ,-1 , resp); + req.flags =rte_cpu_to_le_32 (bp->pf.vf_info[vf].func_cfg_flags); + req.fid =rte_cpu_to_le_16 (bp->pf.vf_info[vf].fid); + req.enables |=rte_cpu_to_le_32 (HWRM_FUNC_CFG_INPUT_ENABLES_DFLT_VLAN ); + req.dflt_vlan =rte_cpu_to_le_16 (bp->pf.vf_info[vf].dflt_vlan); + + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); +HWRM_CHECK_RESULT ; + +return rc; +} +int bnxt_hwrm_reject_fwd_resp (struct bnxt *bp,uint16_t target_id,void *encaped,size_t ec_size) {
drivers/net/bnxt/bnxt_hwrm.h +2 -0
@@ -121,8 +121,10 @@ int bnxt_hwrm_func_vf_mac(struct bnxt *bp, uint16_t vf,int bnxt_hwrm_pf_evb_mode (struct bnxt *bp);int bnxt_hwrm_func_bw_cfg (struct bnxt *bp,uint16_t vf,uint16_t max_bw,uint16_t enables); +int bnxt_hwrm_set_vf_vlan (struct bnxt *bp,int vf);int bnxt_hwrm_func_qcfg_vf_default_mac (struct bnxt *bp,uint16_t vf,struct ether_addr *mac); +int bnxt_hwrm_func_qcfg_current_vf_vlan (struct bnxt *bp,int vf);int bnxt_hwrm_tunnel_dst_port_alloc (struct bnxt *bp,uint16_t port,uint8_t tunnel_type); int bnxt_hwrm_tunnel_dst_port_free(struct bnxt *bp, uint16_t port,
drivers/net/bnxt/rte_pmd_bnxt.c +35 -0
@@ -356,6 +356,41 @@ rte_pmd_bnxt_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on)return rc; } +int +rte_pmd_bnxt_set_vf_vlan_insert (uint8_t port,uint16_t vf, +uint16_t vlan_id) +{ +struct rte_eth_dev *dev; +struct rte_eth_dev_info dev_info; +struct bnxt *bp; +int rc; + +RTE_ETH_VALID_PORTID_OR_ERR_RET (port, -ENODEV ); + + dev = &rte_eth_devices[port]; +rte_eth_dev_info_get (port, &dev_info); + bp = (struct bnxt *)dev->data->dev_private; + +if (vf >= dev_info.max_vfs) +return -EINVAL ; + +if (!BNXT_PF (bp)) { +RTE_LOG (ERR ,PMD , +"Attempt to set VF %d vlan insert on non-PF port %d!\n" , + vf, port); +return -ENOTSUP ; + } + + bp->pf.vf_info[vf].dflt_vlan = vlan_id; +if (bnxt_hwrm_func_qcfg_current_vf_vlan (bp, vf) == + bp->pf.vf_info[vf].dflt_vlan) +return 0 ; + + rc =bnxt_hwrm_set_vf_vlan (bp, vf); + +return rc; +} +int rte_pmd_bnxt_set_vf_vlan_filter (struct rte_eth_dev *dev,uint16_t vlan,uint64_t vf_mask,uint8_t vlan_on) {
drivers/net/bnxt/rte_pmd_bnxt.h +20 -0
@@ -92,6 +92,26 @@ int rte_pmd_bnxt_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on);/** +* Enable/Disable vf vlan insert +* +* @param port +* The port identifier of the Ethernet device. +* @param vf +* ID specifying VF. +* @param vlan_id +* 0 - Disable VF's vlan insert. +* n - Enable; n is inserted as the vlan id. +* +* @return +* - (0) if successful. +* - (-ENODEV) if *port* invalid. +* - (-EINVAL) if bad parameter. +*/ +int +rte_pmd_bnxt_set_vf_vlan_insert (uint8_t port,uint16_t vf, +uint16_t vlan_id); + +/** * Enable/Disable hardware VF VLAN filtering by an Ethernet device of * received VLAN packets tagged with a given VLAN Tag Identifier. *
drivers/net/bnxt/rte_pmd_bnxt_version.map +1 -0
@@ -21,4 +21,5 @@ DPDK_17.08 { rte_pmd_bnxt_set_vf_vlan_stripq; rte_pmd_bnxt_set_vf_vlan_filter; rte_pmd_bnxt_set_vf_vlan_anti_spoof; + rte_pmd_bnxt_set_vf_vlan_insert; };
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 14/23 bnxt: add support for set_mc_addr_list and mac_addr_set
In reply to Ajit KhapardeThis patch adds support for set_mc_addr_list andmac_addr_set dev_ops
--- drivers/net/bnxt/bnxt_ethdev.c | 68 ++++++++++++++++++++++++++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.c | 11 +++++-- drivers/net/bnxt/bnxt_vnic.c | 7 ++++- drivers/net/bnxt/bnxt_vnic.h | 4 +++ 4 files changed, 86 insertions(+), 4 deletions(-)
drivers/net/bnxt/bnxt_ethdev.c +68 -0
@@ -1290,6 +1290,72 @@ bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask)RTE_LOG (ERR ,PMD ,"Extend VLAN Not supported\n" ); } +static void +bnxt_set_default_mac_addr_op (struct rte_eth_dev *dev,struct ether_addr *addr) +{ +struct bnxt *bp = (struct bnxt *)dev->data->dev_private; +/* Default Filter is tied to VNIC 0 */ +struct bnxt_vnic_info *vnic = &bp->vnic_info[0 ]; +struct bnxt_filter_info *filter; +int rc; + +if (BNXT_VF (bp)) +return ; + +memcpy (bp->mac_addr, addr,sizeof (bp->mac_addr)); +memcpy (&dev->data->mac_addrs[0 ], bp->mac_addr,ETHER_ADDR_LEN ); + + STAILQ_FOREACH(filter, &vnic->filter, next) { +/* Default Filter is at Index 0 */ +if (filter->mac_index !=0 ) +continue ; + rc =bnxt_hwrm_clear_filter (bp, filter); +if (rc) +break ; +memcpy (filter->l2_addr, bp->mac_addr,ETHER_ADDR_LEN ); +memset (filter->l2_addr_mask,0xff ,ETHER_ADDR_LEN ); + filter->flags |=HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX ; + filter->enables |= +HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR | +HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR_MASK ; + rc =bnxt_hwrm_set_filter (bp, vnic->fw_vnic_id, filter); +if (rc) +break ; + filter->mac_index =0 ; +RTE_LOG (DEBUG ,PMD ,"Set MAC addr\n" ); + } +} + +static int +bnxt_dev_set_mc_addr_list_op (struct rte_eth_dev *eth_dev, +struct ether_addr *mc_addr_set, +uint32_t nb_mc_addr) +{ +struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private; +char *mc_addr_list = (char *)mc_addr_set; +struct bnxt_vnic_info *vnic; +uint32_t off =0 , i =0 ; + + vnic = &bp->vnic_info[0 ]; + +if (nb_mc_addr >BNXT_MAX_MC_ADDRS ) { + vnic->flags |=BNXT_VNIC_INFO_ALLMULTI ; + goto allmulti; + } + +/* TODO Check for Duplicate mcast addresses */ + vnic->flags &= ~BNXT_VNIC_INFO_ALLMULTI ; +for (i =0 ; i < nb_mc_addr; i++) { +memcpy (vnic->mc_list + off, &mc_addr_list[i],ETHER_ADDR_LEN ); + off +=ETHER_ADDR_LEN ; + } + + vnic->mc_addr_cnt = i; + +allmulti: +return bnxt_hwrm_cfa_l2_set_rx_mask (bp, &bp->vnic_info[0 ],0 ,NULL ); +} +/* * Initialization */
@@ -1325,9 +1391,11 @@ static const struct eth_dev_ops bnxt_dev_ops = { .udp_tunnel_port_del = bnxt_udp_tunnel_port_del_op, .vlan_filter_set = bnxt_vlan_filter_set_op, .vlan_offload_set = bnxt_vlan_offload_set_op, + .mac_addr_set = bnxt_set_default_mac_addr_op, .xstats_get = bnxt_dev_xstats_get_op, .xstats_get_names = bnxt_dev_xstats_get_names_op, .xstats_reset = bnxt_dev_xstats_reset_op, + .set_mc_addr_list = bnxt_dev_set_mc_addr_list_op, };static bool bnxt_vf_pciid (uint16_t id)
drivers/net/bnxt/bnxt_hwrm.c +8 -3
@@ -215,15 +215,20 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp,if (vnic->flags &BNXT_VNIC_INFO_PROMISC ) mask =HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_PROMISCUOUS ;if (vnic->flags &BNXT_VNIC_INFO_ALLMULTI ) - mask =HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_ALL_MCAST ; - req.mask =rte_cpu_to_le_32 (HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_BCAST | - mask); + mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_ALL_MCAST ; +if (vnic->mc_addr_cnt) { + mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_MCAST ; + req.num_mc_entries =rte_cpu_to_le_32 (vnic->mc_addr_cnt); + req.mc_tbl_addr =rte_cpu_to_le_64 (vnic->mc_list_dma_addr); + }if (vlan_count && vlan_table) { mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_VLANONLY ; req.vlan_tag_tbl_addr =rte_cpu_to_le_16 (rte_mem_virt2phy (vlan_table)); req.num_vlan_tags =rte_cpu_to_le_32 ((uint32_t )vlan_count); } + req.mask =rte_cpu_to_le_32 (HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_BCAST | + mask); rc =bnxt_hwrm_send_message (bp, &req,sizeof (req));
drivers/net/bnxt/bnxt_vnic.c +6 -1
@@ -170,7 +170,8 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)char mz_name[RTE_MEMZONE_NAMESIZE ];uint32_t entry_length =RTE_CACHE_LINE_ROUNDUP (HW_HASH_INDEX_SIZE *sizeof (*vnic->rss_table) + -HW_HASH_KEY_SIZE ); +HW_HASH_KEY_SIZE + +BNXT_MAX_MC_ADDRS *ETHER_ADDR_LEN );uint16_t max_vnics;int i;phys_addr_t mz_phys_addr;
@@ -218,6 +219,10 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp) vnic->rss_hash_key_dma_addr = vnic->rss_table_dma_addr +HW_HASH_INDEX_SIZE *sizeof (*vnic->rss_table); + vnic->mc_list = (void *)((char *)vnic->rss_hash_key + +HW_HASH_KEY_SIZE ); + vnic->mc_list_dma_addr = vnic->rss_hash_key_dma_addr + +HW_HASH_KEY_SIZE ; }return 0 ;
drivers/net/bnxt/bnxt_vnic.h +4 -0
@@ -57,6 +57,10 @@ struct bnxt_vnic_info {uint16_t *rss_table;phys_addr_t rss_hash_key_dma_addr;void *rss_hash_key; +phys_addr_t mc_list_dma_addr; +char *mc_list; +uint32_t mc_addr_cnt; +#define BNXT_MAX_MC_ADDRS 16uint32_t flags;#define BNXT_VNIC_INFO_PROMISC (1 << 0)#define BNXT_VNIC_INFO_ALLMULTI (1 << 1)
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 15/23 bnxt: add support for fw_version_get dev_op
In reply to Ajit KhapardeThis patch adds support for fw_version_get dev_op
--- drivers/net/bnxt/bnxt_ethdev.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/net/bnxt/bnxt_ethdev.c +20 -0
@@ -1356,6 +1356,25 @@ bnxt_dev_set_mc_addr_list_op(struct rte_eth_dev *eth_dev,return bnxt_hwrm_cfa_l2_set_rx_mask (bp, &bp->vnic_info[0 ],0 ,NULL ); } +static int +bnxt_fw_version_get (struct rte_eth_dev *dev,char *fw_version,size_t fw_size) +{ +struct bnxt *bp = (struct bnxt *)dev->data->dev_private; +uint8_t fw_major = (bp->fw_ver >>24 ) &0xff ; +uint8_t fw_minor = (bp->fw_ver >>16 ) &0xff ; +uint8_t fw_updt = (bp->fw_ver >>8 ) &0xff ; +int ret; + + ret =snprintf (fw_version, fw_size,"%d.%d.%d" , + fw_major, fw_minor, fw_updt); + + ret +=1 ;/* add the size of '\0' */ +if (fw_size < (uint32_t )ret) +return ret; +else +return 0 ; +} +/* * Initialization */
@@ -1395,6 +1414,7 @@ static const struct eth_dev_ops bnxt_dev_ops = { .xstats_get = bnxt_dev_xstats_get_op, .xstats_get_names = bnxt_dev_xstats_get_names_op, .xstats_reset = bnxt_dev_xstats_reset_op, + .fw_version_get = bnxt_fw_version_get, .set_mc_addr_list = bnxt_dev_set_mc_addr_list_op, };
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 16/23 bnxt: add support to set MTU
In reply to Ajit KhapardeThis patch adds support to modify MTU using the set_mtu dev_op. To support frames > 2k, the PMD creates an aggregator ring. When a frame greater than 2k is received, it is fragmented and the resulting fragments are DMA'ed to the aggregator ring. Now the driver can support jumbo frames upto 9500 bytes.
--- drivers/net/bnxt/bnxt.h | 4 +- drivers/net/bnxt/bnxt_cpr.c | 3 +- drivers/net/bnxt/bnxt_ethdev.c | 59 +++++++++++++ drivers/net/bnxt/bnxt_hwrm.c | 123 ++++++++++++++++---------- drivers/net/bnxt/bnxt_hwrm.h | 4 +- drivers/net/bnxt/bnxt_ring.c | 81 +++++++++++++++-- drivers/net/bnxt/bnxt_ring.h | 2 + drivers/net/bnxt/bnxt_rxq.c | 29 ++++-- drivers/net/bnxt/bnxt_rxq.h | 1 + drivers/net/bnxt/bnxt_rxr.c | 195 ++++++++++++++++++++++++++++++++++++----- drivers/net/bnxt/bnxt_rxr.h | 6 ++ 11 files changed, 420 insertions(+), 87 deletions(-)
drivers/net/bnxt/bnxt.h +3 -1
@@ -45,7 +45,7 @@#include "bnxt_cpr.h" -#define BNXT_MAX_MTU 9000 +#define BNXT_MAX_MTU 9500#define VLAN_TAG_SIZE 4enum bnxt_hw_context {
@@ -136,6 +136,7 @@ struct bnxt {#define BNXT_FLAG_REGISTERED (1 << 0)#define BNXT_FLAG_VF (1 << 1)#define BNXT_FLAG_PORT_STATS (1 << 2) +#define BNXT_FLAG_JUMBO (1 << 3)#define BNXT_PF (bp) (!((bp)->flags & BNXT_FLAG_VF))#define BNXT_VF (bp) ((bp)->flags & BNXT_FLAG_VF)#define BNXT_NPAR_ENABLED (bp) ((bp)->port_partition_type)
@@ -239,4 +240,5 @@ struct rte_pmd_bnxt_mb_event_param {int bnxt_link_update_op (struct rte_eth_dev *eth_dev,int wait_to_complete);int bnxt_rcv_msg_from_vf (struct bnxt *bp,uint16_t vf_id,void *msg); +#define RX_PROD_AGG_BD_TYPE_RX_PROD_AGG 0x6#endif
drivers/net/bnxt/bnxt_cpr.c +2 -1
@@ -159,7 +159,8 @@ int bnxt_alloc_def_cp_ring(struct bnxt *bp) rc =bnxt_hwrm_ring_alloc (bp, cp_ring,HWRM_RING_ALLOC_INPUT_RING_TYPE_CMPL , -0 ,HWRM_NA_SIGNATURE ); +0 ,HWRM_NA_SIGNATURE , +HWRM_NA_SIGNATURE );if (rc) goto err_out; cpr->cp_doorbell = bp->pdev->mem_resource[2 ].addr;
drivers/net/bnxt/bnxt_ethdev.c +59 -0
77 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.c +76 -47
265 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +3 -1
@@ -76,7 +76,7 @@ int bnxt_hwrm_queue_qportcfg(struct bnxt *bp);int bnxt_hwrm_ring_alloc (struct bnxt *bp,struct bnxt_ring *ring,uint32_t ring_type,uint32_t map_index, -uint32_t stats_ctx_id); +uint32_t stats_ctx_id,uint32_t cmpl_ring_id);int bnxt_hwrm_ring_free (struct bnxt *bp,struct bnxt_ring *ring,uint32_t ring_type);int bnxt_hwrm_ring_grp_alloc (struct bnxt *bp,unsigned int idx);
@@ -99,6 +99,8 @@ int bnxt_hwrm_vnic_ctx_free(struct bnxt *bp, struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_free (struct bnxt *bp,struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_rss_cfg (struct bnxt *bp,struct bnxt_vnic_info *vnic); +int bnxt_hwrm_vnic_plcmode_cfg (struct bnxt *bp, +struct bnxt_vnic_info *vnic);int bnxt_alloc_all_hwrm_stat_ctxs (struct bnxt *bp);int bnxt_clear_all_hwrm_stat_ctxs (struct bnxt *bp);
drivers/net/bnxt/bnxt_ring.c +72 -9
156 lines not on this page · raw message
drivers/net/bnxt/bnxt_ring.h +2 -0
@@ -58,6 +58,7 @@#define DEFAULT_TX_RING_SIZE 256#define MAX_TPA 128 +#define AGG_RING_SIZE_FACTOR 2/* These assume 4k pages */ #define MAX_RX_DESC_CNT (8 * 1024)
@@ -65,6 +66,7 @@#define MAX_CP_DESC_CNT (16 * 1024)#define INVALID_HW_RING_ID ((uint16_t)-1) +#define INVALID_STATS_CTX_ID ((uint16_t)-1)struct bnxt_ring {void *bd;
drivers/net/bnxt/bnxt_rxq.c +21 -8
@@ -84,9 +84,8 @@ int bnxt_mq_rx_configure(struct bnxt *bp) vnic->func_default = true; vnic->ff_pool_idx =0 ; - vnic->start_grp_id =1 ; - vnic->end_grp_id = vnic->start_grp_id + - bp->rx_cp_nr_rings -1 ; + vnic->start_grp_id =0 ; + vnic->end_grp_id = vnic->start_grp_id; filter =bnxt_alloc_filter (bp);if (!filter) {RTE_LOG (ERR ,PMD ,"L2 filter alloc failed\n" );
@@ -126,8 +125,8 @@ int bnxt_mq_rx_configure(struct bnxt *bp) pools =ETH_64_POOLS ; } nb_q_per_grp = bp->rx_cp_nr_rings / pools; - start_grp_id =1 ; - end_grp_id = start_grp_id + nb_q_per_grp -1 ; + start_grp_id =0 ; + end_grp_id = nb_q_per_grp; ring_idx =0 ;for (i =0 ; i < pools; i++) {
@@ -188,9 +187,8 @@ int bnxt_mq_rx_configure(struct bnxt *bp) vnic->func_default = true; vnic->ff_pool_idx =0 ; - vnic->start_grp_id =1 ; - vnic->end_grp_id = vnic->start_grp_id + - bp->rx_cp_nr_rings -1 ; + vnic->start_grp_id =0 ; + vnic->end_grp_id = bp->rx_cp_nr_rings; filter =bnxt_alloc_filter (bp);if (!filter) {RTE_LOG (ERR ,PMD ,"L2 filter alloc failed\n" );
@@ -228,6 +226,16 @@ static void bnxt_rx_queue_release_mbufs(struct bnxt_rx_queue *rxq __rte_unused) } } } +/* Free up mbufs in Agg ring */ + sw_ring = rxq->rx_ring->ag_buf_ring; +if (sw_ring) { +for (i =0 ; i < rxq->nb_rx_desc; i++) { +if (sw_ring[i].mbuf) { +rte_pktmbuf_free_seg (sw_ring[i].mbuf); + sw_ring[i].mbuf =NULL ; + } + } + } } }
@@ -251,6 +259,8 @@ void bnxt_rx_queue_release_op(void *rx_queue)/* Free RX ring hardware descriptors */ bnxt_free_ring (rxq->rx_ring->rx_ring_struct); +/* Free RX Agg ring hardware descriptors */ +bnxt_free_ring (rxq->rx_ring->ag_ring_struct);/* Free RX completion ring hardware descriptors */ bnxt_free_ring (rxq->cp_ring->cp_ring_struct);
@@ -295,6 +305,9 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, rxq->nb_rx_desc = nb_desc; rxq->rx_free_thresh = rx_conf->rx_free_thresh; +RTE_LOG (DEBUG ,PMD ,"RX Buf size is %d\n" , rxq->rx_buf_use_size); +RTE_LOG (DEBUG ,PMD ,"RX Buf MTU %d\n" , eth_dev->data->mtu); + rc =bnxt_init_rx_ring_struct (rxq, socket_id);if (rc) goto out;
drivers/net/bnxt/bnxt_rxq.h +1 -0
@@ -52,6 +52,7 @@ struct bnxt_rx_queue {uint8_t crc_len;/* 0 if CRC stripped, 4 otherwise */ struct bnxt *bp; +int index;struct bnxt_vnic_info *vnic;uint32_t rx_buf_size;
drivers/net/bnxt/bnxt_rxr.c +175 -20
332 lines not on this page · raw message
drivers/net/bnxt/bnxt_rxr.h +6 -0
@@ -43,14 +43,20 @@ struct bnxt_sw_rx_bd {struct bnxt_rx_ring_info {uint16_t rx_prod; +uint16_t ag_prod;void *rx_doorbell; +void *ag_doorbell;struct rx_prod_pkt_bd *rx_desc_ring; +struct rx_prod_pkt_bd *ag_desc_ring;struct bnxt_sw_rx_bd *rx_buf_ring;/* sw ring */ +struct bnxt_sw_rx_bd *ag_buf_ring;/* sw ring */ phys_addr_t rx_desc_mapping; +phys_addr_t ag_desc_mapping;struct bnxt_ring *rx_ring_struct; +struct bnxt_ring *ag_ring_struct; }; uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 17/23 bnxt: add support for LRO
In reply to Ajit KhapardeThis patch adds support to enable and disable LRO
To support this feature, the driver creates an aggregrator ring. When the hardware starts doing LRO, it sends a tpa_start completion. When the driver receives a tpa_end completion, it indicates that the LRO chaining is complete.
--- drivers/net/bnxt/bnxt_ethdev.c | 7 + drivers/net/bnxt/bnxt_hwrm.c | 44 ++- drivers/net/bnxt/bnxt_hwrm.h | 2 + drivers/net/bnxt/bnxt_ring.c | 32 +- drivers/net/bnxt/bnxt_ring.h | 4 +- drivers/net/bnxt/bnxt_rxq.c | 12 + drivers/net/bnxt/bnxt_rxq.h | 2 + drivers/net/bnxt/bnxt_rxr.c | 315 ++++++++++++---- drivers/net/bnxt/bnxt_rxr.h | 40 ++ drivers/net/bnxt/hsi_struct_def_dpdk.h | 647 ++++++++++++++++++++++++++++++++- 10 files changed, 1019 insertions(+), 86 deletions(-)
drivers/net/bnxt/bnxt_ethdev.c +7 -0
@@ -286,6 +286,13 @@ static int bnxt_init_chip(struct bnxt *bp) goto err_out; } } + +bnxt_hwrm_vnic_plcmode_cfg (bp, vnic); + +if (bp->eth_dev->data->dev_conf.rxmode.enable_lro) +bnxt_hwrm_vnic_tpa_cfg (bp, vnic,1 ); +else +bnxt_hwrm_vnic_tpa_cfg (bp, vnic,0 ); } rc =bnxt_hwrm_cfa_l2_set_rx_mask (bp, &bp->vnic_info[0 ],0 ,NULL );if (rc) {
drivers/net/bnxt/bnxt_hwrm.c +39 -5
70 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +2 -0
@@ -101,6 +101,8 @@ int bnxt_hwrm_vnic_rss_cfg(struct bnxt *bp, struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_plcmode_cfg (struct bnxt *bp,struct bnxt_vnic_info *vnic); +int bnxt_hwrm_vnic_tpa_cfg (struct bnxt *bp, +struct bnxt_vnic_info *vnic,bool enable);int bnxt_alloc_all_hwrm_stat_ctxs (struct bnxt *bp);int bnxt_clear_all_hwrm_stat_ctxs (struct bnxt *bp);
drivers/net/bnxt/bnxt_ring.c +28 -4
@@ -31,6 +31,7 @@* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <rte_bitmap.h> #include <rte_memzone.h> #include <unistd.h>
@@ -137,11 +138,23 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,RTE_CACHE_LINE_ROUNDUP (rx_ring_info->rx_ring_struct->ring_size * sizeof(struct rx_prod_pkt_bd)) : 0; -int total_alloc_len = rx_ring_start + rx_ring_len; -int ag_ring_start =0 ; +int ag_ring_start = rx_ring_start + rx_ring_len; +int ag_ring_len = rx_ring_len *AGG_RING_SIZE_FACTOR ; - ag_ring_start = rx_ring_start + rx_ring_len; - total_alloc_len = ag_ring_start + rx_ring_len *AGG_RING_SIZE_FACTOR ; +int ag_bitmap_start = ag_ring_start + ag_ring_len; +int ag_bitmap_len = rx_ring_info ? +RTE_CACHE_LINE_ROUNDUP (rte_bitmap_get_memory_footprint ( + rx_ring_info->rx_ring_struct->ring_size * +AGG_RING_SIZE_FACTOR )) :0 ; + +int tpa_info_start = ag_bitmap_start + ag_bitmap_len; +int tpa_info_len = rx_ring_info ? +RTE_CACHE_LINE_ROUNDUP (BNXT_TPA_MAX * +sizeof (struct bnxt_tpa_info )) :0 ; + +int total_alloc_len = tpa_info_start; +if (bp->eth_dev->data->dev_conf.rxmode.enable_lro) + total_alloc_len += tpa_info_len; snprintf(mz_name, RTE_MEMZONE_NAMESIZE, "bnxt_%04x:%02x:%02x:%02x-%04x_%s", pdev->addr.domain,
@@ -230,6 +243,17 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx, rx_ring_info->ag_buf_ring = (struct bnxt_sw_rx_bd *)rx_ring->vmem; } + + rx_ring_info->ag_bitmap = +rte_bitmap_init (rx_ring_info->rx_ring_struct->ring_size * +AGG_RING_SIZE_FACTOR , (uint8_t *)mz->addr + + ag_bitmap_start, ag_bitmap_len); + +/* TPA info */ +if (bp->eth_dev->data->dev_conf.rxmode.enable_lro) + rx_ring_info->tpa_info = + ((struct bnxt_tpa_info *)((char *)mz->addr + + tpa_info_start)); } cp_ring->bd = ((char *)mz->addr + cp_ring_start);
drivers/net/bnxt/bnxt_ring.h +2 -2
@@ -57,8 +57,8 @@#define DEFAULT_RX_RING_SIZE 256#define DEFAULT_TX_RING_SIZE 256 -#define MAX_TPA 128 -#define AGG_RING_SIZE_FACTOR 2 +#define BNXT_TPA_MAX 64 +#define AGG_RING_SIZE_FACTOR 2/* These assume 4k pages */ #define MAX_RX_DESC_CNT (8 * 1024)
drivers/net/bnxt/bnxt_rxq.c +12 -0
@@ -214,6 +214,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp) static void bnxt_rx_queue_release_mbufs(struct bnxt_rx_queue *rxq __rte_unused) {struct bnxt_sw_rx_bd *sw_ring; +struct bnxt_tpa_info *tpa_info;uint16_t i;if (rxq) {
@@ -236,6 +237,17 @@ static void bnxt_rx_queue_release_mbufs(struct bnxt_rx_queue *rxq __rte_unused) } } } + +/* Free up mbufs in TPA */ + tpa_info = rxq->rx_ring->tpa_info; +if (tpa_info) { +for (i =0 ; i <BNXT_TPA_MAX ; i++) { +if (tpa_info[i].mbuf) { +rte_pktmbuf_free_seg (tpa_info[i].mbuf); + tpa_info[i].mbuf =NULL ; + } + } + } } }
drivers/net/bnxt/bnxt_rxq.h +2 -0
@@ -59,6 +59,8 @@ struct bnxt_rx_queue {uint32_t rx_buf_use_size;/* useable size */ struct bnxt_rx_ring_info *rx_ring;struct bnxt_cp_ring_info *cp_ring; + +struct bnxt_tpa_info *rx_tpa; };void bnxt_free_rxq_stats (struct bnxt_rx_queue *rxq);
drivers/net/bnxt/bnxt_rxr.c +241 -74
406 lines not on this page · raw message
drivers/net/bnxt/bnxt_rxr.h +40 -0
@@ -37,6 +37,39 @@#define B_RX_DB (db, prod) \ (*(uint32_t *)db = (DB_KEY_RX | prod)) +#define BNXT_TPA_L4_SIZE (x) \ + { \ + typeof(x) hdr_info = (x); \ + (((hdr_info) & 0xf8000000) ? ((hdr_info) >> 27) : 32) \ + } + +#define BNXT_TPA_INNER_L3_OFF (hdr_info) \ + (((hdr_info) >> 18) & 0x1ff) + +#define BNXT_TPA_INNER_L2_OFF (hdr_info) \ + (((hdr_info) >> 9) & 0x1ff) + +#define BNXT_TPA_OUTER_L3_OFF (hdr_info) \ + ((hdr_info) & 0x1ff) + +enum pkt_hash_types { +PKT_HASH_TYPE_NONE ,/* Undefined type */ +PKT_HASH_TYPE_L2 ,/* Input: src_MAC, dest_MAC */ +PKT_HASH_TYPE_L3 ,/* Input: src_IP, dst_IP */ +PKT_HASH_TYPE_L4 ,/* Input: src_IP, dst_IP, src_port, dst_port */ +}; + +struct bnxt_tpa_info { +struct rte_mbuf *mbuf; +uint16_t len; +unsigned short gso_type; +uint32_t flags2; +uint32_t metadata; +enum pkt_hash_types hash_type; +uint32_t rss_hash; +uint32_t hdr_info; +}; +struct bnxt_sw_rx_bd {struct rte_mbuf *mbuf;/* data associated with RX descriptor */ };
@@ -57,6 +90,13 @@ struct bnxt_rx_ring_info {struct bnxt_ring *rx_ring_struct;struct bnxt_ring *ag_ring_struct; + +/* +* To deal with out of order return from TPA, use free buffer indicator +*/ +struct rte_bitmap *ag_bitmap; + +struct bnxt_tpa_info *tpa_info; }; uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
drivers/net/bnxt/hsi_struct_def_dpdk.h +646 -1
665 lines not on this page · raw message
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 18/23 bnxt: add rxq_info_get and txq_info_get dev_ops
In reply to Ajit KhapardeAdd support for txq_info_get and rxq_info_get dev_ops
--- drivers/net/bnxt/bnxt_ethdev.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)
drivers/net/bnxt/bnxt_ethdev.c +39 -0
@@ -1390,6 +1390,43 @@ bnxt_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size)return 0 ; } +static void +bnxt_rxq_info_get_op (struct rte_eth_dev *dev,uint16_t queue_id, +struct rte_eth_rxq_info *qinfo) +{ +struct bnxt_rx_queue *rxq; + + rxq = dev->data->rx_queues[queue_id]; + + qinfo->mp = rxq->mb_pool; + qinfo->scattered_rx = dev->data->scattered_rx; + qinfo->nb_desc = rxq->nb_rx_desc; + + qinfo->conf.rx_free_thresh = rxq->rx_free_thresh; + qinfo->conf.rx_drop_en =0 ; + qinfo->conf.rx_deferred_start =0 ; +} + +static void +bnxt_txq_info_get_op (struct rte_eth_dev *dev,uint16_t queue_id, +struct rte_eth_txq_info *qinfo) +{ +struct bnxt_tx_queue *txq; + + txq = dev->data->tx_queues[queue_id]; + + qinfo->nb_desc = txq->nb_tx_desc; + + qinfo->conf.tx_thresh.pthresh = txq->pthresh; + qinfo->conf.tx_thresh.hthresh = txq->hthresh; + qinfo->conf.tx_thresh.wthresh = txq->wthresh; + + qinfo->conf.tx_free_thresh = txq->tx_free_thresh; + qinfo->conf.tx_rs_thresh =0 ; + qinfo->conf.txq_flags = txq->txq_flags; + qinfo->conf.tx_deferred_start = txq->tx_deferred_start; +} +static int bnxt_mtu_set_op (struct rte_eth_dev *eth_dev,uint16_t new_mtu) {struct bnxt *bp = eth_dev->data->dev_private;
@@ -1482,6 +1519,8 @@ static const struct eth_dev_ops bnxt_dev_ops = { .xstats_reset = bnxt_dev_xstats_reset_op, .fw_version_get = bnxt_fw_version_get, .set_mc_addr_list = bnxt_dev_set_mc_addr_list_op, + .rxq_info_get = bnxt_rxq_info_get_op, + .txq_info_get = bnxt_txq_info_get_op, };static bool bnxt_vf_pciid (uint16_t id)
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 19/23 bnxt: add additonal HWRM debug info to error messages
In reply to Ajit KhapardeAdd the cmd_err and opaque_0 and opaque_1 fields to HWRM error messages. These allow better debugging of some classes of HWRM errors.
--- drivers/net/bnxt/bnxt_hwrm.c | 19 ++++++++++++++++-- drivers/net/bnxt/hsi_struct_def_dpdk.h | 36 ++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-)
drivers/net/bnxt/bnxt_hwrm.c +17 -2
@@ -137,7 +137,7 @@ static int bnxt_hwrm_send_message_locked(struct bnxt *bp, void *msg, }if (i >=HWRM_CMD_TIMEOUT ) { -RTE_LOG (ERR ,PMD ,"Error sending msg %x\n" , +RTE_LOG (ERR ,PMD ,"Error sending msg 0x%04x\n" , req->req_type); goto err_ret; }
@@ -174,7 +174,22 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg, uint32_t msg_len) } \if (resp->error_code) { \ rc =rte_le_to_cpu_16 (resp->error_code); \ -RTE_LOG (ERR ,PMD ,"%s error %d\n" , __func__, rc); \ +if (resp->resp_len >=16 ) { \ +struct hwrm_err_output *tmp_hwrm_err_op = \ + (void *)resp; \ +RTE_LOG (ERR ,PMD , \ +"%s error %d:%d:%08x:%04x\n" , \ + __func__, \ + rc, tmp_hwrm_err_op->cmd_err, \ +rte_le_to_cpu_32 (\ + tmp_hwrm_err_op->opaque_0), \ +rte_le_to_cpu_16 (\ + tmp_hwrm_err_op->opaque_1)); \ + } \ +else { \ +RTE_LOG (ERR ,PMD , \ +"%s error %d\n" , __func__, rc); \ + } \return rc; \ } \ }
drivers/net/bnxt/hsi_struct_def_dpdk.h +36 -0
@@ -8569,6 +8569,42 @@ struct hwrm_stat_ctx_clr_stats_output {*/ } __attribute__((packed)); +struct hwrm_err_output { +uint16_t error_code; +/* +* Pass/Fail or error type Note: receiver to verify the in +* parameters, and fail the call with an error when appropriate +*/ +uint16_t req_type; +/* This field returns the type of original request. */ +uint16_t seq_id; +/* This field provides original sequence number of the command. */ +uint16_t resp_len; +/* +* This field is the length of the response in bytes. The last +* byte of the response is a valid flag that will read as '1' +* when the command has been completely written to memory. +*/ +uint32_t opaque_0; +/* debug info for this error response. */ +uint16_t opaque_1; +/* debug info for this error response. */ +uint8_t cmd_err; +/* +* In the case of an error response, command specific error code +* is returned in this field. +*/ +uint8_t valid; +/* +* This field is used in Output records to indicate that the +* output is completely written to RAM. This field should be +* read as '1' to indicate that the output has been completely +* written. When writing a command completion or response to an +* internal processor, the order of writes has to be such that +* this field is written last. +*/ +} __attribute__((packed)); +/* Port Tx Statistics Formats (408 bytes) */ struct tx_port_stats {uint64_t tx_64b_frames;
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 20/23 bnxt: reorg the query stats code
In reply to Ajit Khaparde1) Use hwrm_stat_ctx_query command to query statistics Using hwrm_stat_ctx_query command will allow polling
the statistics from hardware instead of using the current push model from the hardware which does a DMA of the stats to the host at fixed intervals.
2) Use the rx_mbuf_alloc_fail to track mbuf alloc failures.
3) We were wrongly incrementing hwrm_cmd_seq in bnxt_hwrm_stat_clear and bnxt_hwrm_stat_ctx_alloc functions. This patch fixes that.
--- drivers/net/bnxt/bnxt.h | 1 + drivers/net/bnxt/bnxt_ethdev.c | 1 + drivers/net/bnxt/bnxt_hwrm.c | 45 ++++++++++++-- drivers/net/bnxt/bnxt_hwrm.h | 2 + drivers/net/bnxt/bnxt_rxr.c | 16 +++-- drivers/net/bnxt/bnxt_stats.c | 59 +++--------------- drivers/net/bnxt/hsi_struct_def_dpdk.h | 108 +++++++++++++++++++++++++++++++++ 7 files changed, 170 insertions(+), 62 deletions(-)
drivers/net/bnxt/bnxt.h +1 -0
@@ -208,6 +208,7 @@ struct bnxt {uint16_t vxlan_fw_dst_port_id;uint16_t geneve_fw_dst_port_id;uint32_t fw_ver; +rte_atomic64_t rx_mbuf_alloc_fail; };/*
drivers/net/bnxt/bnxt_ethdev.c +1 -0
@@ -1595,6 +1595,7 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev) bp = eth_dev->data->dev_private; +rte_atomic64_init (&bp->rx_mbuf_alloc_fail); bp->dev_stopped =1 ;if (bnxt_vf_pciid (pci_dev->id.device_id))
drivers/net/bnxt/bnxt_hwrm.c +39 -6
74 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +2 -0
@@ -87,6 +87,8 @@ int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, unsigned int idx);int bnxt_hwrm_stat_ctx_free (struct bnxt *bp,struct bnxt_cp_ring_info *cpr,unsigned int idx); +int bnxt_hwrm_ctx_qstats (struct bnxt *bp,uint32_t cid,int idx, +struct rte_eth_stats *stats);int bnxt_hwrm_ver_get (struct bnxt *bp);
drivers/net/bnxt/bnxt_rxr.c +12 -4
@@ -68,8 +68,10 @@ static inline int bnxt_alloc_rx_data(struct bnxt_rx_queue *rxq,struct rte_mbuf *data; data =__bnxt_alloc_rx_data (rxq->mb_pool); -if (!data) +if (!data) { +rte_atomic64_inc (&rxq->bp->rx_mbuf_alloc_fail);return -ENOMEM ; + } rx_buf->mbuf = data;
@@ -87,8 +89,10 @@ static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq,struct rte_mbuf *data; data =__bnxt_alloc_rx_data (rxq->mb_pool); -if (!data) +if (!data) { +rte_atomic64_inc (&rxq->bp->rx_mbuf_alloc_fail);return -ENOMEM ; + }if (rxbd ==NULL )RTE_LOG (ERR ,PMD ,"Jumbo Frame. rxbd is NULL\n" );
@@ -321,8 +325,10 @@ static inline struct rte_mbuf *bnxt_tpa_end(struct rte_mbuf *new_data =__bnxt_alloc_rx_data (rxq->mb_pool);RTE_ASSERT (new_data !=NULL ); -if (!new_data) +if (!new_data) { +rte_atomic64_inc (&rxq->bp->rx_mbuf_alloc_fail);return NULL ; + } tpa_info->mbuf = new_data;return mbuf;
@@ -678,8 +684,10 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)for (i =0 ; i <BNXT_TPA_MAX ; i++) { rxr->tpa_info[i].mbuf =__bnxt_alloc_rx_data (rxq->mb_pool); -if (!rxr->tpa_info[i].mbuf) +if (!rxr->tpa_info[i].mbuf) { +rte_atomic64_inc (&rxq->bp->rx_mbuf_alloc_fail);return -ENOMEM ; + } } }
drivers/net/bnxt/bnxt_stats.c +7 -52
77 lines not on this page · raw message
drivers/net/bnxt/hsi_struct_def_dpdk.h +108 -0
120 lines not on this page · raw message
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 21/23 bnxt: update to HWRM version 1.7.5
In reply to Ajit KhapardeThis patch updates the Broadcom bnxt PMD to version 1.7.5 Most of the changes in the patch are in the hsi_struct_def_dpdk.h - an autogenerated file. The changes in the *.c files are because of changes in the macro names.
--- drivers/net/bnxt/bnxt_cpr.c | 2 +- drivers/net/bnxt/bnxt_hwrm.c | 10 +- drivers/net/bnxt/bnxt_ring.c | 4 +- drivers/net/bnxt/hsi_struct_def_dpdk.h | 2083 ++++++++++++++++++-------------- 4 files changed, 1212 insertions(+), 887 deletions(-)
drivers/net/bnxt/bnxt_cpr.c +1 -1
@@ -158,7 +158,7 @@ int bnxt_alloc_def_cp_ring(struct bnxt *bp)int rc; rc =bnxt_hwrm_ring_alloc (bp, cp_ring, -HWRM_RING_ALLOC_INPUT_RING_TYPE_CMPL , +HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL ,0 ,HWRM_NA_SIGNATURE ,HWRM_NA_SIGNATURE );if (rc)
drivers/net/bnxt/bnxt_hwrm.c +5 -5
@@ -597,7 +597,7 @@ static int bnxt_hwrm_port_phy_cfg(struct bnxt *bp, struct bnxt_link_info *conf) req.enables =rte_cpu_to_le_32 (enables); }else { req.flags = -rte_cpu_to_le_32 (HWRM_PORT_PHY_CFG_INPUT_FLAGS_FORCE_LINK_DOWN ); +rte_cpu_to_le_32 (HWRM_PORT_PHY_CFG_INPUT_FLAGS_FORCE_LINK_DWN );RTE_LOG (INFO ,PMD ,"Force Link Down\n" ); }
@@ -703,7 +703,7 @@ int bnxt_hwrm_ring_alloc(struct bnxt *bp, enables |=HWRM_RING_ALLOC_INPUT_ENABLES_STAT_CTX_ID_VALID ;break ; -case HWRM_RING_ALLOC_INPUT_RING_TYPE_CMPL : +case HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL : req.ring_type = ring_type;/* * TODO: Some HWRM versions crash with
@@ -724,7 +724,7 @@ int bnxt_hwrm_ring_alloc(struct bnxt *bp,if (rc ==0 && resp->error_code) rc =rte_le_to_cpu_16 (resp->error_code);switch (ring_type) { -case HWRM_RING_FREE_INPUT_RING_TYPE_CMPL : +case HWRM_RING_FREE_INPUT_RING_TYPE_L2_CMPL :RTE_LOG (ERR ,PMD ,"hwrm_ring_alloc cp failed. rc:%d\n" , rc);return rc;
@@ -765,7 +765,7 @@ int bnxt_hwrm_ring_free(struct bnxt *bp, rc =rte_le_to_cpu_16 (resp->error_code);switch (ring_type) { -case HWRM_RING_FREE_INPUT_RING_TYPE_CMPL : +case HWRM_RING_FREE_INPUT_RING_TYPE_L2_CMPL :RTE_LOG (ERR ,PMD ,"hwrm_ring_free cp failed. rc:%d\n" , rc);return rc;
@@ -1421,7 +1421,7 @@ static void bnxt_free_cp_ring(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,struct bnxt_ring *cp_ring = cpr->cp_ring_struct;bnxt_hwrm_ring_free (bp, cp_ring, -HWRM_RING_FREE_INPUT_RING_TYPE_CMPL ); +HWRM_RING_FREE_INPUT_RING_TYPE_L2_CMPL );memset (cpr->cp_desc_ring,0 , cpr->cp_ring_struct->ring_size *sizeof (*cpr->cp_desc_ring)); cpr->cp_raw_cons =0 ;
drivers/net/bnxt/bnxt_ring.c +2 -2
@@ -298,7 +298,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)/* Rx cmpl */ rc =bnxt_hwrm_ring_alloc (bp, cp_ring, -HWRM_RING_ALLOC_INPUT_RING_TYPE_CMPL , +HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL , idx,HWRM_NA_SIGNATURE ,HWRM_NA_SIGNATURE );if (rc)
@@ -365,7 +365,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)/* Tx cmpl */ rc =bnxt_hwrm_ring_alloc (bp, cp_ring, -HWRM_RING_ALLOC_INPUT_RING_TYPE_CMPL , +HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL , idx,HWRM_NA_SIGNATURE ,HWRM_NA_SIGNATURE );if (rc)
drivers/net/bnxt/hsi_struct_def_dpdk.h +1204 -879
2,936 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.10.1 (Apple Git-78)
Part of the diff is not shown here. View the raw message.
PATCH 22/23 bnxt: Add support to set VF rxmode
In reply to Ajit KhapardeThis patch adds support to configure the VF L2 Rx settings. The per VF setting is maintained in bnxt_child_vf_info.l2_rx_mask
--- drivers/net/bnxt/bnxt_hwrm.c | 20 +++++++++++- drivers/net/bnxt/bnxt_hwrm.h | 2 ++ drivers/net/bnxt/bnxt_rxq.c | 13 ++++++-- drivers/net/bnxt/bnxt_vnic.h | 5 +++ drivers/net/bnxt/rte_pmd_bnxt.c | 51 +++++++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 19 ++++++++++++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 1 + 7 files changed, 107 insertions(+), 4 deletions(-)
drivers/net/bnxt/bnxt_hwrm.c +19 -1
@@ -227,10 +227,16 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp,/* FIXME add multicast flag, when multicast adding options is supported * by ethtool. */ +if (vnic->flags &BNXT_VNIC_INFO_BCAST ) + mask =HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_BCAST ; +if (vnic->flags &BNXT_VNIC_INFO_UNTAGGED ) + mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_VLAN_NONVLAN ;if (vnic->flags &BNXT_VNIC_INFO_PROMISC ) - mask =HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_PROMISCUOUS ; + mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_PROMISCUOUS ;if (vnic->flags &BNXT_VNIC_INFO_ALLMULTI ) mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_ALL_MCAST ; +if (vnic->flags &BNXT_VNIC_INFO_MCAST ) + mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_MCAST ;if (vnic->mc_addr_cnt) { mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_MCAST ; req.num_mc_entries =rte_cpu_to_le_32 (vnic->mc_addr_cnt);
@@ -2337,6 +2343,18 @@ int bnxt_hwrm_func_cfg_vf_set_flags(struct bnxt *bp, uint16_t vf)return rc; } +void vf_vnic_set_rxmask_cb (struct bnxt_vnic_info *vnic,void *flagp) +{ +uint32_t *flag = flagp; + + vnic->flags = *flag; +} + +int bnxt_set_rx_mask_no_vlan (struct bnxt *bp,struct bnxt_vnic_info *vnic) +{ +return bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic,0 ,NULL ); +} +int bnxt_hwrm_func_buf_rgtr (struct bnxt *bp) {int rc =0 ;
drivers/net/bnxt/bnxt_hwrm.h +2 -0
@@ -137,6 +137,8 @@ int bnxt_hwrm_tunnel_dst_port_free(struct bnxt *bp, uint16_t port, uint8_t tunnel_type);void bnxt_free_tunnel_ports (struct bnxt *bp);int bnxt_hwrm_func_cfg_vf_set_flags (struct bnxt *bp,uint16_t vf); +void vf_vnic_set_rxmask_cb (struct bnxt_vnic_info *vnic,void *flagp); +int bnxt_set_rx_mask_no_vlan (struct bnxt *bp,struct bnxt_vnic_info *vnic);int bnxt_vf_default_vnic_count (struct bnxt *bp,uint16_t vf); int bnxt_hwrm_func_vf_vnic_query_and_config(struct bnxt *bp, uint16_t vf, void (*vnic_cb)(struct bnxt_vnic_info *, void *), void *cbdata,
drivers/net/bnxt/bnxt_rxq.c +10 -3
@@ -76,6 +76,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp) rc = -ENOMEM ; goto err_out; } + vnic->flags |=BNXT_VNIC_INFO_BCAST ;STAILQ_INSERT_TAIL (&bp->ff_pool[0 ], vnic, next); bp->nr_vnics++;
@@ -120,6 +121,9 @@ int bnxt_mq_rx_configure(struct bnxt *bp) }/* For each pool, allocate MACVLAN CFA rule & VNIC */ if (!pools) { + pools =RTE_MIN (bp->max_vnics, +RTE_MIN (bp->max_l2_ctx, +RTE_MIN (bp->max_rsscos_ctx,ETH_64_POOLS )));RTE_LOG (ERR ,PMD ,"VMDq pool not set, defaulted to 64\n" ); pools =ETH_64_POOLS ;
@@ -137,6 +141,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp) rc = -ENOMEM ; goto err_out; } + vnic->flags |=BNXT_VNIC_INFO_BCAST ;STAILQ_INSERT_TAIL (&bp->ff_pool[i], vnic, next); bp->nr_vnics++;
@@ -177,6 +182,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp) rc = -ENOMEM ; goto err_out; } + vnic->flags |=BNXT_VNIC_INFO_BCAST ;/* Partition the rx queues for the single pool */ for (i =0 ; i < bp->rx_cp_nr_rings; i++) { rxq = bp->eth_dev->data->rx_queues[i];
@@ -295,7 +301,7 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,int rc =0 ;if (!nb_desc || nb_desc >MAX_RX_DESC_CNT ) { -RTE_LOG (ERR ,PMD ,"nb_desc %d is invalid" , nb_desc); +RTE_LOG (ERR ,PMD ,"nb_desc %d is invalid\n" , nb_desc); rc = -EINVAL ; goto out; }
@@ -308,7 +314,7 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, rxq =rte_zmalloc_socket ("bnxt_rx_queue" ,sizeof (struct bnxt_rx_queue ),RTE_CACHE_LINE_SIZE , socket_id);if (!rxq) { -RTE_LOG (ERR ,PMD ,"bnxt_rx_queue allocation failed!" ); +RTE_LOG (ERR ,PMD ,"bnxt_rx_queue allocation failed!\n" ); rc = -ENOMEM ; goto out; }
@@ -333,7 +339,8 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,/* Allocate RX ring hardware descriptors */ if (bnxt_alloc_rings (bp, queue_idx,NULL , rxq->rx_ring, rxq->cp_ring,"rxr" )) { -RTE_LOG (ERR ,PMD ,"ring_dma_zone_reserve for rx_ring failed!" ); +RTE_LOG (ERR ,PMD , +"ring_dma_zone_reserve for rx_ring failed!\n" );bnxt_rx_queue_release_op (rxq); rc = -ENOMEM ; goto out;
drivers/net/bnxt/bnxt_vnic.h +5 -0
@@ -64,6 +64,11 @@ struct bnxt_vnic_info {uint32_t flags;#define BNXT_VNIC_INFO_PROMISC (1 << 0)#define BNXT_VNIC_INFO_ALLMULTI (1 << 1) +#define BNXT_VNIC_INFO_BCAST (1 << 2) +#define BNXT_VNIC_INFO_UCAST (1 << 3) +#define BNXT_VNIC_INFO_MCAST (1 << 4) +#define BNXT_VNIC_INFO_TAGGED (1 << 5) +#define BNXT_VNIC_INFO_UNTAGGED (1 << 6)uint16_t cos_rule;uint16_t lb_rule;
drivers/net/bnxt/rte_pmd_bnxt.c +51 -0
57 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt.h +19 -0
@@ -237,6 +237,25 @@ int rte_pmd_bnxt_reset_vf_stats(uint8_t port,*/ int rte_pmd_bnxt_set_vf_vlan_anti_spoof (uint8_t port,uint16_t vf,uint8_t on); +/** +* Set RX L2 Filtering mode of a VF of an Ethernet device. +* +* @param port +* The port identifier of the Ethernet device. +* @param vf +* VF id. +* @param rx_mask +* The RX mode mask +* @param on +* 1 - Enable a VF RX mode. +* 0 - Disable a VF RX mode. +* @return +* - (0) if successful. +* - (-ENODEV) if *port_id* invalid. +* - (-EINVAL) if bad parameter. +*/ +int rte_pmd_bnxt_set_vf_rxmode (uint8_t port,uint16_t vf, +uint16_t rx_mask,uint8_t on);/** * Returns the number of default RX queues on a VF
drivers/net/bnxt/rte_pmd_bnxt_version.map +1 -0
@@ -22,4 +22,5 @@ DPDK_17.08 { rte_pmd_bnxt_set_vf_vlan_filter; rte_pmd_bnxt_set_vf_vlan_anti_spoof; rte_pmd_bnxt_set_vf_vlan_insert; + rte_pmd_bnxt_set_vf_rxmode; };
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH 23/23 bnxt: add code to support vlan_pvid_set dev_op
In reply to Ajit KhapardeThis patch adds code to support vlan_pvid_set dev_op
--- drivers/net/bnxt/bnxt_ethdev.c | 21 +++++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.c | 31 +++++++++++++++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 1 + 3 files changed, 53 insertions(+)
drivers/net/bnxt/bnxt_ethdev.c +21 -0
@@ -1477,6 +1477,26 @@ static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)return rc; } +static int +bnxt_vlan_pvid_set_op (struct rte_eth_dev *dev,uint16_t pvid,int on) +{ +struct bnxt *bp = (struct bnxt *)dev->data->dev_private; +uint16_t vlan = bp->vlan; +int rc; + +if (BNXT_NPAR_PF (bp) ||BNXT_VF (bp)) { +RTE_LOG (ERR ,PMD , +"PVID cannot be modified for this function\n" ); +return -ENOTSUP ; + } + bp->vlan = on ? pvid :0 ; + + rc =bnxt_hwrm_set_default_vlan (bp,0 ,0 ); +if (rc) + bp->vlan = vlan; +return rc; +} +/* * Initialization */
@@ -1512,6 +1532,7 @@ static const struct eth_dev_ops bnxt_dev_ops = { .udp_tunnel_port_del = bnxt_udp_tunnel_port_del_op, .vlan_filter_set = bnxt_vlan_filter_set_op, .vlan_offload_set = bnxt_vlan_offload_set_op, + .vlan_pvid_set = bnxt_vlan_pvid_set_op, .mtu_set = bnxt_mtu_set_op, .mac_addr_set = bnxt_set_default_mac_addr_op, .xstats_get = bnxt_dev_xstats_get_op,
drivers/net/bnxt/bnxt_hwrm.c +31 -0
@@ -2434,6 +2434,37 @@ int bnxt_hwrm_func_bw_cfg(struct bnxt *bp, uint16_t vf,return rc; } +int bnxt_hwrm_set_default_vlan (struct bnxt *bp,int vf,uint8_t is_vf) +{ +struct hwrm_func_cfg_input req = {0 }; +struct hwrm_func_cfg_output *resp = bp->hwrm_cmd_resp_addr; +uint16_t dflt_vlan, fid; +uint32_t func_cfg_flags; +int rc =0 ; + +HWRM_PREP (req,FUNC_CFG ,-1 , resp); + +if (is_vf) { + dflt_vlan = bp->pf.vf_info[vf].dflt_vlan; + fid = bp->pf.vf_info[vf].fid; + func_cfg_flags = bp->pf.vf_info[vf].func_cfg_flags; + }else { + fid =rte_cpu_to_le_16 (0xffff ); + func_cfg_flags = bp->pf.func_cfg_flags; + dflt_vlan = bp->vlan; + } + + req.flags =rte_cpu_to_le_32 (func_cfg_flags); + req.fid =rte_cpu_to_le_16 (fid); + req.enables |=rte_cpu_to_le_32 (HWRM_FUNC_CFG_INPUT_ENABLES_DFLT_VLAN ); + req.dflt_vlan =rte_cpu_to_le_16 (dflt_vlan); + + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); +HWRM_CHECK_RESULT ; + +return rc; +} +int bnxt_hwrm_set_vf_vlan (struct bnxt *bp,int vf) {struct hwrm_func_cfg_input req = {0 };
drivers/net/bnxt/bnxt_hwrm.h +1 -0
@@ -136,6 +136,7 @@ int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,int bnxt_hwrm_tunnel_dst_port_free (struct bnxt *bp,uint16_t port,uint8_t tunnel_type);void bnxt_free_tunnel_ports (struct bnxt *bp); +int bnxt_hwrm_set_default_vlan (struct bnxt *bp,int vf,uint8_t is_vf);int bnxt_hwrm_func_cfg_vf_set_flags (struct bnxt *bp,uint16_t vf);void vf_vnic_set_rxmask_cb (struct bnxt_vnic_info *vnic,void *flagp);int bnxt_set_rx_mask_no_vlan (struct bnxt *bp,struct bnxt_vnic_info *vnic);
Signature · 1 line
2.10.1 (Apple Git-78)
Quoted 28 lines · Ajit Khaparde
This patchset amongst other changes adds support few more
dev_ops, updates HWRM to version 1.7.5, switches to polling stats from the hardware, support for LRO etc..bnxt: add various hwrm input/output structures
bnxt: code reorg to properly allocate resources in PF/VF modes
bnxt: add tunneling support
bnxt: support lack of huge pages
bnxt: add functions fortx_loopback,set_vf_macandqueues_drop_en
bnxt: add support for set VF QOS and MAC anti spoof
bnxt: add support for VLAN stripq, VLAN anti spoof and VLAN filtering for VFs
bnxt: add support to get and clear VF specific stats
bnxt: add code to determine the Rx status of VF
bnxt: add support to add a VF MAC address
bnxt: add support for xstats get/reset
bnxt: Add support for VLAN filter and stripdev_ops
bnxt: add code to configure a default VF VLAN
bnxt: add support forset_mc_addr_listandmac_addr_set
bnxt: add support forfw_version_getdev_op
bnxt: add support to set MTU
bnxt: add support for LRO
bnxt: addrxq_info_getandtxq_info_getdev_ops
bnxt: add additonal HWRM debug info to error messages
bnxt: reorg the query stats code
bnxt: update to HWRM version 1.7.5
bnxt: Add support to set VF rxmode
bnxt: add code to supportvlan_pvid_setdev_op
Quoted 1 line
25 files changed, 10407 insertions(+), 3036 deletions(-)
Hi Ajit,
This is a big patch, and as far as I can see it does mainly three things:
1) Update base driver kind of updates (although bnxt doesn't have a base folder, there are files we can put into this category).
2) Add some new driver features.
3) Add PMD specific APIs mainly to control VF from PF.
- Is it possible to group patches in the patchset as above, currently patches are all mixed and harder to understand?
- for 3), Some of the PMD specific APIs are common with exiting ones in i40e and ixgbe, should we extract them into eth_dev_ops now? @Thomas, any comment?
- For 2), can you please update features/bnxt.ini file in each patch that adds a feature, to enable that feature in the document. And finally a release doc update in separate patch can be good.
- Some commits has function names updated in the patch subject, can you please update them to describe the feature added, function name detail can be in commit log. You can use ./devtools/check-git-log.sh to verify commit logs, there are some set of errors now.
Thanks,
ferruh
22/05/2017 12:55, Ferruh Yigit:
Quoted 3 lines
- for 3), Some of the PMD specific APIs are common with exiting ones in i40e and ixgbe, should we extract them into
eth_dev_opsnow? @Thomas, any comment?
I don't think so.
Please let's discuss it in a separate thread.
Quoted 32 lines · Ferruh Yigit
Quoted 11 lines · Ajit Khaparde
This patchset amongst other changes adds support few more
dev_ops, updates HWRM to version 1.7.5, switches to polling stats from the hardware, support for LRO etc..bnxt: add various hwrm input/output structures
bnxt: code reorg to properly allocate resources in PF/VF modes
bnxt: add tunneling support
bnxt: support lack of huge pages
bnxt: add functions fortx_loopback,set_vf_macandqueues_drop_en
bnxt: add support for set VF QOS and MAC anti spoof
bnxt: add support for VLAN stripq, VLAN anti spoof and VLAN filteringfor VFs
Quoted 17 lines
bnxt: add support to get and clear VF specific stats
bnxt: add code to determine the Rx status of VF
bnxt: add support to add a VF MAC address
bnxt: add support for xstats get/reset
bnxt: Add support for VLAN filter and stripdev_ops
bnxt: add code to configure a default VF VLAN
bnxt: add support forset_mc_addr_listandmac_addr_set
bnxt: add support forfw_version_getdev_op
bnxt: add support to set MTU
bnxt: add support for LRO
bnxt: addrxq_info_getandtxq_info_getdev_ops
bnxt: add additonal HWRM debug info to error messages
bnxt: reorg the query stats code
bnxt: update to HWRM version 1.7.5
bnxt: Add support to set VF rxmode
bnxt: add code to supportvlan_pvid_setdev_opQuoted 1 line
25 files changed, 10407 insertions(+), 3036 deletions(-)
Quoted 8 lines
Hi Ajit,
This is a big patch, and as far as I can see it does mainly three things:
1) Update base driver kind of updates (although bnxt doesn't have a base
folder, there are files we can put into this category).
Since all the hardware specific code
is abstracted by the HWRM api
,
we feel doing a base folder will be pretty much another abstraction above this HWRM.
But
I will try to break down the bigger patch
into smaller ones.
Its just that I tried to keep the related code in one patch to keep the functionality together.
2) Add some new driver features.
Quoted 5 lines
3) Add PMD specific APIs mainly to control VF from PF.
- Is it possible to group patches in the patchset as above, currently patches are all mixed and harder to understand?
I will do my best.
Quoted 9 lines
- for 3), Some of the PMD specific APIs are common with exiting ones in i40e and ixgbe, should we extract them into
eth_dev_opsnow? @Thomas, any comment?- For 2), can you please update features/bnxt.ini file in each patch that adds a feature, to enable that feature in the document. And finally a release doc update in separate patch can be good.
Ok. I will work on that.
Quoted 7 lines
- Some commits has function names updated in the patch subject, can you please update them to describe the feature added, function name detail can be in commit log. You can use
./devtools/check-git-log.shto verify
commit logs, there are some set of errors now.
Sure.
Quoted 4 lines
Thanks,
ferruh
v2 cover bnxt patchset
This patchset amongst other changes adds support few more dev_ops, updates HWRM to version 1.7.7, switches to polling stats from the hardware, support for Jumbo MTU, LRO etc..
As suggedted for the previous submission:
Grouped in the end, it also has PMD specific APIs to control VF from PF. I have updated the release notes and the features file wherever possible.
--
bnxt: update to new HWRM version
bnxt: code reorg to properly allocate resources for PF/VF
bnxt: handle VF/PF initialization appropriately
bnxt: support lack of huge pages
bnxt: add additonal HWRM debug info to error messages
bnxt: add tunneling support
bnxt: add support for xstats get/reset
bnxt: Add support for VLAN filter and strip dev_ops
bnxt: add support for set multicast addr list and MAC addr set
bnxt: add support for fw_version_get dev_op
bnxt: add support to set MTU
bnxt: add support for LRO
bnxt: add rxq/txq info_get dev_ops
bnxt: add code to support VLAN pvid set dev_op
bnxt: reorg the query stats code
bnxt: add support for led on/off
bnxt: add support for tx loopback, set vf mac and queues drop
bnxt: add support for set VF QOS and MAC anti spoof
bnxt: add support for VLAN stripq, anti spoof and filtering for VFs
bnxt: add support to get and clear VF specific stats
bnxt: add code to determine the Rx status of VF
bnxt: add support to add a VF MAC address
bnxt: add code to configure a default VF VLAN
bnxt: Add support to set VF rxmode
update release notes
doc/guides/nics/features/bnxt.ini | 9 + doc/guides/rel_notes/release_17_08.rst | 8 + drivers/net/bnxt/Makefile | 4 + drivers/net/bnxt/bnxt.h | 142 +- drivers/net/bnxt/bnxt_cpr.c | 132 +- drivers/net/bnxt/bnxt_cpr.h | 17 + drivers/net/bnxt/bnxt_ethdev.c | 837 ++- drivers/net/bnxt/bnxt_filter.c | 54 +- drivers/net/bnxt/bnxt_filter.h | 3 + drivers/net/bnxt/bnxt_hwrm.c | 1606 ++++- drivers/net/bnxt/bnxt_hwrm.h | 66 +- drivers/net/bnxt/bnxt_irq.c | 21 +- drivers/net/bnxt/bnxt_ring.c | 159 +- drivers/net/bnxt/bnxt_ring.h | 4 +- drivers/net/bnxt/bnxt_rxq.c | 54 +- drivers/net/bnxt/bnxt_rxq.h | 3 + drivers/net/bnxt/bnxt_rxr.c | 396 +- drivers/net/bnxt/bnxt_rxr.h | 46 + drivers/net/bnxt/bnxt_stats.c | 266 +- drivers/net/bnxt/bnxt_stats.h | 10 + drivers/net/bnxt/bnxt_txr.c | 3 +- drivers/net/bnxt/bnxt_vnic.c | 68 +- drivers/net/bnxt/bnxt_vnic.h | 20 +- drivers/net/bnxt/hsi_struct_def_dpdk.h | 9678 +++++++++++++++++++++-------- drivers/net/bnxt/rte_pmd_bnxt.c | 701 +++ drivers/net/bnxt/rte_pmd_bnxt.h | 322 + drivers/net/bnxt/rte_pmd_bnxt_version.map | 22 + 27 files changed, 11705 insertions(+), 2946 deletions(-) create mode 100644 drivers/net/bnxt/rte_pmd_bnxt.c create mode 100644 drivers/net/bnxt/rte_pmd_bnxt.h
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v2 1/25 bnxt: update to new HWRM version
This patch updates the Broadcom bnxt PMD to version 1.7.7 Most of the changes in the patch are in the hsi_struct_def_dpdk.h - an autogenerated file. The changes in the *.c files are because of changes in the macro names.
--v1->v2: regroup related patches per review comment
--- drivers/net/bnxt/bnxt_hwrm.c | 10 +- drivers/net/bnxt/bnxt_ring.c | 8 +- drivers/net/bnxt/hsi_struct_def_dpdk.h | 8710 +++++++++++++++++++++++--------- 3 files changed, 6241 insertions(+), 2487 deletions(-)
drivers/net/bnxt/bnxt_hwrm.c +5 -5
@@ -511,7 +511,7 @@ static int bnxt_hwrm_port_phy_cfg(struct bnxt *bp, struct bnxt_link_info *conf) req.enables =rte_cpu_to_le_32 (enables); }else { req.flags = -rte_cpu_to_le_32 (HWRM_PORT_PHY_CFG_INPUT_FLAGS_FORCE_LINK_DOWN ); +rte_cpu_to_le_32 (HWRM_PORT_PHY_CFG_INPUT_FLAGS_FORCE_LINK_DWN );RTE_LOG (INFO ,PMD ,"Force Link Down\n" ); }
@@ -618,7 +618,7 @@ int bnxt_hwrm_ring_alloc(struct bnxt *bp, req.enables =rte_cpu_to_le_32 (rte_le_to_cpu_32 (req.enables) |HWRM_RING_ALLOC_INPUT_ENABLES_STAT_CTX_ID_VALID );break ; -case HWRM_RING_ALLOC_INPUT_RING_TYPE_CMPL : +case HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL : req.ring_type = ring_type;/* * TODO: Some HWRM versions crash with
@@ -639,7 +639,7 @@ int bnxt_hwrm_ring_alloc(struct bnxt *bp,if (rc ==0 && resp->error_code) rc =rte_le_to_cpu_16 (resp->error_code);switch (ring_type) { -case HWRM_RING_FREE_INPUT_RING_TYPE_CMPL : +case HWRM_RING_FREE_INPUT_RING_TYPE_L2_CMPL :RTE_LOG (ERR ,PMD ,"hwrm_ring_alloc cp failed. rc:%d\n" , rc);return rc;
@@ -680,7 +680,7 @@ int bnxt_hwrm_ring_free(struct bnxt *bp, rc =rte_le_to_cpu_16 (resp->error_code);switch (ring_type) { -case HWRM_RING_FREE_INPUT_RING_TYPE_CMPL : +case HWRM_RING_FREE_INPUT_RING_TYPE_L2_CMPL :RTE_LOG (ERR ,PMD ,"hwrm_ring_free cp failed. rc:%d\n" , rc);return rc;
@@ -1063,7 +1063,7 @@ static void bnxt_free_cp_ring(struct bnxt *bp,struct bnxt_ring *cp_ring = cpr->cp_ring_struct;bnxt_hwrm_ring_free (bp, cp_ring, -HWRM_RING_FREE_INPUT_RING_TYPE_CMPL ); +HWRM_RING_FREE_INPUT_RING_TYPE_L2_CMPL ); cp_ring->fw_ring_id =INVALID_HW_RING_ID ; bp->grp_info[idx].cp_fw_ring_id =INVALID_HW_RING_ID ; memset(cpr->cp_desc_ring, 0, cpr->cp_ring_struct->ring_size *
drivers/net/bnxt/bnxt_ring.c +4 -4
@@ -219,8 +219,8 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)struct bnxt_ring *cp_ring = cpr->cp_ring_struct; rc =bnxt_hwrm_ring_alloc (bp, cp_ring, -HWRM_RING_ALLOC_INPUT_RING_TYPE_CMPL , -0 ,HWRM_NA_SIGNATURE ); +HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL , +0 ,HWRM_NA_SIGNATURE );if (rc) goto err_out; cpr->cp_doorbell = pci_dev->mem_resource[2 ].addr;
@@ -238,7 +238,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)/* Rx cmpl */ rc =bnxt_hwrm_ring_alloc (bp, cp_ring, -HWRM_RING_ALLOC_INPUT_RING_TYPE_CMPL , +HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL , idx,HWRM_NA_SIGNATURE );if (rc) goto err_out;
@@ -276,7 +276,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)/* Tx cmpl */ rc =bnxt_hwrm_ring_alloc (bp, cp_ring, -HWRM_RING_ALLOC_INPUT_RING_TYPE_CMPL , +HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL , idx,HWRM_NA_SIGNATURE );if (rc) goto err_out;
drivers/net/bnxt/hsi_struct_def_dpdk.h +6232 -2478
2,934 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.10.1 (Apple Git-78)
Part of the diff is not shown here. View the raw message.
PATCH v2 2/25 bnxt: code reorg to properly allocate resources for PF/VF
In reply to Ajit Khaparde1) Move the function reset to bnxt_dev_init.
On the same lines, setup, enable and request interrupt to init path. Memory allocation is also being done in the init path.
2) After a function reset, configure the VFs. Distribute resources evenly between all functions (PF and VF) for now. In the future, this should be controllable.
3) The bnxt_vf_info and bnxt_pf_info had lot of duplication. Move the common items to struct bnxt. And only unique items specific to PF remain in the struct bnxt_pf_info.
4) Program the firmware to allow certain commands sent by a VF. Disallowing these will prevent clean VF driver cleanup.
5) Since PF/VF need to allocate resources from a pool in the hardware, use func_qcaps and func_qcfg to appropriately query the capabilities and available resources.
6) If a PF is being initialized and no VFs are allocated, explicitly call func_cfg to allocate the resources.
7) Once resources are requested from the firmware, update local copy of resource count in struct bnxt only after sending the func_qcfg to make sure the allocation request in the firmware went through.
The changes in this patch will be used by the subsequent patches to allow proper initialization of PF/VF instance.
--v1->v2: Regroup related patches per review comment
Also split bigger patch into smaller patches if possible.
--- drivers/net/bnxt/bnxt.h | 80 ++++-- drivers/net/bnxt/bnxt_ethdev.c | 155 ++++++++--- drivers/net/bnxt/bnxt_filter.c | 30 +- drivers/net/bnxt/bnxt_hwrm.c | 614 +++++++++++++++++++++++++++++++++++++---- drivers/net/bnxt/bnxt_hwrm.h | 17 +- drivers/net/bnxt/bnxt_vnic.c | 45 +-- drivers/net/bnxt/bnxt_vnic.h | 11 +- 7 files changed, 764 insertions(+), 188 deletions(-)
drivers/net/bnxt/bnxt.h +59 -21
@@ -35,6 +35,7 @@#define _BNXT_H_#include <inttypes.h> +#include <stdbool.h> #include <sys/queue.h> #include <rte_ethdev.h>
@@ -54,17 +55,19 @@ enum bnxt_hw_context { HW_CONTEXT_IS_LB = 3, }; -struct bnxt_vf_info { -uint16_t fw_fid; -uint8_t mac_addr[ETHER_ADDR_LEN ]; -uint16_t max_rsscos_ctx; -uint16_t max_cp_rings; -uint16_t max_tx_rings; -uint16_t max_rx_rings; -uint16_t max_l2_ctx; -uint16_t max_vnics; -uint16_t vlan; -struct bnxt_pf_info *pf; +struct bnxt_vlan_table_entry { +uint16_t tpid; +uint16_t vid; +} __attribute__((packed)); + +struct bnxt_child_vf_info { +void *req_buf; +struct bnxt_vlan_table_entry *vlan_table; + STAILQ_HEAD(, bnxt_filter_info) filter; +uint32_t func_cfg_flags; +uint32_t l2_rx_mask; +uint16_t fid; +bool random_mac; };struct bnxt_pf_info {
@@ -73,22 +76,20 @@ struct bnxt_pf_info {#define BNXT_FIRST_VF_FID 128#define BNXT_PF_RINGS_USED (bp) bnxt_get_num_queues(bp)#define BNXT_PF_RINGS_AVAIL (bp) (bp->pf.max_cp_rings - BNXT_PF_RINGS_USED(bp)) -uint32_t fw_fid;uint8_t port_id; -uint8_t mac_addr[ETHER_ADDR_LEN ]; -uint16_t max_rsscos_ctx; -uint16_t max_cp_rings; -uint16_t max_tx_rings; -uint16_t max_rx_rings; -uint16_t max_l2_ctx; -uint16_t max_vnics;uint16_t first_vf_id;uint16_t active_vfs;uint16_t max_vfs; +uint32_t func_cfg_flags;void *vf_req_buf;phys_addr_t vf_req_buf_dma_addr;uint32_t vf_req_fwd[8 ]; -struct bnxt_vf_info *vf; +uint16_t total_vnics; +struct bnxt_child_vf_info *vf_info; +#define BNXT_EVB_MODE_NONE 0 +#define BNXT_EVB_MODE_VEB 1 +#define BNXT_EVB_MODE_VEPA 2 +uint8_t evb_mode; };/* Max wait time is 10 * 100ms = 1s */
@@ -174,12 +175,49 @@ struct bnxt {struct bnxt_link_info link_info;struct bnxt_cos_queue_info cos_queue[BNXT_COS_QUEUE_COUNT ]; +uint16_t fw_fid; +uint8_t dflt_mac_addr[ETHER_ADDR_LEN ]; +uint16_t max_rsscos_ctx; +uint16_t max_cp_rings; +uint16_t max_tx_rings; +uint16_t max_rx_rings; +uint16_t max_l2_ctx; +uint16_t max_vnics; +uint16_t max_stat_ctx; +uint16_t vlan;struct bnxt_pf_info pf; -struct bnxt_vf_info vf;uint8_t port_partition_type;uint8_t dev_stopped; + uint32_t fw_ver; +}; + +/* +* Response sent back to the caller after callback +*/ +enum rte_pmd_bnxt_mb_event_rsp { +RTE_PMD_BNXT_MB_EVENT_NOOP_ACK ,/**< skip mbox request and ACK */ +RTE_PMD_BNXT_MB_EVENT_NOOP_NACK ,/**< skip mbox request and NACK */ +RTE_PMD_BNXT_MB_EVENT_PROCEED ,/**< proceed with mbox request */ +RTE_PMD_BNXT_MB_EVENT_MAX /**< max value of this enum */ +}; + +/* mailbox message types */ +#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 */ + +/* +* Data sent to the caller when the callback is executed. +*/ +struct rte_pmd_bnxt_mb_event_param { +uint16_t vf_id;/* Virtual Function number */ +int retval;/* return value */ +void *msg;/* pointer to message */ };int bnxt_link_update_op (struct rte_eth_dev *eth_dev,int wait_to_complete); +int bnxt_rcv_msg_from_vf (struct bnxt *bp,uint16_t vf_id,void *msg);#endif
drivers/net/bnxt/bnxt_ethdev.c +111 -44
242 lines not on this page · raw message
drivers/net/bnxt/bnxt_filter.c +3 -27
@@ -73,15 +73,7 @@ void bnxt_init_filters(struct bnxt *bp)struct bnxt_filter_info *filter;int i, max_filters; -if (BNXT_PF (bp)) { -struct bnxt_pf_info *pf = &bp->pf; - - max_filters = pf->max_l2_ctx; - }else { -struct bnxt_vf_info *vf = &bp->vf; - - max_filters = vf->max_l2_ctx; - } + max_filters = bp->max_l2_ctx;STAILQ_INIT (&bp->free_filter_list);for (i =0 ; i < max_filters; i++) { filter = &bp->filter_info[i];
@@ -122,15 +114,7 @@ void bnxt_free_filter_mem(struct bnxt *bp)return ;/* Ensure that all filters are freed */ -if (BNXT_PF (bp)) { -struct bnxt_pf_info *pf = &bp->pf; - - max_filters = pf->max_l2_ctx; - }else { -struct bnxt_vf_info *vf = &bp->vf; - - max_filters = vf->max_l2_ctx; - } + max_filters = bp->max_l2_ctx;for (i =0 ; i < max_filters; i++) { filter = &bp->filter_info[i];if (filter->fw_l2_filter_id != ((uint64_t )-1 )) {
@@ -155,15 +139,7 @@ int bnxt_alloc_filter_mem(struct bnxt *bp)struct bnxt_filter_info *filter_mem;uint16_t max_filters; -if (BNXT_PF (bp)) { -struct bnxt_pf_info *pf = &bp->pf; - - max_filters = pf->max_l2_ctx; - }else { -struct bnxt_vf_info *vf = &bp->vf; - - max_filters = vf->max_l2_ctx; - } + max_filters = bp->max_l2_ctx;/* Allocate memory for VNIC pool and filter pool */ filter_mem = rte_zmalloc("bnxt_filter_info", max_filters * sizeof(struct bnxt_filter_info),
drivers/net/bnxt/bnxt_hwrm.c +561 -53
738 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +14 -3
@@ -51,14 +51,17 @@ int bnxt_hwrm_clear_filter(struct bnxt *bp,int bnxt_hwrm_set_filter (struct bnxt *bp,struct bnxt_vnic_info *vnic,struct bnxt_filter_info *filter); -int bnxt_hwrm_exec_fwd_resp (struct bnxt *bp,void *fwd_cmd); +int bnxt_hwrm_reject_fwd_resp (struct bnxt *bp,uint16_t target_id, +void *encaped,size_t ec_size); -int bnxt_hwrm_func_driver_register (struct bnxt *bp,uint32_t flags, -uint32_t *vf_req_fwd); +int bnxt_hwrm_func_buf_rgtr (struct bnxt *bp); +int bnxt_hwrm_func_buf_unrgtr (struct bnxt *bp); +int bnxt_hwrm_func_driver_register (struct bnxt *bp);int bnxt_hwrm_func_qcaps (struct bnxt *bp);int bnxt_hwrm_func_reset (struct bnxt *bp);int bnxt_hwrm_func_driver_unregister (struct bnxt *bp,uint32_t flags); +int bnxt_hwrm_func_cfg_def_cp (struct bnxt *bp);int bnxt_hwrm_queue_qportcfg (struct bnxt *bp);
@@ -81,6 +84,8 @@ int bnxt_hwrm_ver_get(struct bnxt *bp);int bnxt_hwrm_vnic_alloc (struct bnxt *bp,struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_cfg (struct bnxt *bp,struct bnxt_vnic_info *vnic); +int bnxt_hwrm_vnic_qcfg (struct bnxt *bp,struct bnxt_vnic_info *vnic, +int16_t fw_vf_id);int bnxt_hwrm_vnic_ctx_alloc (struct bnxt *bp,struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_ctx_free (struct bnxt *bp,struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_free (struct bnxt *bp,struct bnxt_vnic_info *vnic);
@@ -101,5 +106,11 @@ int bnxt_alloc_hwrm_resources(struct bnxt *bp);int bnxt_get_hwrm_link_config (struct bnxt *bp,struct rte_eth_link *link);int bnxt_set_hwrm_link_config (struct bnxt *bp,bool link_up);int bnxt_hwrm_func_qcfg (struct bnxt *bp); +int bnxt_hwrm_allocate_pf_only (struct bnxt *bp); +int bnxt_hwrm_allocate_vfs (struct bnxt *bp,int num_vfs); +int bnxt_hwrm_func_vf_mac (struct bnxt *bp,uint16_t vf, +const uint8_t *mac_addr); +int bnxt_hwrm_func_qcfg_vf_default_mac (struct bnxt *bp,uint16_t vf, +struct ether_addr *mac);#endif
drivers/net/bnxt/bnxt_vnic.c +7 -38
73 lines not on this page · raw message
drivers/net/bnxt/bnxt_vnic.h +9 -2
@@ -42,8 +42,7 @@ struct bnxt_vnic_info {uint8_t ff_pool_idx;uint16_t fw_vnic_id;/* returned by Chimp during alloc */ -uint16_t fw_rss_cos_lb_ctx; -uint16_t ctx_is_rss_cos_lb; +uint16_t rss_rule;#define MAX_NUM_TRAFFIC_CLASSES 8#define MAX_NUM_RSS_QUEUES_PER_VNIC 16#define MAX_QUEUES_PER_VNIC (MAX_NUM_RSS_QUEUES_PER_VNIC + \
@@ -51,6 +50,8 @@ struct bnxt_vnic_info {uint16_t start_grp_id;uint16_t end_grp_id;uint16_t fw_grp_ids[MAX_QUEUES_PER_VNIC ]; +uint16_t dflt_ring_grp; +uint16_t mru;uint16_t hash_type;phys_addr_t rss_table_dma_addr;uint16_t *rss_table;
@@ -60,8 +61,14 @@ struct bnxt_vnic_info {#define BNXT_VNIC_INFO_PROMISC (1 << 0)#define BNXT_VNIC_INFO_ALLMULTI (1 << 1) +uint16_t cos_rule; +uint16_t lb_rule;bool vlan_strip;bool func_default; +bool bd_stall; +bool roce_dual; +bool roce_only; +bool rss_dflt_cr; STAILQ_HEAD(, bnxt_filter_info) filter; };
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v2 3/25 bnxt: handle VF/PF initialization appropriately
In reply to Ajit Khaparde1) For a VF, query the firmware to determine if a MAC address is already configured. If not configure a random default MAC address.
2) Do not initialize the default completion ring in bnxt_alloc_hwrm_rings().
3) While registering for async events with the firmware,
use func_vf_cfg for a VF and use func_cfg for a PF.
4) Query the VNIC plcmode config using the bnxt_hwrm_vnic_plcmodes_qcfg before a VNIC is updated. Reconfigure the VNIC with the plcmode configuration queried earlier. Not doing this could overwrite the plcmodes in some cases.
5) Reorg the bnxt_handle_fwd_req to properly handle the forwarded requests. The previous code did not handle it completely.
--v1->v2: regroup related patches and incorporate other
review comments.
--- doc/guides/nics/features/bnxt.ini | 2 + drivers/net/bnxt/bnxt_cpr.c | 131 ++++++++++++++++++++++--------- drivers/net/bnxt/bnxt_cpr.h | 17 ++++ drivers/net/bnxt/bnxt_ethdev.c | 30 +++++--- drivers/net/bnxt/bnxt_filter.c | 2 +- drivers/net/bnxt/bnxt_hwrm.c | 158 +++++++++++++++++++++++++++++++++----- drivers/net/bnxt/bnxt_hwrm.h | 4 +- drivers/net/bnxt/bnxt_irq.c | 21 +++-- drivers/net/bnxt/bnxt_ring.c | 17 +--- 9 files changed, 294 insertions(+), 88 deletions(-)
doc/guides/nics/features/bnxt.ini +2 -0
@@ -12,5 +12,7 @@ Multicast MAC filter = Y RSS reta update = Y Basic stats = Y Extended stats = Y +SR-IOV = Y +Linux VFIO = Y Linux UIO = Y x86-64 = Y
drivers/net/bnxt/bnxt_cpr.c +95 -36
151 lines not on this page · raw message
drivers/net/bnxt/bnxt_cpr.h +17 -0
@@ -33,6 +33,7 @@#ifndef _BNXT_CPR_H_#define _BNXT_CPR_H_ +#include <stdbool.h> #include <rte_io.h>
@@ -56,6 +57,19 @@ RING_CMP(((cpr)->cp_ring_struct), raw_cons)), \ ((cpr)->cp_doorbell)) +#define B_CP_DB_ARM (cpr) rte_write32((DB_KEY_CP), ((cpr)->cp_doorbell)) +#define B_CP_DB_DISARM (cpr) (*(uint32_t *)((cpr)->cp_doorbell) = \ + DB_KEY_CP | DB_IRQ_DIS) + +#define B_CP_DB_IDX_ARM (cpr, cons) \ + (*(uint32_t *)((cpr)->cp_doorbell) = (DB_CP_REARM_FLAGS | \ + (cons))) + +#define B_CP_DB_IDX_DISARM (cpr, cons) do { \ + rte_smp_wmb(); \ + (*(uint32_t *)((cpr)->cp_doorbell) = (DB_CP_FLAGS | \ + (cons)); \ +} while (0)#define B_CP_DIS_DB (cpr, raw_cons) \ rte_write32((DB_CP_FLAGS | \ RING_CMP(((cpr)->cp_ring_struct), raw_cons)), \
@@ -75,6 +89,8 @@ struct bnxt_cp_ring_info {uint32_t hw_stats_ctx_id;struct bnxt_ring *cp_ring_struct; +uint16_t cp_cons; +bool v; };#define RX_CMP_L2_ERRORS \
@@ -82,6 +98,7 @@ struct bnxt_cp_ring_info {struct bnxt ; +int bnxt_alloc_def_cp_ring (struct bnxt *bp);void bnxt_free_def_cp_ring (struct bnxt *bp);int bnxt_init_def_ring_struct (struct bnxt *bp,unsigned int socket_id);void bnxt_handle_async_event (struct bnxt *bp,struct cmpl_base *cmp);
drivers/net/bnxt/bnxt_ethdev.c +19 -11
@@ -228,28 +228,31 @@ static int bnxt_init_chip(struct bnxt *bp) rc =bnxt_hwrm_vnic_alloc (bp, vnic);if (rc) { -RTE_LOG (ERR ,PMD ,"HWRM vnic alloc failure rc: %x\n" , - rc); +RTE_LOG (ERR ,PMD ,"HWRM vnic %d alloc failure rc: %x\n" , + i, rc); goto err_out; } rc =bnxt_hwrm_vnic_ctx_alloc (bp, vnic);if (rc) {RTE_LOG (ERR ,PMD , -"HWRM vnic ctx alloc failure rc: %x\n" , rc); +"HWRM vnic %d ctx alloc failure rc: %x\n" , + i, rc); goto err_out; } rc =bnxt_hwrm_vnic_cfg (bp, vnic);if (rc) { -RTE_LOG (ERR ,PMD ,"HWRM vnic cfg failure rc: %x\n" , rc); +RTE_LOG (ERR ,PMD ,"HWRM vnic %d cfg failure rc: %x\n" , + i, rc); goto err_out; } rc =bnxt_set_hwrm_vnic_filters (bp, vnic);if (rc) { -RTE_LOG (ERR ,PMD ,"HWRM vnic filter failure rc: %x\n" , - rc); +RTE_LOG (ERR ,PMD , +"HWRM vnic %d filter failure rc: %x\n" , + i, rc); goto err_out; }if (vnic->rss_table && vnic->hash_type) {
@@ -269,8 +272,8 @@ static int bnxt_init_chip(struct bnxt *bp) rc =bnxt_hwrm_vnic_rss_cfg (bp, vnic);if (rc) {RTE_LOG (ERR ,PMD , -"HWRM vnic set RSS failure rc: %x\n" , - rc); +"HWRM vnic %d set RSS failure rc: %x\n" , + i, rc); goto err_out; } }
@@ -638,7 +641,7 @@ int bnxt_link_update_op(struct rte_eth_dev *eth_dev, int wait_to_complete) new.link_speed =ETH_LINK_SPEED_100M ; new.link_duplex =ETH_LINK_FULL_DUPLEX ;RTE_LOG (ERR ,PMD , -"Failed to retrieve link rc = 0x%x!" , rc); +"Failed to retrieve link rc = 0x%x!\n" , rc); goto out; }rte_delay_ms (BNXT_LINK_WAIT_INTERVAL );
@@ -1010,7 +1013,8 @@ static bool bnxt_vf_pciid(uint16_t id)if (id ==BROADCOM_DEV_ID_57304_VF || id ==BROADCOM_DEV_ID_57406_VF || id ==BROADCOM_DEV_ID_5731X_VF || - id ==BROADCOM_DEV_ID_5741X_VF ) + id ==BROADCOM_DEV_ID_5741X_VF || + id ==BROADCOM_DEV_ID_57414_VF )return true;return false; }
@@ -1066,7 +1070,7 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)int rc;if (version_printed++ ==0 ) -RTE_LOG (INFO ,PMD ,"%s" , bnxt_version); +RTE_LOG (INFO ,PMD ,"%s\n" , bnxt_version);rte_eth_copy_pci_info (eth_dev, pci_dev); eth_dev->data->dev_flags |=RTE_ETH_DEV_DETACHABLE ;
@@ -1207,6 +1211,10 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)if (rc) goto error_free_int; + rc =bnxt_alloc_def_cp_ring (bp); +if (rc) + goto error_free_int; +bnxt_enable_int (bp);return 0 ;
drivers/net/bnxt/bnxt_filter.c +1 -1
@@ -126,7 +126,7 @@ void bnxt_free_filter_mem(struct bnxt *bp)"HWRM filter cannot be freed rc = %d\n" , rc); } - filter->fw_l2_filter_id =-1 ; + filter->fw_l2_filter_id =UINT64_MAX ; }STAILQ_INIT (&bp->free_filter_list);
drivers/net/bnxt/bnxt_hwrm.c +140 -18
209 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +3 -1
@@ -51,7 +51,8 @@ int bnxt_hwrm_clear_filter(struct bnxt *bp,int bnxt_hwrm_set_filter (struct bnxt *bp,struct bnxt_vnic_info *vnic,struct bnxt_filter_info *filter); -int bnxt_hwrm_exec_fwd_resp (struct bnxt *bp,void *fwd_cmd); +int bnxt_hwrm_exec_fwd_resp (struct bnxt *bp,uint16_t target_id, +void *encaped,size_t ec_size);int bnxt_hwrm_reject_fwd_resp (struct bnxt *bp,uint16_t target_id,void *encaped,size_t ec_size);
@@ -62,6 +63,7 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp);int bnxt_hwrm_func_reset (struct bnxt *bp);int bnxt_hwrm_func_driver_unregister (struct bnxt *bp,uint32_t flags);int bnxt_hwrm_func_cfg_def_cp (struct bnxt *bp); +int bnxt_hwrm_vf_func_cfg_def_cp (struct bnxt *bp);int bnxt_hwrm_queue_qportcfg (struct bnxt *bp);
drivers/net/bnxt/bnxt_irq.c +16 -5
@@ -66,16 +66,26 @@ static void bnxt_int_handler(void *param)/* Handle any async event */ bnxt_handle_async_event (bp, cmp);break ; -case CMPL_BASE_TYPE_HWRM_FWD_RESP : +case CMPL_BASE_TYPE_HWRM_FWD_REQ :/* Handle HWRM forwarded responses */ bnxt_handle_fwd_req (bp, cmp);break ;default :/* Ignore any other events */ +if (cmp->type &rte_cpu_to_le_16 (0x01 )) { +if (!CMP_VALID (cmp, raw_cons, + cpr->cp_ring_struct)) + goto no_more; + } +RTE_LOG (INFO ,PMD , +"Ignoring %02x completion\n" ,CMP_TYPE (cmp));break ; } raw_cons =NEXT_RAW_CMP (raw_cons); - } + + }; +no_more: + cpr->cp_raw_cons = raw_cons;B_CP_DB_REARM (cpr, cpr->cp_raw_cons); }
@@ -102,14 +112,15 @@ void bnxt_disable_int(struct bnxt *bp)struct bnxt_cp_ring_info *cpr = bp->def_cp_ring;/* Only the default completion ring */ -B_CP_DIS_DB (cpr, cpr->cp_raw_cons); +if (cpr !=NULL && cpr->cp_doorbell !=NULL ) +B_CP_DB_DISARM (cpr); }void bnxt_enable_int (struct bnxt *bp) {struct bnxt_cp_ring_info *cpr = bp->def_cp_ring; -B_CP_DB_REARM (cpr, cpr->cp_raw_cons); +B_CP_DB_ARM (cpr); }int bnxt_setup_int (struct bnxt *bp)
@@ -136,7 +147,7 @@ int bnxt_setup_int(struct bnxt *bp)return 0 ; setup_exit: -RTE_LOG (ERR ,PMD ,"bnxt_irq_tbl setup failed" ); +RTE_LOG (ERR ,PMD ,"bnxt_irq_tbl setup failed\n" );return rc; }
drivers/net/bnxt/bnxt_ring.c +1 -16
@@ -213,21 +213,6 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)unsigned int i;int rc =0 ; -/* Default completion ring */ - { -struct bnxt_cp_ring_info *cpr = bp->def_cp_ring; -struct bnxt_ring *cp_ring = cpr->cp_ring_struct; - - rc =bnxt_hwrm_ring_alloc (bp, cp_ring, -HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL , -0 ,HWRM_NA_SIGNATURE ); -if (rc) - goto err_out; - cpr->cp_doorbell = pci_dev->mem_resource[2 ].addr; -B_CP_DIS_DB (cpr, cpr->cp_raw_cons); - bp->grp_info[0 ].cp_fw_ring_id = cp_ring->fw_ring_id; - } -for (i =0 ; i < bp->rx_cp_nr_rings; i++) {struct bnxt_rx_queue *rxq = bp->rx_queues[i];struct bnxt_cp_ring_info *cpr = rxq->cp_ring;
@@ -259,7 +244,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp) bp->grp_info[idx].rx_fw_ring_id = ring->fw_ring_id;B_RX_DB (rxr->rx_doorbell, rxr->rx_prod);if (bnxt_init_one_rx_ring (rxq)) { -RTE_LOG (ERR ,PMD ,"bnxt_init_one_rx_ring failed!" ); +RTE_LOG (ERR ,PMD ,"bnxt_init_one_rx_ring failed!\n" );bnxt_rx_queue_release_op (rxq);return -ENOMEM ; }
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v2 4/25 bnxt: support lack of huge pages
In reply to Ajit Khaparderte_malloc_virt2phy() does not return a physical address if huge pages aren't in use. Further, rte_memzone->phys_addr is not a physical address.
Use rte_mem_virt2phy() and manually lock pages to support lack of huge pages.
Also check the return value of rte_mem_virt2phy()
Verify the function returns an address. Otherwise return an error and log a message.
--v1->v2: regroup related patches and incorporate other review comments
--- drivers/net/bnxt/bnxt_hwrm.c | 17 +++++++++++++++-- drivers/net/bnxt/bnxt_ring.c | 31 +++++++++++++++++++++++++------ drivers/net/bnxt/bnxt_vnic.c | 16 +++++++++++++++- 3 files changed, 55 insertions(+), 9 deletions(-)
drivers/net/bnxt/bnxt_hwrm.c +15 -2
@@ -489,8 +489,15 @@ int bnxt_hwrm_ver_get(struct bnxt *bp) rc = -ENOMEM ; goto error; } +rte_mem_lock_page (bp->hwrm_cmd_resp_addr); bp->hwrm_cmd_resp_dma_addr = -rte_malloc_virt2phy (bp->hwrm_cmd_resp_addr); +rte_mem_virt2phy (bp->hwrm_cmd_resp_addr); +if (bp->hwrm_cmd_resp_dma_addr ==0 ) { +RTE_LOG (ERR ,PMD , +"Unable to map response buffer to physical memory.\n" ); + rc = -ENOMEM ; + goto error; + } bp->max_resp_len = max_resp_len; }
@@ -1363,10 +1370,16 @@ int bnxt_alloc_hwrm_resources(struct bnxt *bp) bp->max_req_len =HWRM_MAX_REQ_LEN ; bp->max_resp_len =HWRM_MAX_RESP_LEN ; bp->hwrm_cmd_resp_addr =rte_malloc (type, bp->max_resp_len,0 ); +rte_mem_lock_page (bp->hwrm_cmd_resp_addr);if (bp->hwrm_cmd_resp_addr ==NULL )return -ENOMEM ; bp->hwrm_cmd_resp_dma_addr = -rte_malloc_virt2phy (bp->hwrm_cmd_resp_addr); +rte_mem_virt2phy (bp->hwrm_cmd_resp_addr); +if (bp->hwrm_cmd_resp_dma_addr ==0 ) { +RTE_LOG (ERR ,PMD , +"unable to map response address to physical memory\n" ); +return -ENOMEM ; + }rte_spinlock_init (&bp->hwrm_lock);return 0 ;
drivers/net/bnxt/bnxt_ring.c +25 -6
@@ -32,6 +32,7 @@*/ #include <rte_memzone.h> +#include <unistd.h> #include "bnxt.h" #include "bnxt_cpr.h"
@@ -96,6 +97,8 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,struct rte_pci_device *pdev = bp->pdev;const struct rte_memzone *mz =NULL ;char mz_name[RTE_MEMZONE_NAMESIZE ]; +phys_addr_t mz_phys_addr; +int sz;int stats_len = (tx_ring_info || rx_ring_info) ?RTE_CACHE_LINE_ROUNDUP (sizeof (struct ctx_hw_stats64 )) :0 ;
@@ -136,21 +139,37 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx, mz_name[RTE_MEMZONE_NAMESIZE -1 ] =0 ; mz =rte_memzone_lookup (mz_name);if (!mz) { - mz =rte_memzone_reserve (mz_name, total_alloc_len, + mz =rte_memzone_reserve_aligned (mz_name, total_alloc_len,SOCKET_ID_ANY ,RTE_MEMZONE_2MB | -RTE_MEMZONE_SIZE_HINT_ONLY ); +RTE_MEMZONE_SIZE_HINT_ONLY , +getpagesize ());if (mz ==NULL )return -ENOMEM ; }memset (mz->addr,0 , mz->len); + mz_phys_addr = mz->phys_addr; +if ((unsigned long )mz->addr == mz_phys_addr) { +RTE_LOG (WARNING ,PMD , +"Memzone physical address same as virtual.\n" ); +RTE_LOG (WARNING ,PMD , +"Using rte_mem_virt2phy()\n" ); +for (sz =0 ; sz < total_alloc_len; sz +=getpagesize ()) +rte_mem_lock_page (((char *)mz->addr) + sz); + mz_phys_addr =rte_mem_virt2phy (mz->addr); +if (mz_phys_addr ==0 ) { +RTE_LOG (ERR ,PMD , +"unable to map ring address to physical memory\n" ); +return -ENOMEM ; + } + }if (tx_ring_info) { tx_ring = tx_ring_info->tx_ring_struct; tx_ring->bd = ((char *)mz->addr + tx_ring_start); tx_ring_info->tx_desc_ring = (struct tx_bd_long *)tx_ring->bd; - tx_ring->bd_dma = mz->phys_addr + tx_ring_start; + tx_ring->bd_dma = mz_phys_addr + tx_ring_start; tx_ring_info->tx_desc_mapping = tx_ring->bd_dma; tx_ring->mem_zone = (const void *)mz;
@@ -170,7 +189,7 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx, rx_ring->bd = ((char *)mz->addr + rx_ring_start); rx_ring_info->rx_desc_ring = (struct rx_prod_pkt_bd *)rx_ring->bd; - rx_ring->bd_dma = mz->phys_addr + rx_ring_start; + rx_ring->bd_dma = mz_phys_addr + rx_ring_start; rx_ring_info->rx_desc_mapping = rx_ring->bd_dma; rx_ring->mem_zone = (const void *)mz;
@@ -185,7 +204,7 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx, } cp_ring->bd = ((char *)mz->addr + cp_ring_start); - cp_ring->bd_dma = mz->phys_addr + cp_ring_start; + cp_ring->bd_dma = mz_phys_addr + cp_ring_start; cp_ring_info->cp_desc_ring = cp_ring->bd; cp_ring_info->cp_desc_mapping = cp_ring->bd_dma; cp_ring->mem_zone = (const void *)mz;
@@ -196,7 +215,7 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx, *cp_ring->vmem = ((char *)mz->addr + stats_len);if (stats_len) { cp_ring_info->hw_stats = mz->addr; - cp_ring_info->hw_stats_map = mz->phys_addr; + cp_ring_info->hw_stats_map = mz_phys_addr; } cp_ring_info->hw_stats_ctx_id =HWRM_NA_SIGNATURE ;return 0 ;
drivers/net/bnxt/bnxt_vnic.c +15 -1
@@ -173,6 +173,7 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp) HW_HASH_KEY_SIZE);uint16_t max_vnics;int i; +phys_addr_t mz_phys_addr; max_vnics = bp->max_vnics; snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
@@ -189,6 +190,19 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)if (!mz)return -ENOMEM ; } + mz_phys_addr = mz->phys_addr; +if ((unsigned long )mz->addr == mz_phys_addr) { +RTE_LOG (WARNING ,PMD , +"Memzone physical address same as virtual.\n" ); +RTE_LOG (WARNING ,PMD , +"Using rte_mem_virt2phy()\n" ); + mz_phys_addr =rte_mem_virt2phy (mz->addr); +if (mz_phys_addr ==0 ) { +RTE_LOG (ERR ,PMD , +"unable to map vnic address to physical memory\n" ); +return -ENOMEM ; + } + }for (i =0 ; i < max_vnics; i++) { vnic = &bp->vnic_info[i];
@@ -198,7 +212,7 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp) (void *)((char *)mz->addr + (entry_length * i));memset (vnic->rss_table,-1 , entry_length); - vnic->rss_table_dma_addr = mz->phys_addr + (entry_length * i); + vnic->rss_table_dma_addr = mz_phys_addr + (entry_length * i); vnic->rss_hash_key = (void *)((char *)vnic->rss_table +HW_HASH_INDEX_SIZE *sizeof (*vnic->rss_table));
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v2 5/25 bnxt: add additonal HWRM debug info to error messages
In reply to Ajit KhapardeAdd the cmd_err and opaque_0 and opaque_1 fields to HWRM error messages. These allow better debugging of some classes of HWRM errors.
--v1->v2: regroup related patches and incorporate other review comments
--- drivers/net/bnxt/bnxt_hwrm.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
drivers/net/bnxt/bnxt_hwrm.c +17 -2
@@ -139,7 +139,7 @@ static int bnxt_hwrm_send_message_locked(struct bnxt *bp, void *msg, }if (i >=HWRM_CMD_TIMEOUT ) { -RTE_LOG (ERR ,PMD ,"Error sending msg %x\n" , +RTE_LOG (ERR ,PMD ,"Error sending msg 0x%04x\n" , req->req_type); goto err_ret; }
@@ -176,7 +176,22 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg, uint32_t msg_len) } \if (resp->error_code) { \ rc =rte_le_to_cpu_16 (resp->error_code); \ -RTE_LOG (ERR ,PMD ,"%s error %d\n" , __func__, rc); \ +if (resp->resp_len >=16 ) { \ +struct hwrm_err_output *tmp_hwrm_err_op = \ + (void *)resp; \ +RTE_LOG (ERR ,PMD , \ +"%s error %d:%d:%08x:%04x\n" , \ + __func__, \ + rc, tmp_hwrm_err_op->cmd_err, \ +rte_le_to_cpu_32 (\ + tmp_hwrm_err_op->opaque_0), \ +rte_le_to_cpu_16 (\ + tmp_hwrm_err_op->opaque_1)); \ + } \ +else { \ +RTE_LOG (ERR ,PMD , \ +"%s error %d\n" , __func__, rc); \ + } \return rc; \ } \ }
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v2 6/25 bnxt: add tunneling support
In reply to Ajit KhapardeAdd support for udp_tunnel_port_add/del dev_ops to configure a UDP port for VXLAN and Geneve Tunnel protocols.
The HWRM supports only one global destination port for a tunnel type, use a referene counter to keep track of its usage.
Cache the configured VXLAN/Geneve ports and use that value to check if the right UDP port is being freed up.
Skip calling bnxt_hwrm_tunnel_dst_port_alloc if the same UDP port is being programmed.
Skip calling bnxt_hwrm_tunnel_dst_port_free if no UDP port has been configured.
Also update tx offload capabilities
--v1->v2: regroup related patches and incorporate other review comments
--- drivers/net/bnxt/bnxt.h | 6 +++ drivers/net/bnxt/bnxt_ethdev.c | 119 ++++++++++++++++++++++++++++++++++++++++- drivers/net/bnxt/bnxt_hwrm.c | 56 +++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 5 ++ drivers/net/bnxt/bnxt_txr.c | 3 +- 5 files changed, 187 insertions(+), 2 deletions(-)
drivers/net/bnxt/bnxt.h +6 -0
@@ -188,6 +188,12 @@ struct bnxt {struct bnxt_pf_info pf;uint8_t port_partition_type;uint8_t dev_stopped; +uint8_t vxlan_port_cnt; +uint8_t geneve_port_cnt; +uint16_t vxlan_port; +uint16_t geneve_port; +uint16_t vxlan_fw_dst_port_id; +uint16_t geneve_fw_dst_port_id;uint32_t fw_ver; };
drivers/net/bnxt/bnxt_ethdev.c +118 -1
137 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.c +56 -0
74 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +5 -0
@@ -114,5 +114,10 @@ int bnxt_hwrm_func_vf_mac(struct bnxt *bp, uint16_t vf, const uint8_t *mac_addr);int bnxt_hwrm_func_qcfg_vf_default_mac (struct bnxt *bp,uint16_t vf,struct ether_addr *mac); +int bnxt_hwrm_tunnel_dst_port_alloc (struct bnxt *bp,uint16_t port, +uint8_t tunnel_type); +int bnxt_hwrm_tunnel_dst_port_free (struct bnxt *bp,uint16_t port, +uint8_t tunnel_type); +void bnxt_free_tunnel_ports (struct bnxt *bp);#endif
drivers/net/bnxt/bnxt_txr.c +2 -1
@@ -213,7 +213,8 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,/* TSO */ txbd1->lflags =TX_BD_LONG_LFLAGS_LSO ; txbd1->hdr_size = tx_pkt->l2_len + tx_pkt->l3_len + - tx_pkt->l4_len; + tx_pkt->l4_len + tx_pkt->outer_l2_len + + tx_pkt->outer_l3_len; txbd1->mss = tx_pkt->tso_segsz; } else if (tx_pkt->ol_flags & (PKT_TX_TCP_CKSUM |
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v2 7/25 bnxt: add support for xstats get/reset
In reply to Ajit KhapardeThis patch adds support to get and reset xstats dev_ops
dev_ops added:xstats_get, xstats_get_name, xstats_reset
HWRM commands added:hwrm_port_qstats, hwrm_port_clr_stats
--v1->v2: regroup related patches and incorporate other review comments
--- drivers/net/bnxt/bnxt.h | 7 ++ drivers/net/bnxt/bnxt_ethdev.c | 84 +++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.c | 36 +++++++ drivers/net/bnxt/bnxt_hwrm.h | 3 +- drivers/net/bnxt/bnxt_stats.c | 207 +++++++++++++++++++++++++++++++++++++++++ drivers/net/bnxt/bnxt_stats.h | 10 ++ 6 files changed, 346 insertions(+), 1 deletion(-)
drivers/net/bnxt/bnxt.h +7 -0
@@ -130,6 +130,7 @@ struct bnxt {uint32_t flags;#define BNXT_FLAG_REGISTERED (1 << 0)#define BNXT_FLAG_VF (1 << 1) +#define BNXT_FLAG_PORT_STATS (1 << 2)#define BNXT_PF (bp) (!((bp)->flags & BNXT_FLAG_VF))#define BNXT_VF (bp) ((bp)->flags & BNXT_FLAG_VF)#define BNXT_NPAR_ENABLED (bp) ((bp)->port_partition_type)
@@ -138,10 +139,16 @@ struct bnxt {unsigned int rx_nr_rings;unsigned int rx_cp_nr_rings;struct bnxt_rx_queue **rx_queues; +const void *rx_mem_zone; +struct rx_port_stats *hw_rx_port_stats; +phys_addr_t hw_rx_port_stats_map;unsigned int tx_nr_rings;unsigned int tx_cp_nr_rings;struct bnxt_tx_queue **tx_queues; +const void *tx_mem_zone; +struct tx_port_stats *hw_tx_port_stats; +phys_addr_t hw_tx_port_stats_map;/* Default completion ring */ struct bnxt_cp_ring_info *def_cp_ring;
drivers/net/bnxt/bnxt_ethdev.c +84 -0
115 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.c +36 -0
@@ -2246,3 +2246,39 @@ int bnxt_hwrm_exec_fwd_resp(struct bnxt *bp, uint16_t target_id,return rc; } + +int bnxt_hwrm_port_qstats (struct bnxt *bp) +{ +struct hwrm_port_qstats_input req = {0 }; +struct hwrm_port_qstats_output *resp = bp->hwrm_cmd_resp_addr; +struct bnxt_pf_info *pf = &bp->pf; +int rc; + +if (!(bp->flags &BNXT_FLAG_PORT_STATS )) +return 0 ; + +HWRM_PREP (req,PORT_QSTATS ,-1 , resp); + req.port_id =rte_cpu_to_le_16 (pf->port_id); + req.tx_stat_host_addr =rte_cpu_to_le_64 (bp->hw_tx_port_stats_map); + req.rx_stat_host_addr =rte_cpu_to_le_64 (bp->hw_rx_port_stats_map); + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); +HWRM_CHECK_RESULT ; +return rc; +} + +int bnxt_hwrm_port_clr_stats (struct bnxt *bp) +{ +struct hwrm_port_clr_stats_input req = {0 }; +struct hwrm_port_clr_stats_output *resp = bp->hwrm_cmd_resp_addr; +struct bnxt_pf_info *pf = &bp->pf; +int rc; + +if (!(bp->flags &BNXT_FLAG_PORT_STATS )) +return 0 ; + +HWRM_PREP (req,PORT_CLR_STATS ,-1 , resp); + req.port_id =rte_cpu_to_le_16 (pf->port_id); + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); +HWRM_CHECK_RESULT ; +return rc; +}
drivers/net/bnxt/bnxt_hwrm.h +2 -1
@@ -119,5 +119,6 @@ int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,int bnxt_hwrm_tunnel_dst_port_free (struct bnxt *bp,uint16_t port,uint8_t tunnel_type);void bnxt_free_tunnel_ports (struct bnxt *bp); - +int bnxt_hwrm_port_qstats (struct bnxt *bp); +int bnxt_hwrm_port_clr_stats (struct bnxt *bp);#endif
drivers/net/bnxt/bnxt_stats.c +207 -0
216 lines not on this page · raw message
drivers/net/bnxt/bnxt_stats.h +10 -0
@@ -40,5 +40,15 @@ void bnxt_free_stats(struct bnxt *bp);void bnxt_stats_get_op (struct rte_eth_dev *eth_dev,struct rte_eth_stats *bnxt_stats);void bnxt_stats_reset_op (struct rte_eth_dev *eth_dev); +int bnxt_dev_xstats_get_names_op(__rte_unused struct rte_eth_dev *eth_dev, +struct rte_eth_xstat_name *xstats_names, + __rte_unused unsigned int limit); +int bnxt_dev_xstats_get_op (struct rte_eth_dev *eth_dev, +struct rte_eth_xstat *xstats,unsigned int n); +void bnxt_dev_xstats_reset_op (struct rte_eth_dev *eth_dev); +struct bnxt_xstats_name_off { +char name[RTE_ETH_XSTATS_NAME_SIZE ]; +uint64_t offset; +};#endif
Signature · 1 line
2.10.1 (Apple Git-78)
Re: [PATCH v2 07/25] bnxt: add support for xstats get/reset
Quoted 12 lines · Ajit Khaparde
This patch adds support to get and reset xstats
dev_ops
dev_opsadded:xstats_get,xstats_get_name,xstats_resetHWRM commands added:
hwrm_port_qstats,hwrm_port_clr_statsSigned-off-by Ajit Khaparde <[email protected]>--
v1->v2: regroup related patches and incorporate other review comments
Quoted 7 lines
--- drivers/net/bnxt/bnxt.h | 7 ++ drivers/net/bnxt/bnxt_ethdev.c | 84 +++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.c | 36 +++++++ drivers/net/bnxt/bnxt_hwrm.h | 3 +- drivers/net/bnxt/bnxt_stats.c | 207 +++++++++++++++++++++++++++++++++++++++++ drivers/net/bnxt/bnxt_stats.h | 10 ++
This patch should set "Extended stats = Y" in bnxt.ini
PATCH v2 8/25 bnxt: Add support for VLAN filter and strip dev_ops
In reply to Ajit KhapardeThis patch adds VLAN strip and offload callbacks.
To add a VLAN filter:
For each VNIC and each associated filter(s)
if VLAN exists:
if VLAN matches vlan_id
VLAN filter already exists, just skip and continue
else
add a new MAC+VLAN filter
else
Remove the old MAC only filter
Add a new MAC+VLAN filter
To remove a VLAN filter:
For each VNIC and each associated filter(s)
if VLAN exists && VLAN matches vlan_id
remove the MAC+VLAN filter
add a new MAC only filter
else
VLAN filter doesn't exist, just skip and continue
--v1->v2: regroup related patches and incorporate other review comments
--- doc/guides/nics/features/bnxt.ini | 2 + drivers/net/bnxt/bnxt_ethdev.c | 201 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+)
doc/guides/nics/features/bnxt.ini +2 -0
@@ -9,6 +9,8 @@ Queue start/stop = Y Promiscuous mode = Y Unicast MAC filter = Y Multicast MAC filter = Y +VLAN filter = Y +VLAN offload = Y RSS reta update = Y Basic stats = Y Extended stats = Y
drivers/net/bnxt/bnxt_ethdev.c +201 -0
231 lines not on this page · raw message
Signature · 1 line
2.10.1 (Apple Git-78)
Re: [PATCH v2 08/25] bnxt: Add support for VLAN filter and strip dev_ops
Quoted 20 lines · Ajit Khaparde
This patch adds VLAN strip and offload callbacks.
To add a VLAN filter:
For each VNIC and each associated filter(s)
if VLAN exists:
if VLAN matchesvlan_id
VLAN filter already exists, just skip and continue
else
add a new MAC+VLAN filter
else
Remove the old MAC only filter
Add a new MAC+VLAN filterTo remove a VLAN filter:
For each VNIC and each associated filter(s)
if VLAN exists && VLAN matchesvlan_id
remove the MAC+VLAN filter
add a new MAC only filter
else
VLAN filter doesn't exist, just skip and continue
Quoted 1 line
Signed-off-by Ajit Khaparde <[email protected]>
This patch gives a build error [1] which seems fixed in next patch, can you please move fix to this patch.
[1].../drivers/net/bnxt/bnxt_ethdev.c: In function ‘bnxt_del_vlan_filter’:.../drivers/net/bnxt/bnxt_ethdev.c:1158:8: error: passing argument 2 of ‘bnxt_hwrm_set_filter’ makes pointer from integer without a cast [-Werror=int-conversion]
vnic->fw_vnic_id,
^~~~In file included from .../drivers/net/bnxt/bnxt_ethdev.c:46:0:.../drivers/net/bnxt/bnxt_hwrm.h:51:5: note: expected ‘struct bnxt_vnic_info *’ but argument is of type ‘uint16_t {aka short unsigned int}’
int bnxt_hwrm_set_filter(struct bnxt *bp,
^~~~~~~~~~~~~~~~~~~~
.../drivers/net/bnxt/bnxt_ethdev.c: In function ‘bnxt_add_vlan_filter’:.../drivers/net/bnxt/bnxt_ethdev.c:1232:35: error: passing argument 2 of ‘bnxt_hwrm_set_filter’ makes pointer from integer without a cast [-Werror=int-conversion]
rc = bnxt_hwrm_set_filter(bp, vnic->fw_vnic_id,
^~~~In file included from .../drivers/net/bnxt/bnxt_ethdev.c:46:0:.../drivers/net/bnxt/bnxt_hwrm.h:51:5: note: expected ‘struct bnxt_vnic_info *’ but argument is of type ‘uint16_t {aka short unsigned int}’
int bnxt_hwrm_set_filter(struct bnxt *bp,
^~~~~~~~~~~~~~~~~~~~
PATCH v2 9/25 bnxt: add support for set multicast addr list and MAC addr set
In reply to Ajit KhapardeThis patch adds support for set_mc_addr_list andmac_addr_set dev_ops
--v1->v2: regroup related patches and incorporate other review comments
--- doc/guides/nics/features/bnxt.ini | 1 + drivers/net/bnxt/bnxt_ethdev.c | 70 ++++++++++++++++++++++++++++++++++++++- drivers/net/bnxt/bnxt_hwrm.c | 13 +++++--- drivers/net/bnxt/bnxt_hwrm.h | 2 +- drivers/net/bnxt/bnxt_vnic.c | 7 +++- drivers/net/bnxt/bnxt_vnic.h | 4 +++ 6 files changed, 90 insertions(+), 7 deletions(-)
doc/guides/nics/features/bnxt.ini +1 -0
@@ -11,6 +11,7 @@ Unicast MAC filter = Y Multicast MAC filter = Y VLAN filter = Y VLAN offload = Y +Allmulticast mode = Y RSS reta update = Y Basic stats = Y Extended stats = Y
drivers/net/bnxt/bnxt_ethdev.c +69 -1
91 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.c +9 -4
@@ -229,7 +229,12 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, struct bnxt_vnic_info *vnic)if (vnic->flags &BNXT_VNIC_INFO_PROMISC ) mask =HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_PROMISCUOUS ;if (vnic->flags &BNXT_VNIC_INFO_ALLMULTI ) - mask =HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_ALL_MCAST ; + mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_ALL_MCAST ; +if (vnic->mc_addr_cnt) { + mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_MCAST ; + req.num_mc_entries =rte_cpu_to_le_32 (vnic->mc_addr_cnt); + req.mc_tbl_addr =rte_cpu_to_le_64 (vnic->mc_list_dma_addr); + } req.mask =rte_cpu_to_le_32 (HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_BCAST | mask);
@@ -261,7 +266,7 @@ int bnxt_hwrm_clear_filter(struct bnxt *bp, }int bnxt_hwrm_set_filter (struct bnxt *bp, -struct bnxt_vnic_info *vnic, +uint16_t dst_id,struct bnxt_filter_info *filter) {int rc =0 ;
@@ -275,7 +280,7 @@ int bnxt_hwrm_set_filter(struct bnxt *bp, enables = filter->enables |HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_DST_ID ; - req.dst_id =rte_cpu_to_le_16 (vnic->fw_vnic_id); + req.dst_id =rte_cpu_to_le_16 (dst_id);if (enables &HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR )
@@ -1419,7 +1424,7 @@ int bnxt_set_hwrm_vnic_filters(struct bnxt *bp, struct bnxt_vnic_info *vnic)int rc =0 ; STAILQ_FOREACH(filter, &vnic->filter, next) { - rc =bnxt_hwrm_set_filter (bp, vnic, filter); + rc =bnxt_hwrm_set_filter (bp, vnic->fw_vnic_id, filter);if (rc)break ; }
drivers/net/bnxt/bnxt_hwrm.h +1 -1
@@ -49,7 +49,7 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, struct bnxt_vnic_info *vnic);int bnxt_hwrm_clear_filter (struct bnxt *bp,struct bnxt_filter_info *filter);int bnxt_hwrm_set_filter (struct bnxt *bp, -struct bnxt_vnic_info *vnic, +uint16_t dst_id,struct bnxt_filter_info *filter);int bnxt_hwrm_exec_fwd_resp (struct bnxt *bp,uint16_t target_id,void *encaped,size_t ec_size);
drivers/net/bnxt/bnxt_vnic.c +6 -1
@@ -170,7 +170,8 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)char mz_name[RTE_MEMZONE_NAMESIZE ];uint32_t entry_length =RTE_CACHE_LINE_ROUNDUP (HW_HASH_INDEX_SIZE *sizeof (*vnic->rss_table) + -HW_HASH_KEY_SIZE ); +HW_HASH_KEY_SIZE + +BNXT_MAX_MC_ADDRS *ETHER_ADDR_LEN );uint16_t max_vnics;int i;phys_addr_t mz_phys_addr;
@@ -218,6 +219,10 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp) vnic->rss_hash_key_dma_addr = vnic->rss_table_dma_addr +HW_HASH_INDEX_SIZE *sizeof (*vnic->rss_table); + vnic->mc_list = (void *)((char *)vnic->rss_hash_key + +HW_HASH_KEY_SIZE ); + vnic->mc_list_dma_addr = vnic->rss_hash_key_dma_addr + +HW_HASH_KEY_SIZE ; }return 0 ;
drivers/net/bnxt/bnxt_vnic.h +4 -0
@@ -57,6 +57,10 @@ struct bnxt_vnic_info {uint16_t *rss_table;phys_addr_t rss_hash_key_dma_addr;void *rss_hash_key; +phys_addr_t mc_list_dma_addr; +char *mc_list; +uint32_t mc_addr_cnt; +#define BNXT_MAX_MC_ADDRS 16uint32_t flags;#define BNXT_VNIC_INFO_PROMISC (1 << 0)#define BNXT_VNIC_INFO_ALLMULTI (1 << 1)
Signature · 1 line
2.10.1 (Apple Git-78)
Re: [PATCH v2 09/25] bnxt: add support for set multicast addr list and MAC addr set
Quoted 21 lines · Ajit Khaparde
This patch adds support for
set_mc_addr_listandmac_addr_setdev_opsSigned-off-by Ajit Khaparde <[email protected]>--
v1->v2: regroup related patches and incorporate other review comments--- doc/guides/nics/features/bnxt.ini | 1 + drivers/net/bnxt/bnxt_ethdev.c | 70 ++++++++++++++++++++++++++++++++++++++- drivers/net/bnxt/bnxt_hwrm.c | 13 +++++--- drivers/net/bnxt/bnxt_hwrm.h | 2 +- drivers/net/bnxt/bnxt_vnic.c | 7 +++- drivers/net/bnxt/bnxt_vnic.h | 4 +++ 6 files changed, 90 insertions(+), 7 deletions(-)doc/guides/nics/features/bnxt.ini +0
-0
doc/guides/nics/features/bnxt.ini Unicast MAC filter = Y · line 14
Quoted 4 lines
doc/guides/nics/features/bnxt.ini +1
-0@@ -11,6 +11,7 @@ Unicast MAC filter = Y Multicast MAC filter = Y VLAN filter = Y VLAN offload = Y +Allmulticast mode = Y
To have this support, .allmulticast_enable and .allmulticast_disable needs to implemented, these are already implemented in the PMD.
This PMD implements ".set_mc_addr_list", I think this is "Multicast MAC filter", which seems already documented as supported.
So, it is possible to have a separate patch to document "Allmulticast mode"
Quoted 3 lines
doc/guides/nics/features/bnxt.ini +0
-0RSS reta update = Y Basic stats = Y Extended stats = Y
<...>
PATCH v2 10/25 bnxt: add support for fw_version_get dev_op
In reply to Ajit KhapardeThis patch adds support for fw_version_get dev_op
--v1->v2: regroup related patches and incorporate other review comments
--- doc/guides/nics/features/bnxt.ini | 1 + drivers/net/bnxt/bnxt_ethdev.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+)
doc/guides/nics/features/bnxt.ini +1 -0
@@ -16,6 +16,7 @@ RSS reta update = Y Basic stats = Y Extended stats = Y SR-IOV = Y +FW version = Y Linux VFIO = Y Linux UIO = Y x86-64 = Y
drivers/net/bnxt/bnxt_ethdev.c +20 -0
@@ -1356,6 +1356,25 @@ bnxt_dev_set_mc_addr_list_op(struct rte_eth_dev *eth_dev,return bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic); } +static int +bnxt_fw_version_get (struct rte_eth_dev *dev,char *fw_version,size_t fw_size) +{ +struct bnxt *bp = (struct bnxt *)dev->data->dev_private; +uint8_t fw_major = (bp->fw_ver >>24 ) &0xff ; +uint8_t fw_minor = (bp->fw_ver >>16 ) &0xff ; +uint8_t fw_updt = (bp->fw_ver >>8 ) &0xff ; +int ret; + + ret =snprintf (fw_version, fw_size,"%d.%d.%d" , + fw_major, fw_minor, fw_updt); + + ret +=1 ;/* add the size of '\0' */ +if (fw_size < (uint32_t )ret) +return ret; +else +return 0 ; +} +/* * Initialization */
@@ -1395,6 +1414,7 @@ static const struct eth_dev_ops bnxt_dev_ops = { .xstats_get = bnxt_dev_xstats_get_op, .xstats_get_names = bnxt_dev_xstats_get_names_op, .xstats_reset = bnxt_dev_xstats_reset_op, + .fw_version_get = bnxt_fw_version_get, .set_mc_addr_list = bnxt_dev_set_mc_addr_list_op, };
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v2 11/25 bnxt: add support to set MTU
In reply to Ajit KhapardeThis patch adds support to modify MTU using the set_mtu dev_op. To support frames > 2k, the PMD creates an aggregator ring. When a frame greater than 2k is received, it is fragmented and the resulting fragments are DMA'ed to the aggregator ring. Now the driver can support jumbo frames upto 9500 bytes.
--v1->v2: regroup related patches and incorporate other review comments
--- doc/guides/nics/features/bnxt.ini | 2 + drivers/net/bnxt/bnxt.h | 4 +- drivers/net/bnxt/bnxt_cpr.c | 3 +- drivers/net/bnxt/bnxt_ethdev.c | 59 ++++++++++ drivers/net/bnxt/bnxt_hwrm.c | 121 ++++++++++++-------- drivers/net/bnxt/bnxt_hwrm.h | 4 +- drivers/net/bnxt/bnxt_ring.c | 81 ++++++++++++-- drivers/net/bnxt/bnxt_ring.h | 2 + drivers/net/bnxt/bnxt_rxq.c | 29 +++-- drivers/net/bnxt/bnxt_rxq.h | 1 + drivers/net/bnxt/bnxt_rxr.c | 195 +++++++++++++++++++++++++++++---- drivers/net/bnxt/bnxt_rxr.h | 6 + drivers/net/bnxt/hsi_struct_def_dpdk.h | 1 - 13 files changed, 422 insertions(+), 86 deletions(-)
doc/guides/nics/features/bnxt.ini +2 -0
@@ -17,6 +17,8 @@ Basic stats = Y Extended stats = Y SR-IOV = Y FW version = Y +Jumbo frame = Y +MTU update = Y Linux VFIO = Y Linux UIO = Y x86-64 = Y
drivers/net/bnxt/bnxt.h +3 -1
@@ -45,7 +45,7 @@#include "bnxt_cpr.h" -#define BNXT_MAX_MTU 9000 +#define BNXT_MAX_MTU 9500#define VLAN_TAG_SIZE 4enum bnxt_hw_context {
@@ -131,6 +131,7 @@ struct bnxt {#define BNXT_FLAG_REGISTERED (1 << 0)#define BNXT_FLAG_VF (1 << 1)#define BNXT_FLAG_PORT_STATS (1 << 2) +#define BNXT_FLAG_JUMBO (1 << 3)#define BNXT_PF (bp) (!((bp)->flags & BNXT_FLAG_VF))#define BNXT_VF (bp) ((bp)->flags & BNXT_FLAG_VF)#define BNXT_NPAR_ENABLED (bp) ((bp)->port_partition_type)
@@ -233,4 +234,5 @@ struct rte_pmd_bnxt_mb_event_param {int bnxt_link_update_op (struct rte_eth_dev *eth_dev,int wait_to_complete);int bnxt_rcv_msg_from_vf (struct bnxt *bp,uint16_t vf_id,void *msg); +#define RX_PROD_AGG_BD_TYPE_RX_PROD_AGG 0x6#endif
drivers/net/bnxt/bnxt_cpr.c +2 -1
@@ -159,7 +159,8 @@ int bnxt_alloc_def_cp_ring(struct bnxt *bp) rc =bnxt_hwrm_ring_alloc (bp, cp_ring,HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL , -0 ,HWRM_NA_SIGNATURE ); +0 ,HWRM_NA_SIGNATURE , +HWRM_NA_SIGNATURE );if (rc) goto err_out; cpr->cp_doorbell = bp->pdev->mem_resource[2 ].addr;
drivers/net/bnxt/bnxt_ethdev.c +59 -0
77 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.c +76 -45
258 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +3 -1
@@ -70,7 +70,7 @@ int bnxt_hwrm_queue_qportcfg(struct bnxt *bp);int bnxt_hwrm_ring_alloc (struct bnxt *bp,struct bnxt_ring *ring,uint32_t ring_type,uint32_t map_index, -uint32_t stats_ctx_id); +uint32_t stats_ctx_id,uint32_t cmpl_ring_id);int bnxt_hwrm_ring_free (struct bnxt *bp,struct bnxt_ring *ring,uint32_t ring_type);int bnxt_hwrm_ring_grp_alloc (struct bnxt *bp,unsigned int idx);
@@ -93,6 +93,8 @@ int bnxt_hwrm_vnic_ctx_free(struct bnxt *bp, struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_free (struct bnxt *bp,struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_rss_cfg (struct bnxt *bp,struct bnxt_vnic_info *vnic); +int bnxt_hwrm_vnic_plcmode_cfg (struct bnxt *bp, +struct bnxt_vnic_info *vnic);int bnxt_alloc_all_hwrm_stat_ctxs (struct bnxt *bp);int bnxt_clear_all_hwrm_stat_ctxs (struct bnxt *bp);
drivers/net/bnxt/bnxt_ring.c +72 -9
156 lines not on this page · raw message
drivers/net/bnxt/bnxt_ring.h +2 -0
@@ -58,6 +58,7 @@#define DEFAULT_TX_RING_SIZE 256#define MAX_TPA 128 +#define AGG_RING_SIZE_FACTOR 2/* These assume 4k pages */ #define MAX_RX_DESC_CNT (8 * 1024)
@@ -65,6 +66,7 @@#define MAX_CP_DESC_CNT (16 * 1024)#define INVALID_HW_RING_ID ((uint16_t)-1) +#define INVALID_STATS_CTX_ID ((uint16_t)-1)struct bnxt_ring {void *bd;
drivers/net/bnxt/bnxt_rxq.c +21 -8
@@ -84,9 +84,8 @@ int bnxt_mq_rx_configure(struct bnxt *bp) vnic->func_default = true; vnic->ff_pool_idx =0 ; - vnic->start_grp_id =1 ; - vnic->end_grp_id = vnic->start_grp_id + - bp->rx_cp_nr_rings -1 ; + vnic->start_grp_id =0 ; + vnic->end_grp_id = vnic->start_grp_id; filter =bnxt_alloc_filter (bp);if (!filter) {RTE_LOG (ERR ,PMD ,"L2 filter alloc failed\n" );
@@ -126,8 +125,8 @@ int bnxt_mq_rx_configure(struct bnxt *bp) pools =ETH_64_POOLS ; } nb_q_per_grp = bp->rx_cp_nr_rings / pools; - start_grp_id =1 ; - end_grp_id = start_grp_id + nb_q_per_grp -1 ; + start_grp_id =0 ; + end_grp_id = nb_q_per_grp; ring_idx =0 ;for (i =0 ; i < pools; i++) {
@@ -188,9 +187,8 @@ int bnxt_mq_rx_configure(struct bnxt *bp) vnic->func_default = true; vnic->ff_pool_idx =0 ; - vnic->start_grp_id =1 ; - vnic->end_grp_id = vnic->start_grp_id + - bp->rx_cp_nr_rings -1 ; + vnic->start_grp_id =0 ; + vnic->end_grp_id = bp->rx_cp_nr_rings; filter =bnxt_alloc_filter (bp);if (!filter) {RTE_LOG (ERR ,PMD ,"L2 filter alloc failed\n" );
@@ -228,6 +226,16 @@ static void bnxt_rx_queue_release_mbufs(struct bnxt_rx_queue *rxq __rte_unused) } } } +/* Free up mbufs in Agg ring */ + sw_ring = rxq->rx_ring->ag_buf_ring; +if (sw_ring) { +for (i =0 ; i < rxq->nb_rx_desc; i++) { +if (sw_ring[i].mbuf) { +rte_pktmbuf_free_seg (sw_ring[i].mbuf); + sw_ring[i].mbuf =NULL ; + } + } + } } }
@@ -251,6 +259,8 @@ void bnxt_rx_queue_release_op(void *rx_queue)/* Free RX ring hardware descriptors */ bnxt_free_ring (rxq->rx_ring->rx_ring_struct); +/* Free RX Agg ring hardware descriptors */ +bnxt_free_ring (rxq->rx_ring->ag_ring_struct);/* Free RX completion ring hardware descriptors */ bnxt_free_ring (rxq->cp_ring->cp_ring_struct);
@@ -295,6 +305,9 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, rxq->nb_rx_desc = nb_desc; rxq->rx_free_thresh = rx_conf->rx_free_thresh; +RTE_LOG (DEBUG ,PMD ,"RX Buf size is %d\n" , rxq->rx_buf_use_size); +RTE_LOG (DEBUG ,PMD ,"RX Buf MTU %d\n" , eth_dev->data->mtu); + rc =bnxt_init_rx_ring_struct (rxq, socket_id);if (rc) goto out;
drivers/net/bnxt/bnxt_rxq.h +1 -0
@@ -52,6 +52,7 @@ struct bnxt_rx_queue {uint8_t crc_len;/* 0 if CRC stripped, 4 otherwise */ struct bnxt *bp; +int index;struct bnxt_vnic_info *vnic;uint32_t rx_buf_size;
drivers/net/bnxt/bnxt_rxr.c +175 -20
332 lines not on this page · raw message
drivers/net/bnxt/bnxt_rxr.h +6 -0
@@ -43,14 +43,20 @@ struct bnxt_sw_rx_bd {struct bnxt_rx_ring_info {uint16_t rx_prod; +uint16_t ag_prod;void *rx_doorbell; +void *ag_doorbell;struct rx_prod_pkt_bd *rx_desc_ring; +struct rx_prod_pkt_bd *ag_desc_ring;struct bnxt_sw_rx_bd *rx_buf_ring;/* sw ring */ +struct bnxt_sw_rx_bd *ag_buf_ring;/* sw ring */ phys_addr_t rx_desc_mapping; +phys_addr_t ag_desc_mapping;struct bnxt_ring *rx_ring_struct; +struct bnxt_ring *ag_ring_struct; }; uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
drivers/net/bnxt/hsi_struct_def_dpdk.h +0 -1
@@ -7252,7 +7252,6 @@ struct hwrm_vnic_tpa_cfg_output {*/ } __attribute__((packed)); -/* hwrm_ring_alloc */ /* * Description: This command allocates and does basic preparation for a ring.
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v2 12/25 bnxt: add support for LRO
In reply to Ajit KhapardeThis patch adds support to enable and disable LRO
To support this feature, the driver creates an aggregrator ring. When the hardware starts doing LRO, it sends a tpa_start completion. When the driver receives a tpa_end completion, it indicates that the LRO chaining is complete.
--v1->v2: regroup related patches and incorporate other review comments
--- doc/guides/nics/features/bnxt.ini | 1 + drivers/net/bnxt/bnxt_ethdev.c | 7 + drivers/net/bnxt/bnxt_hwrm.c | 44 +++++- drivers/net/bnxt/bnxt_hwrm.h | 2 + drivers/net/bnxt/bnxt_ring.c | 32 +++- drivers/net/bnxt/bnxt_ring.h | 4 +- drivers/net/bnxt/bnxt_rxq.c | 12 ++ drivers/net/bnxt/bnxt_rxq.h | 2 + drivers/net/bnxt/bnxt_rxr.c | 315 +++++++++++++++++++++++++++++--------- drivers/net/bnxt/bnxt_rxr.h | 40 +++++ 10 files changed, 374 insertions(+), 85 deletions(-)
doc/guides/nics/features/bnxt.ini +1 -0
@@ -19,6 +19,7 @@ SR-IOV = Y FW version = Y Jumbo frame = Y MTU update = Y +LRO = Y Linux VFIO = Y Linux UIO = Y x86-64 = Y
drivers/net/bnxt/bnxt_ethdev.c +7 -0
@@ -286,6 +286,13 @@ static int bnxt_init_chip(struct bnxt *bp) goto err_out; } } + +bnxt_hwrm_vnic_plcmode_cfg (bp, vnic); + +if (bp->eth_dev->data->dev_conf.rxmode.enable_lro) +bnxt_hwrm_vnic_tpa_cfg (bp, vnic,1 ); +else +bnxt_hwrm_vnic_tpa_cfg (bp, vnic,0 ); } rc =bnxt_hwrm_cfa_l2_set_rx_mask (bp, &bp->vnic_info[0 ]);if (rc) {
drivers/net/bnxt/bnxt_hwrm.c +39 -5
70 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +2 -0
@@ -95,6 +95,8 @@ int bnxt_hwrm_vnic_rss_cfg(struct bnxt *bp, struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_plcmode_cfg (struct bnxt *bp,struct bnxt_vnic_info *vnic); +int bnxt_hwrm_vnic_tpa_cfg (struct bnxt *bp, +struct bnxt_vnic_info *vnic,bool enable);int bnxt_alloc_all_hwrm_stat_ctxs (struct bnxt *bp);int bnxt_clear_all_hwrm_stat_ctxs (struct bnxt *bp);
drivers/net/bnxt/bnxt_ring.c +28 -4
@@ -31,6 +31,7 @@* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <rte_bitmap.h> #include <rte_memzone.h> #include <unistd.h>
@@ -137,11 +138,23 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,RTE_CACHE_LINE_ROUNDUP (rx_ring_info->rx_ring_struct->ring_size * sizeof(struct rx_prod_pkt_bd)) : 0; -int total_alloc_len = rx_ring_start + rx_ring_len; -int ag_ring_start =0 ; +int ag_ring_start = rx_ring_start + rx_ring_len; +int ag_ring_len = rx_ring_len *AGG_RING_SIZE_FACTOR ; - ag_ring_start = rx_ring_start + rx_ring_len; - total_alloc_len = ag_ring_start + rx_ring_len *AGG_RING_SIZE_FACTOR ; +int ag_bitmap_start = ag_ring_start + ag_ring_len; +int ag_bitmap_len = rx_ring_info ? +RTE_CACHE_LINE_ROUNDUP (rte_bitmap_get_memory_footprint ( + rx_ring_info->rx_ring_struct->ring_size * +AGG_RING_SIZE_FACTOR )) :0 ; + +int tpa_info_start = ag_bitmap_start + ag_bitmap_len; +int tpa_info_len = rx_ring_info ? +RTE_CACHE_LINE_ROUNDUP (BNXT_TPA_MAX * +sizeof (struct bnxt_tpa_info )) :0 ; + +int total_alloc_len = tpa_info_start; +if (bp->eth_dev->data->dev_conf.rxmode.enable_lro) + total_alloc_len += tpa_info_len; snprintf(mz_name, RTE_MEMZONE_NAMESIZE, "bnxt_%04x:%02x:%02x:%02x-%04x_%s", pdev->addr.domain,
@@ -230,6 +243,17 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx, rx_ring_info->ag_buf_ring = (struct bnxt_sw_rx_bd *)rx_ring->vmem; } + + rx_ring_info->ag_bitmap = +rte_bitmap_init (rx_ring_info->rx_ring_struct->ring_size * +AGG_RING_SIZE_FACTOR , (uint8_t *)mz->addr + + ag_bitmap_start, ag_bitmap_len); + +/* TPA info */ +if (bp->eth_dev->data->dev_conf.rxmode.enable_lro) + rx_ring_info->tpa_info = + ((struct bnxt_tpa_info *)((char *)mz->addr + + tpa_info_start)); } cp_ring->bd = ((char *)mz->addr + cp_ring_start);
drivers/net/bnxt/bnxt_ring.h +2 -2
@@ -57,8 +57,8 @@#define DEFAULT_RX_RING_SIZE 256#define DEFAULT_TX_RING_SIZE 256 -#define MAX_TPA 128 -#define AGG_RING_SIZE_FACTOR 2 +#define BNXT_TPA_MAX 64 +#define AGG_RING_SIZE_FACTOR 2/* These assume 4k pages */ #define MAX_RX_DESC_CNT (8 * 1024)
drivers/net/bnxt/bnxt_rxq.c +12 -0
@@ -214,6 +214,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp) static void bnxt_rx_queue_release_mbufs(struct bnxt_rx_queue *rxq __rte_unused) {struct bnxt_sw_rx_bd *sw_ring; +struct bnxt_tpa_info *tpa_info;uint16_t i;if (rxq) {
@@ -236,6 +237,17 @@ static void bnxt_rx_queue_release_mbufs(struct bnxt_rx_queue *rxq __rte_unused) } } } + +/* Free up mbufs in TPA */ + tpa_info = rxq->rx_ring->tpa_info; +if (tpa_info) { +for (i =0 ; i <BNXT_TPA_MAX ; i++) { +if (tpa_info[i].mbuf) { +rte_pktmbuf_free_seg (tpa_info[i].mbuf); + tpa_info[i].mbuf =NULL ; + } + } + } } }
drivers/net/bnxt/bnxt_rxq.h +2 -0
@@ -59,6 +59,8 @@ struct bnxt_rx_queue {uint32_t rx_buf_use_size;/* useable size */ struct bnxt_rx_ring_info *rx_ring;struct bnxt_cp_ring_info *cp_ring; + +struct bnxt_tpa_info *rx_tpa; };void bnxt_free_rxq_stats (struct bnxt_rx_queue *rxq);
drivers/net/bnxt/bnxt_rxr.c +241 -74
405 lines not on this page · raw message
drivers/net/bnxt/bnxt_rxr.h +40 -0
@@ -37,6 +37,39 @@#define B_RX_DB (db, prod) \ (*(uint32_t *)db = (DB_KEY_RX | prod)) +#define BNXT_TPA_L4_SIZE (x) \ + { \ + typeof(x) hdr_info = (x); \ + (((hdr_info) & 0xf8000000) ? ((hdr_info) >> 27) : 32) \ + } + +#define BNXT_TPA_INNER_L3_OFF (hdr_info) \ + (((hdr_info) >> 18) & 0x1ff) + +#define BNXT_TPA_INNER_L2_OFF (hdr_info) \ + (((hdr_info) >> 9) & 0x1ff) + +#define BNXT_TPA_OUTER_L3_OFF (hdr_info) \ + ((hdr_info) & 0x1ff) + +enum pkt_hash_types { +PKT_HASH_TYPE_NONE ,/* Undefined type */ +PKT_HASH_TYPE_L2 ,/* Input: src_MAC, dest_MAC */ +PKT_HASH_TYPE_L3 ,/* Input: src_IP, dst_IP */ +PKT_HASH_TYPE_L4 ,/* Input: src_IP, dst_IP, src_port, dst_port */ +}; + +struct bnxt_tpa_info { +struct rte_mbuf *mbuf; +uint16_t len; +unsigned short gso_type; +uint32_t flags2; +uint32_t metadata; +enum pkt_hash_types hash_type; +uint32_t rss_hash; +uint32_t hdr_info; +}; +struct bnxt_sw_rx_bd {struct rte_mbuf *mbuf;/* data associated with RX descriptor */ };
@@ -57,6 +90,13 @@ struct bnxt_rx_ring_info {struct bnxt_ring *rx_ring_struct;struct bnxt_ring *ag_ring_struct; + +/* +* To deal with out of order return from TPA, use free buffer indicator +*/ +struct rte_bitmap *ag_bitmap; + +struct bnxt_tpa_info *tpa_info; }; uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v2 13/25 bnxt: add rxq/txq info_get dev_ops
In reply to Ajit KhapardeAdd support for txq_info_get and rxq_info_get dev_ops
--v1->v2: regroup related patches and incorporate other review comments
--- drivers/net/bnxt/bnxt_ethdev.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)
drivers/net/bnxt/bnxt_ethdev.c +39 -0
@@ -1390,6 +1390,43 @@ bnxt_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size)return 0 ; } +static void +bnxt_rxq_info_get_op (struct rte_eth_dev *dev,uint16_t queue_id, +struct rte_eth_rxq_info *qinfo) +{ +struct bnxt_rx_queue *rxq; + + rxq = dev->data->rx_queues[queue_id]; + + qinfo->mp = rxq->mb_pool; + qinfo->scattered_rx = dev->data->scattered_rx; + qinfo->nb_desc = rxq->nb_rx_desc; + + qinfo->conf.rx_free_thresh = rxq->rx_free_thresh; + qinfo->conf.rx_drop_en =0 ; + qinfo->conf.rx_deferred_start =0 ; +} + +static void +bnxt_txq_info_get_op (struct rte_eth_dev *dev,uint16_t queue_id, +struct rte_eth_txq_info *qinfo) +{ +struct bnxt_tx_queue *txq; + + txq = dev->data->tx_queues[queue_id]; + + qinfo->nb_desc = txq->nb_tx_desc; + + qinfo->conf.tx_thresh.pthresh = txq->pthresh; + qinfo->conf.tx_thresh.hthresh = txq->hthresh; + qinfo->conf.tx_thresh.wthresh = txq->wthresh; + + qinfo->conf.tx_free_thresh = txq->tx_free_thresh; + qinfo->conf.tx_rs_thresh =0 ; + qinfo->conf.txq_flags = txq->txq_flags; + qinfo->conf.tx_deferred_start = txq->tx_deferred_start; +} +static int bnxt_mtu_set_op (struct rte_eth_dev *eth_dev,uint16_t new_mtu) {struct bnxt *bp = eth_dev->data->dev_private;
@@ -1482,6 +1519,8 @@ static const struct eth_dev_ops bnxt_dev_ops = { .xstats_reset = bnxt_dev_xstats_reset_op, .fw_version_get = bnxt_fw_version_get, .set_mc_addr_list = bnxt_dev_set_mc_addr_list_op, + .rxq_info_get = bnxt_rxq_info_get_op, + .txq_info_get = bnxt_txq_info_get_op, };static bool bnxt_vf_pciid (uint16_t id)
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v2 14/25 bnxt: add code to support VLAN pvid set dev_op
In reply to Ajit KhapardeThis patch adds code to support vlan_pvid_set dev_op
--v1->v2: regroup related patches and incorporate other review comments
--- drivers/net/bnxt/bnxt.h | 1 + drivers/net/bnxt/bnxt_ethdev.c | 21 +++++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.c | 31 +++++++++++++++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 1 + 4 files changed, 54 insertions(+)
drivers/net/bnxt/bnxt.h +1 -0
@@ -67,6 +67,7 @@ struct bnxt_child_vf_info {uint32_t func_cfg_flags;uint32_t l2_rx_mask;uint16_t fid; +uint16_t dflt_vlan;bool random_mac; };
drivers/net/bnxt/bnxt_ethdev.c +21 -0
@@ -1477,6 +1477,26 @@ static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)return rc; } +static int +bnxt_vlan_pvid_set_op (struct rte_eth_dev *dev,uint16_t pvid,int on) +{ +struct bnxt *bp = (struct bnxt *)dev->data->dev_private; +uint16_t vlan = bp->vlan; +int rc; + +if (BNXT_NPAR_PF (bp) ||BNXT_VF (bp)) { +RTE_LOG (ERR ,PMD , +"PVID cannot be modified for this function\n" ); +return -ENOTSUP ; + } + bp->vlan = on ? pvid :0 ; + + rc =bnxt_hwrm_set_default_vlan (bp,0 ,0 ); +if (rc) + bp->vlan = vlan; +return rc; +} +/* * Initialization */
@@ -1512,6 +1532,7 @@ static const struct eth_dev_ops bnxt_dev_ops = { .udp_tunnel_port_del = bnxt_udp_tunnel_port_del_op, .vlan_filter_set = bnxt_vlan_filter_set_op, .vlan_offload_set = bnxt_vlan_offload_set_op, + .vlan_pvid_set = bnxt_vlan_pvid_set_op, .mtu_set = bnxt_mtu_set_op, .mac_addr_set = bnxt_set_default_mac_addr_op, .xstats_get = bnxt_dev_xstats_get_op,
drivers/net/bnxt/bnxt_hwrm.c +31 -0
@@ -2256,6 +2256,37 @@ int bnxt_hwrm_vf_func_cfg_def_cp(struct bnxt *bp)return rc; } +int bnxt_hwrm_set_default_vlan (struct bnxt *bp,int vf,uint8_t is_vf) +{ +struct hwrm_func_cfg_input req = {0 }; +struct hwrm_func_cfg_output *resp = bp->hwrm_cmd_resp_addr; +uint16_t dflt_vlan, fid; +uint32_t func_cfg_flags; +int rc =0 ; + +HWRM_PREP (req,FUNC_CFG ,-1 , resp); + +if (is_vf) { + dflt_vlan = bp->pf.vf_info[vf].dflt_vlan; + fid = bp->pf.vf_info[vf].fid; + func_cfg_flags = bp->pf.vf_info[vf].func_cfg_flags; + }else { + fid =rte_cpu_to_le_16 (0xffff ); + func_cfg_flags = bp->pf.func_cfg_flags; + dflt_vlan = bp->vlan; + } + + req.flags =rte_cpu_to_le_32 (func_cfg_flags); + req.fid =rte_cpu_to_le_16 (fid); + req.enables |=rte_cpu_to_le_32 (HWRM_FUNC_CFG_INPUT_ENABLES_DFLT_VLAN ); + req.dflt_vlan =rte_cpu_to_le_16 (dflt_vlan); + + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); +HWRM_CHECK_RESULT ; + +return rc; +} +int bnxt_hwrm_reject_fwd_resp (struct bnxt *bp,uint16_t target_id,void *encaped,size_t ec_size) {
drivers/net/bnxt/bnxt_hwrm.h +1 -0
@@ -123,6 +123,7 @@ int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,int bnxt_hwrm_tunnel_dst_port_free (struct bnxt *bp,uint16_t port,uint8_t tunnel_type);void bnxt_free_tunnel_ports (struct bnxt *bp); +int bnxt_hwrm_set_default_vlan (struct bnxt *bp,int vf,uint8_t is_vf);int bnxt_hwrm_port_qstats (struct bnxt *bp);int bnxt_hwrm_port_clr_stats (struct bnxt *bp);#endif
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v2 15/25 bnxt: reorg the query stats code
In reply to Ajit Khaparde1) Use hwrm_stat_ctx_query command to query statistics Using hwrm_stat_ctx_query command will allow polling
the statistics from hardware instead of using the current push model from the hardware which does a DMA of the stats to the host at fixed intervals.
2) Use the rx_mbuf_alloc_fail to track mbuf alloc failures.
3) We were wrongly incrementing hwrm_cmd_seq in bnxt_hwrm_stat_clear and bnxt_hwrm_stat_ctx_alloc functions. This patch fixes that.
--v1->v2: regroup related patches and incorporate other review comments
--- drivers/net/bnxt/bnxt.h | 1 + drivers/net/bnxt/bnxt_ethdev.c | 2 ++ drivers/net/bnxt/bnxt_hwrm.c | 82 ++++++++++++++++++++++++++++++++++++++---- drivers/net/bnxt/bnxt_hwrm.h | 4 +++ drivers/net/bnxt/bnxt_rxr.c | 16 ++++++--- drivers/net/bnxt/bnxt_stats.c | 59 ++++-------------------------- 6 files changed, 102 insertions(+), 62 deletions(-)
drivers/net/bnxt/bnxt.h +1 -0
@@ -204,6 +204,7 @@ struct bnxt {uint16_t vxlan_fw_dst_port_id;uint16_t geneve_fw_dst_port_id;uint32_t fw_ver; +rte_atomic64_t rx_mbuf_alloc_fail; };/*
drivers/net/bnxt/bnxt_ethdev.c +2 -0
@@ -1616,6 +1616,8 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev) eth_dev->data->dev_flags |=RTE_ETH_DEV_DETACHABLE ; bp = eth_dev->data->dev_private; + +rte_atomic64_init (&bp->rx_mbuf_alloc_fail); bp->dev_stopped =1 ;if (bnxt_vf_pciid (pci_dev->id.device_id))
drivers/net/bnxt/bnxt_hwrm.c +76 -6
117 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +4 -0
@@ -62,6 +62,8 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp);int bnxt_hwrm_func_qcaps (struct bnxt *bp);int bnxt_hwrm_func_reset (struct bnxt *bp);int bnxt_hwrm_func_driver_unregister (struct bnxt *bp,uint32_t flags); +int bnxt_hwrm_func_qstats (struct bnxt *bp,uint16_t fid, +struct rte_eth_stats *stats);int bnxt_hwrm_func_cfg_def_cp (struct bnxt *bp);int bnxt_hwrm_vf_func_cfg_def_cp (struct bnxt *bp);
@@ -81,6 +83,8 @@ int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, unsigned int idx);int bnxt_hwrm_stat_ctx_free (struct bnxt *bp,struct bnxt_cp_ring_info *cpr,unsigned int idx); +int bnxt_hwrm_ctx_qstats (struct bnxt *bp,uint32_t cid,int idx, +struct rte_eth_stats *stats);int bnxt_hwrm_ver_get (struct bnxt *bp);
drivers/net/bnxt/bnxt_rxr.c +12 -4
@@ -68,8 +68,10 @@ static inline int bnxt_alloc_rx_data(struct bnxt_rx_queue *rxq,struct rte_mbuf *data; data =__bnxt_alloc_rx_data (rxq->mb_pool); -if (!data) +if (!data) { +rte_atomic64_inc (&rxq->bp->rx_mbuf_alloc_fail);return -ENOMEM ; + } rx_buf->mbuf = data;
@@ -87,8 +89,10 @@ static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq,struct rte_mbuf *data; data =__bnxt_alloc_rx_data (rxq->mb_pool); -if (!data) +if (!data) { +rte_atomic64_inc (&rxq->bp->rx_mbuf_alloc_fail);return -ENOMEM ; + }if (rxbd ==NULL )RTE_LOG (ERR ,PMD ,"Jumbo Frame. rxbd is NULL\n" );
@@ -321,8 +325,10 @@ static inline struct rte_mbuf *bnxt_tpa_end(struct rte_mbuf *new_data =__bnxt_alloc_rx_data (rxq->mb_pool);RTE_ASSERT (new_data !=NULL ); -if (!new_data) +if (!new_data) { +rte_atomic64_inc (&rxq->bp->rx_mbuf_alloc_fail);return NULL ; + } tpa_info->mbuf = new_data;return mbuf;
@@ -679,8 +685,10 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)for (i =0 ; i <BNXT_TPA_MAX ; i++) { rxr->tpa_info[i].mbuf =__bnxt_alloc_rx_data (rxq->mb_pool); -if (!rxr->tpa_info[i].mbuf) +if (!rxr->tpa_info[i].mbuf) { +rte_atomic64_inc (&rxq->bp->rx_mbuf_alloc_fail);return -ENOMEM ; + } } }RTE_LOG (DEBUG ,PMD ,"%s TPA alloc Done!\n" , __func__);
drivers/net/bnxt/bnxt_stats.c +7 -52
77 lines not on this page · raw message
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v2 16/25 bnxt: add support for led on/off
In reply to Ajit KhapardeThis patch adds support for dev_led_on/off dev_ops
HWRM calls added:bnxt_hwrm_port_led_qcaps()bnxt_hwrm_port_led_cfg()
--- drivers/net/bnxt/bnxt.h | 39 ++ drivers/net/bnxt/bnxt_ethdev.c | 20 + drivers/net/bnxt/bnxt_hwrm.c | 70 +++ drivers/net/bnxt/bnxt_hwrm.h | 2 + drivers/net/bnxt/hsi_struct_def_dpdk.h | 977 +++++++++++++++++++++++++++++++++ 5 files changed, 1108 insertions(+)
drivers/net/bnxt/bnxt.h +39 -0
@@ -47,6 +47,42 @@#define BNXT_MAX_MTU 9500#define VLAN_TAG_SIZE 4 +#define BNXT_MAX_LED 4 + +struct bnxt_led_info { +uint8_t led_id; +uint8_t led_type; +uint8_t led_group_id; +uint8_t unused; +uint16_t led_state_caps; +#define BNXT_LED_ALT_BLINK_CAP (x) ((x) & \ + rte_cpu_to_le_16(HWRM_PORT_LED_QCFG_OUTPUT_LED0_STATE_BLINKALT)) + +uint16_t led_color_caps; +}; + +struct bnxt_led_cfg { +uint8_t led_id; +uint8_t led_state; +uint8_t led_color; +uint8_t unused; +uint16_t led_blink_on; +uint16_t led_blink_off; +uint8_t led_group_id; +uint8_t rsvd; +}; + +#define BNXT_LED_DFLT_ENA \ + (HWRM_PORT_LED_CFG_INPUT_ENABLES_LED0_ID | \ + HWRM_PORT_LED_CFG_INPUT_ENABLES_LED0_STATE | \ + HWRM_PORT_LED_CFG_INPUT_ENABLES_LED0_BLINK_ON | \ + HWRM_PORT_LED_CFG_INPUT_ENABLES_LED0_BLINK_OFF | \ + HWRM_PORT_LED_CFG_INPUT_ENABLES_LED0_GROUP_ID) + +#define BNXT_LED_DFLT_ENA_SHIFT 6 + +#define BNXT_LED_DFLT_ENABLES (x) \ + rte_cpu_to_le_32(BNXT_LED_DFLT_ENA << (BNXT_LED_DFLT_ENA_SHIFT * (x)))enum bnxt_hw_context {HW_CONTEXT_NONE =0 ,
@@ -205,6 +241,9 @@ struct bnxt {uint16_t geneve_fw_dst_port_id;uint32_t fw_ver;rte_atomic64_t rx_mbuf_alloc_fail; + +struct bnxt_led_info leds[BNXT_MAX_LED ]; +uint8_t num_leds; };/*
drivers/net/bnxt/bnxt_ethdev.c +20 -0
@@ -1497,6 +1497,22 @@ bnxt_vlan_pvid_set_op(struct rte_eth_dev *dev, uint16_t pvid, int on)return rc; } +static int +bnxt_dev_led_on_op (struct rte_eth_dev *dev) +{ +struct bnxt *bp = (struct bnxt *)dev->data->dev_private; + +return bnxt_hwrm_port_led_cfg (bp, true); +} + +static int +bnxt_dev_led_off_op (struct rte_eth_dev *dev) +{ +struct bnxt *bp = (struct bnxt *)dev->data->dev_private; + +return bnxt_hwrm_port_led_cfg (bp, false); +} +/* * Initialization */
@@ -1542,6 +1558,8 @@ static const struct eth_dev_ops bnxt_dev_ops = { .set_mc_addr_list = bnxt_dev_set_mc_addr_list_op, .rxq_info_get = bnxt_rxq_info_get_op, .txq_info_get = bnxt_txq_info_get_op, + .dev_led_on = bnxt_dev_led_on_op, + .dev_led_off = bnxt_dev_led_off_op, };static bool bnxt_vf_pciid (uint16_t id)
@@ -1815,6 +1833,8 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev) } } +bnxt_hwrm_port_led_qcaps (bp); + rc =bnxt_setup_int (bp);if (rc) goto error_free;
drivers/net/bnxt/bnxt_hwrm.c +70 -0
73 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +2 -0
@@ -130,4 +130,6 @@ void bnxt_free_tunnel_ports(struct bnxt *bp);int bnxt_hwrm_set_default_vlan (struct bnxt *bp,int vf,uint8_t is_vf);int bnxt_hwrm_port_qstats (struct bnxt *bp);int bnxt_hwrm_port_clr_stats (struct bnxt *bp); +int bnxt_hwrm_port_led_cfg (struct bnxt *bp,bool led_on); +int bnxt_hwrm_port_led_qcaps (struct bnxt *bp);#endif
drivers/net/bnxt/hsi_struct_def_dpdk.h +977 -0
983 lines not on this page · raw message
Signature · 1 line
2.10.1 (Apple Git-78)
Re: [PATCH v2 16/25] bnxt: add support for led on/off
Quoted 5 lines · Ajit Khaparde
This patch adds support for dev_led_on/off
dev_opsHWRM calls added:
bnxt_hwrm_port_led_qcaps()bnxt_hwrm_port_led_cfg()
Can you please add a LED feature in default.ini, and announce that support in bnxt.ini?
Quoted 3 lines
Signed-off-by Ajit Khaparde <[email protected]>---
<...>
PATCH v2 17/25 bnxt: add support for tx loopback, set vf mac and queues drop
In reply to Ajit KhapardeAdd functions rte_pmd_bnxt_set_tx_loopback, rte_pmd_bnxt_set_all_queues_drop_en and rte_pmd_bnxt_set_vf_mac_addr to configure tx_loopback, queue_drop and VF MAC address setting in the hardware. It also adds the necessary functions to send the HWRM commands to the firmware.
--v1->v2: regroup related patches and incorporate other review comments
--- drivers/net/bnxt/Makefile | 4 + drivers/net/bnxt/bnxt_hwrm.c | 107 ++++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 4 + drivers/net/bnxt/rte_pmd_bnxt.c | 163 ++++++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 87 ++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 9 ++ 6 files changed, 374 insertions(+) create mode 100644 drivers/net/bnxt/rte_pmd_bnxt.c create mode 100644 drivers/net/bnxt/rte_pmd_bnxt.h
drivers/net/bnxt/Makefile +4 -0
@@ -38,6 +38,8 @@ include $(RTE_SDK)/mk/rte.vars.mk # LIB = librte_pmd_bnxt.a +EXPORT_MAP := rte_pmd_bnxt_version.map + LIBABIVER := 1 CFLAGS += -O3
@@ -60,10 +62,12 @@ SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_txq.c SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_txr.c SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_vnic.c SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_irq.c +SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += rte_pmd_bnxt.c # # Export include files # SYMLINK-y-include += +SYMLINK-$(CONFIG_RTE_LIBRTE_BNXT_PMD)-include := rte_pmd_bnxt.h include $(RTE_SDK)/mk/rte.lib.mk
drivers/net/bnxt/bnxt_hwrm.c +107 -0
116 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +4 -0
@@ -120,6 +120,7 @@ int bnxt_hwrm_allocate_pf_only(struct bnxt *bp);int bnxt_hwrm_allocate_vfs (struct bnxt *bp,int num_vfs);int bnxt_hwrm_func_vf_mac (struct bnxt *bp,uint16_t vf,const uint8_t *mac_addr); +int bnxt_hwrm_pf_evb_mode (struct bnxt *bp);int bnxt_hwrm_func_qcfg_vf_default_mac (struct bnxt *bp,uint16_t vf,struct ether_addr *mac); int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,
@@ -132,4 +133,7 @@ int bnxt_hwrm_port_qstats(struct bnxt *bp);int bnxt_hwrm_port_clr_stats (struct bnxt *bp);int bnxt_hwrm_port_led_cfg (struct bnxt *bp,bool led_on);int bnxt_hwrm_port_led_qcaps (struct bnxt *bp); +int bnxt_hwrm_func_vf_vnic_query_and_config (struct bnxt *bp,uint16_t vf, +void (*vnic_cb)(struct bnxt_vnic_info *,void *),void *cbdata, +int (*hwrm_cb)(struct bnxt *bp,struct bnxt_vnic_info *vnic));#endif
drivers/net/bnxt/rte_pmd_bnxt.c new file +163 -0
163 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt.h new file +87 -0
87 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt_version.map +9 -0
@@ -1,4 +1,13 @@ DPDK_16.04 { local: *; + +}; + +DPDK_17.08 { + global: + + rte_pmd_bnxt_set_tx_loopback; + rte_pmd_bnxt_set_all_queues_drop_en; + rte_pmd_bnxt_set_vf_mac_addr; };
Signature · 1 line
2.10.1 (Apple Git-78)
Re: [PATCH v2 17/25] bnxt: add support for tx loopback, set vf mac and queues drop
Quoted 12 lines · Ajit Khaparde
Add functions
rte_pmd_bnxt_set_tx_loopback,rte_pmd_bnxt_set_all_queues_drop_enandrte_pmd_bnxt_set_vf_mac_addrto configuretx_loopback,queue_dropand VF MAC address setting in the hardware. It also adds the necessary functions to send the HWRM commands to the firmware.Signed-off-by Steeven Li <[email protected]>Signed-off-by Ajit Khaparde <[email protected]>--
v1->v2: regroup related patches and incorporate other review comments
Quoted 10 lines
--- drivers/net/bnxt/Makefile | 4 + drivers/net/bnxt/bnxt_hwrm.c | 107 ++++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 4 + drivers/net/bnxt/rte_pmd_bnxt.c | 163 ++++++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 87 ++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 9 ++ 6 files changed, 374 insertions(+) create mode 100644 drivers/net/bnxt/rte_pmd_bnxt.c create mode 100644 drivers/net/bnxt/rte_pmd_bnxt.h
How did you test these new PMD specific APIs?
In testpmd there are already functions for these APIs, can you please update testpmd to use these APIs, this also makes them compiled so it will be easy to find any issues.
<...>
drivers/net/bnxt/bnxt_hwrm.c int bnxt_hwrm_port_led_cfg(struct bnxt *bp, bool led_on) · line 2563
Quoted 4 lines
drivers/net/bnxt/bnxt_hwrm.c +4
-0+if (req.vnic_id_tbl_addr ==0 ) { +RTE_LOG (ERR ,PMD , +"unable to map VNIC ID table address to physical memory\n" ); +//rte_free(vnic_ids);
Please remove unused code.
<...>
drivers/net/bnxt/bnxt_hwrm.c int bnxt_hwrm_port_led_cfg(struct bnxt *bp, bool led_on) · line 2619
Quoted 1 line
drivers/net/bnxt/bnxt_hwrm.c +1
-0+if (vnic.mru ==4 )// Unallocated
And please don't use // comment style.
<...>
Quoted 4 lines
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) Broadcom Limited.
Is year required here? I don't know what it is good for, but files tend to have it.
<...>
drivers/net/bnxt/rte_pmd_bnxt.c line 61
Quoted 12 lines
drivers/net/bnxt/rte_pmd_bnxt.c new file +12
-0+int rte_pmd_bnxt_set_tx_loopback (uint8_t port,uint8_t on) +{ +struct rte_eth_dev *eth_dev; +struct bnxt *bp; +int rc; + +RTE_ETH_VALID_PORTID_OR_ERR_RET (port, -ENODEV ); + +if (on >1 ) +return -EINVAL ; + + eth_dev = &rte_eth_devices[port];
For PMD specific APIs, you need to add a protection against application call the API with port_id of different vendor NIC.
Please check samples on ixgbe or i40e drivers.
<...>
Quoted 8 lines
drivers/net/bnxt/rte_pmd_bnxt_version.map +0
-0@@ -1,4 +1,13 @@ DPDK_16.04 { local: *;
drivers/net/bnxt/rte_pmd_bnxt_version.map line 13
Quoted 10 lines
drivers/net/bnxt/rte_pmd_bnxt_version.map +9
-0+ +}; + +DPDK_17.08 { + global: + + rte_pmd_bnxt_set_tx_loopback; + rte_pmd_bnxt_set_all_queues_drop_en; + rte_pmd_bnxt_set_vf_mac_addr; };
Since DPDK_16.04 doesn't have any APIs, I think it can be removed completely this one replace it (meaning moving local: *; to here)
PATCH v2 18/25 bnxt: add support for set VF QOS and MAC anti spoof
In reply to Ajit KhapardeThis patch adds support to
1) enable VF MAC anti spoof.
2) QOS configuration for specified VF.
--v1->v2: regroup related patches and incorporate other review comments
--- drivers/net/bnxt/bnxt.h | 2 + drivers/net/bnxt/bnxt_hwrm.c | 33 +++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 3 + drivers/net/bnxt/rte_pmd_bnxt.c | 95 +++++++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 37 ++++++++++++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 2 + 6 files changed, 172 insertions(+)
drivers/net/bnxt/bnxt.h +2 -0
@@ -104,6 +104,8 @@ struct bnxt_child_vf_info {uint32_t l2_rx_mask;uint16_t fid;uint16_t dflt_vlan; +uint16_t max_tx_rate; +uint8_t mac_spoof_en;bool random_mac; };
drivers/net/bnxt/bnxt_hwrm.c +33 -0
@@ -2230,6 +2230,21 @@ int bnxt_hwrm_tunnel_dst_port_free(struct bnxt *bp, uint16_t port,return rc; } +int bnxt_hwrm_func_cfg_vf_set_flags (struct bnxt *bp,uint16_t vf) +{ +struct hwrm_func_cfg_output *resp = bp->hwrm_cmd_resp_addr; +struct hwrm_func_cfg_input req = {0 }; +int rc; + +HWRM_PREP (req,FUNC_CFG ,-1 , resp); + req.fid =rte_cpu_to_le_16 (bp->pf.vf_info[vf].fid); + req.flags =rte_cpu_to_le_32 (bp->pf.vf_info[vf].func_cfg_flags); + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); +HWRM_CHECK_RESULT ; + +return rc; +} +int bnxt_hwrm_func_buf_rgtr (struct bnxt *bp) {int rc =0 ;
@@ -2339,6 +2354,24 @@ int bnxt_hwrm_set_default_vlan(struct bnxt *bp, int vf, uint8_t is_vf)return rc; } +int bnxt_hwrm_func_bw_cfg (struct bnxt *bp,uint16_t vf, +uint16_t max_bw,uint16_t enables) +{ +struct hwrm_func_cfg_output *resp = bp->hwrm_cmd_resp_addr; +struct hwrm_func_cfg_input req = {0 }; +int rc; + +HWRM_PREP (req,FUNC_CFG ,-1 , resp); + req.fid =rte_cpu_to_le_16 (bp->pf.vf_info[vf].fid); + req.enables |=rte_cpu_to_le_32 (enables); + req.flags =rte_cpu_to_le_32 (bp->pf.vf_info[vf].func_cfg_flags); + req.max_bw =rte_cpu_to_le_32 (max_bw); + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); +HWRM_CHECK_RESULT ; + +return rc; +} +int bnxt_hwrm_reject_fwd_resp (struct bnxt *bp,uint16_t target_id,void *encaped,size_t ec_size) {
drivers/net/bnxt/bnxt_hwrm.h +3 -0
@@ -121,6 +121,8 @@ int bnxt_hwrm_allocate_vfs(struct bnxt *bp, int num_vfs);int bnxt_hwrm_func_vf_mac (struct bnxt *bp,uint16_t vf,const uint8_t *mac_addr);int bnxt_hwrm_pf_evb_mode (struct bnxt *bp); +int bnxt_hwrm_func_bw_cfg (struct bnxt *bp,uint16_t vf, +uint16_t max_bw,uint16_t enables);int bnxt_hwrm_func_qcfg_vf_default_mac (struct bnxt *bp,uint16_t vf,struct ether_addr *mac); int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,
@@ -133,6 +135,7 @@ int bnxt_hwrm_port_qstats(struct bnxt *bp);int bnxt_hwrm_port_clr_stats (struct bnxt *bp);int bnxt_hwrm_port_led_cfg (struct bnxt *bp,bool led_on);int bnxt_hwrm_port_led_qcaps (struct bnxt *bp); +int bnxt_hwrm_func_cfg_vf_set_flags (struct bnxt *bp,uint16_t vf);int bnxt_hwrm_func_vf_vnic_query_and_config (struct bnxt *bp,uint16_t vf,void (*vnic_cb)(struct bnxt_vnic_info *,void *),void *cbdata,int (*hwrm_cb)(struct bnxt *bp,struct bnxt_vnic_info *vnic));
drivers/net/bnxt/rte_pmd_bnxt.c +95 -0
98 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt.h +37 -0
@@ -37,6 +37,24 @@#include <rte_ethdev.h> /** +* Enable/Disable VF MAC anti spoof +* +* @param port +* The port identifier of the Ethernet device. +* @param vf +* VF id. +* @param on +* 1 - Enable VF MAC anti spoof. +* 0 - Disable VF MAC anti spoof. +* +* @return +* - (0) if successful. +* - (-ENODEV) if *port* invalid. +* - (-EINVAL) if bad parameter. +*/ +int rte_pmd_bnxt_set_vf_mac_anti_spoof (uint8_t port,uint16_t vf,uint8_t on); + +/** * Set the VF MAC address. * * @param port
@@ -84,4 +102,23 @@ int rte_pmd_bnxt_set_tx_loopback(uint8_t port, uint8_t on);* - (-EINVAL) if bad parameter. */ int rte_pmd_bnxt_set_all_queues_drop_en (uint8_t port,uint8_t on); + +/** +* Set the VF rate limit. +* +* @param port +* The port identifier of the Ethernet device. +* @param vf +* VF id. +* @param tx_rate +* Tx rate for the VF +* @param q_msk +* Mask of the Tx queue +* @return +* - (0) if successful. +* - (-ENODEV) if *port* invalid. +* - (-EINVAL) if *vf* or *mac_addr* is invalid. +*/ +int rte_pmd_bnxt_set_vf_rate_limit (uint8_t port,uint16_t vf, +uint16_t tx_rate,uint64_t q_msk);#endif /* _PMD_BNXT_H_ */
drivers/net/bnxt/rte_pmd_bnxt_version.map +2 -0
@@ -10,4 +10,6 @@ DPDK_17.08 { rte_pmd_bnxt_set_tx_loopback; rte_pmd_bnxt_set_all_queues_drop_en; rte_pmd_bnxt_set_vf_mac_addr; + rte_pmd_bnxt_set_vf_mac_anti_spoof; + rte_pmd_bnxt_set_vf_rate_limit; };
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v2 19/25 bnxt: add support for VLAN stripq, anti spoof and filtering for VFs
In reply to Ajit KhapardeThis patch adds support for VF VLAN stripq, VF VLAN anti spoof and VF VLAN filtering.
The VF VLAN filtering needs the VLAN anti spoof setting to be set first before the command to program the VLAN table is sent to the firmware.
--v1->v2: regroup related patches and incorporate other review comments
--- drivers/net/bnxt/bnxt.h | 2 + drivers/net/bnxt/bnxt_ethdev.c | 12 +-- drivers/net/bnxt/bnxt_filter.h | 2 + drivers/net/bnxt/bnxt_hwrm.c | 84 ++++++++++++++- drivers/net/bnxt/bnxt_hwrm.h | 7 +- drivers/net/bnxt/rte_pmd_bnxt.c | 174 ++++++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 60 +++++++++++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 3 + 8 files changed, 336 insertions(+), 8 deletions(-)
drivers/net/bnxt/bnxt.h +2 -0
@@ -105,7 +105,9 @@ struct bnxt_child_vf_info {uint16_t fid;uint16_t dflt_vlan;uint16_t max_tx_rate; +uint16_t vlan_count;uint8_t mac_spoof_en; +uint8_t vlan_spoof_en;bool random_mac; };
drivers/net/bnxt/bnxt_ethdev.c +6 -6
@@ -294,7 +294,7 @@ static int bnxt_init_chip(struct bnxt *bp)else bnxt_hwrm_vnic_tpa_cfg (bp, vnic,0 ); } - rc =bnxt_hwrm_cfa_l2_set_rx_mask (bp, &bp->vnic_info[0 ]); + rc =bnxt_hwrm_cfa_l2_set_rx_mask (bp, &bp->vnic_info[0 ],0 ,NULL );if (rc) {RTE_LOG (ERR ,PMD ,"HWRM cfa l2 rx mask failure rc: %x\n" , rc);
@@ -702,7 +702,7 @@ static void bnxt_promiscuous_enable_op(struct rte_eth_dev *eth_dev) vnic = &bp->vnic_info[0 ]; vnic->flags |=BNXT_VNIC_INFO_PROMISC ; -bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic); +bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic,0 ,NULL ); }static void bnxt_promiscuous_disable_op (struct rte_eth_dev *eth_dev)
@@ -716,7 +716,7 @@ static void bnxt_promiscuous_disable_op(struct rte_eth_dev *eth_dev) vnic = &bp->vnic_info[0 ]; vnic->flags &= ~BNXT_VNIC_INFO_PROMISC ; -bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic); +bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic,0 ,NULL ); }static void bnxt_allmulticast_enable_op (struct rte_eth_dev *eth_dev)
@@ -730,7 +730,7 @@ static void bnxt_allmulticast_enable_op(struct rte_eth_dev *eth_dev) vnic = &bp->vnic_info[0 ]; vnic->flags |=BNXT_VNIC_INFO_ALLMULTI ; -bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic); +bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic,0 ,NULL ); }static void bnxt_allmulticast_disable_op (struct rte_eth_dev *eth_dev)
@@ -744,7 +744,7 @@ static void bnxt_allmulticast_disable_op(struct rte_eth_dev *eth_dev) vnic = &bp->vnic_info[0 ]; vnic->flags &= ~BNXT_VNIC_INFO_ALLMULTI ; -bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic); +bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic,0 ,NULL ); } static int bnxt_reta_update_op(struct rte_eth_dev *eth_dev,
@@ -1368,7 +1368,7 @@ bnxt_dev_set_mc_addr_list_op(struct rte_eth_dev *eth_dev, vnic->mc_addr_cnt = i; allmulti: -return bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic); +return bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic,0 ,NULL ); } static int
drivers/net/bnxt/bnxt_filter.h +2 -0
@@ -63,6 +63,8 @@ struct bnxt_filter_info {uint32_t vni;uint8_t pri_hint;uint64_t l2_filter_id_hint; +uint32_t src_id; +uint8_t src_type; };struct bnxt_filter_info *bnxt_alloc_filter (struct bnxt *bp);
drivers/net/bnxt/bnxt_hwrm.c +83 -1
105 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +6 -1
@@ -45,7 +45,9 @@ struct bnxt_cp_ring_info;int bnxt_hwrm_cfa_l2_clear_rx_mask (struct bnxt *bp,struct bnxt_vnic_info *vnic); -int bnxt_hwrm_cfa_l2_set_rx_mask (struct bnxt *bp,struct bnxt_vnic_info *vnic); +int bnxt_hwrm_cfa_l2_set_rx_mask (struct bnxt *bp,struct bnxt_vnic_info *vnic, +uint16_t vlan_count, +struct bnxt_vlan_table_entry *vlan_table);int bnxt_hwrm_clear_filter (struct bnxt *bp,struct bnxt_filter_info *filter); int bnxt_hwrm_set_filter(struct bnxt *bp,
@@ -139,4 +141,7 @@ int bnxt_hwrm_func_cfg_vf_set_flags(struct bnxt *bp, uint16_t vf);int bnxt_hwrm_func_vf_vnic_query_and_config (struct bnxt *bp,uint16_t vf,void (*vnic_cb)(struct bnxt_vnic_info *,void *),void *cbdata,int (*hwrm_cb)(struct bnxt *bp,struct bnxt_vnic_info *vnic)); +int bnxt_hwrm_func_cfg_vf_set_vlan_anti_spoof (struct bnxt *bp,uint16_t vf, +bool on); +int bnxt_hwrm_func_qcfg_vf_dflt_vnic_id (struct bnxt *bp,int vf);#endif
drivers/net/bnxt/rte_pmd_bnxt.c +174 -0
183 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt.h +60 -0
70 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt_version.map +3 -0
@@ -12,4 +12,7 @@ DPDK_17.08 { rte_pmd_bnxt_set_vf_mac_addr; rte_pmd_bnxt_set_vf_mac_anti_spoof; rte_pmd_bnxt_set_vf_rate_limit; + rte_pmd_bnxt_set_vf_vlan_stripq; + rte_pmd_bnxt_set_vf_vlan_filter; + rte_pmd_bnxt_set_vf_vlan_anti_spoof; };
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v2 20/25 bnxt: add support to get and clear VF specific stats
In reply to Ajit KhapardeThis patch adds code to get and clear VF stats.
It also adds the necessary HWRM structures to send the command to the firmware.
--v1->v2: regroup related patches and incorporate other review comments
--- drivers/net/bnxt/bnxt_hwrm.c | 38 ++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 3 ++ drivers/net/bnxt/rte_pmd_bnxt.c | 87 +++++++++++++++++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 64 ++++++++++++++++++++++++++++++ 4 files changed, 192 insertions(+)
drivers/net/bnxt/bnxt_hwrm.c +38 -0
@@ -1237,6 +1237,27 @@ int bnxt_hwrm_func_vf_mac(struct bnxt *bp, uint16_t vf, const uint8_t *mac_addr)return rc; } +int bnxt_hwrm_func_qstats_tx_drop (struct bnxt *bp,uint16_t fid, +uint64_t *dropped) +{ +int rc =0 ; +struct hwrm_func_qstats_input req = {.req_type =0 }; +struct hwrm_func_qstats_output *resp = bp->hwrm_cmd_resp_addr; + +HWRM_PREP (req,FUNC_QSTATS ,-1 , resp); + + req.fid =rte_cpu_to_le_16 (fid); + + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); + +HWRM_CHECK_RESULT ; + +if (dropped) + *dropped =rte_le_to_cpu_64 (resp->tx_drop_pkts); + +return rc; +} +int bnxt_hwrm_func_qstats (struct bnxt *bp,uint16_t fid,struct rte_eth_stats *stats) {
@@ -1274,6 +1295,23 @@ int bnxt_hwrm_func_qstats(struct bnxt *bp, uint16_t fid,return rc; } +int bnxt_hwrm_func_clr_stats (struct bnxt *bp,uint16_t fid) +{ +int rc =0 ; +struct hwrm_func_clr_stats_input req = {.req_type =0 }; +struct hwrm_func_clr_stats_output *resp = bp->hwrm_cmd_resp_addr; + +HWRM_PREP (req,FUNC_CLR_STATS ,-1 , resp); + + req.fid =rte_cpu_to_le_16 (fid); + + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); + +HWRM_CHECK_RESULT ; + +return rc; +} +/* * HWRM utility functions */
drivers/net/bnxt/bnxt_hwrm.h +3 -0
@@ -66,6 +66,9 @@ int bnxt_hwrm_func_reset(struct bnxt *bp);int bnxt_hwrm_func_driver_unregister (struct bnxt *bp,uint32_t flags);int bnxt_hwrm_func_qstats (struct bnxt *bp,uint16_t fid,struct rte_eth_stats *stats); +int bnxt_hwrm_func_qstats_tx_drop (struct bnxt *bp,uint16_t fid, +uint64_t *dropped); +int bnxt_hwrm_func_clr_stats (struct bnxt *bp,uint16_t fid);int bnxt_hwrm_func_cfg_def_cp (struct bnxt *bp);int bnxt_hwrm_vf_func_cfg_def_cp (struct bnxt *bp);
drivers/net/bnxt/rte_pmd_bnxt.c +87 -0
90 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt.h +64 -0
74 lines not on this page · raw message
Signature · 1 line
2.10.1 (Apple Git-78)
Re: [PATCH v2 20/25] bnxt: add support to get and clear VF specific stats
Quoted 7 lines · Ajit Khaparde
This patch adds code to get and clear VF stats.
It also adds the necessary HWRM structures to send the command to the firmware.Signed-off-by Stephen Hurd <[email protected]>Signed-off-by Ajit Khaparde <[email protected]>
Quoted 8 lines
--
v1->v2: regroup related patches and incorporate other review comments--- drivers/net/bnxt/bnxt_hwrm.c | 38 ++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 3 ++ drivers/net/bnxt/rte_pmd_bnxt.c | 87 +++++++++++++++++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 64 ++++++++++++++++++++++++++++++ 4 files changed, 192 insertions(+)
It looks like new APIs not added into .map file.
This doesn't cause a build error because they are not used anywhere, that is why using testpmd to implement them helps to find any issues.
<...>
drivers/net/bnxt/rte_pmd_bnxt.c int rte_pmd_bnxt_set_vf_vlan_filter(struct rte_eth_dev *dev, uint16_t vlan, · line 494
Quoted 12 lines
drivers/net/bnxt/rte_pmd_bnxt.c +12
-0+int rte_pmd_bnxt_get_tx_drop_count (uint8_t port,uint64_t *count) +{ +struct rte_eth_dev *dev; +struct rte_eth_dev_info dev_info; +struct bnxt *bp; + + dev = &rte_eth_devices[port]; +rte_eth_dev_info_get (port, &dev_info); + bp = (struct bnxt *)dev->data->dev_private; + +return bnxt_hwrm_func_qstats_tx_drop (bp,0xffff , count); +}
This function is not to get VF stats from PF. As far as I can see this just gets queue stats, does this really needs to be PMD specific API, isn't this something generic?
<...>
Re: [PATCH v2 20/25] bnxt: add support to get and clear VF specific stats
Quoted 8 lines · Ferruh Yigit
Quoted 8 lines
drivers/net/bnxt/rte_pmd_bnxt.c +8
-0+int rte_pmd_bnxt_get_tx_drop_count (uint8_t port,uint64_t *count) +{ +struct rte_eth_dev *dev; +struct rte_eth_dev_info dev_info; +struct bnxt *bp; + + dev = &rte_eth_devices[port]; +rte_eth_dev_info_get (port, &dev_info);
Quoted 8 lines
drivers/net/bnxt/rte_pmd_bnxt.c int rte_pmd_bnxt_set_vf_vlan_filter(struct rte_eth_dev *dev, uint16_t vlan, · line 494
Quoted 4 lines
drivers/net/bnxt/rte_pmd_bnxt.c +4
-0+ bp = (struct bnxt *)dev->data->dev_private; + +return bnxt_hwrm_func_qstats_tx_drop (bp,0xffff , count); +}This function is not to get VF stats from PF. As far as I can see this just gets queue stats, does this really needs to be PMD specific API, isn't this something generic?
Yes. That is right. It returns a count of number of packets which were not transmitted
because it did not pass the MAC/VLAN spoof check. It does not necessarily mean "failure to transmit" and so I don't think it is right to map it to oerrors.
So in the current form I don't see a way to make a generic function out of it.
Re: [PATCH v2 20/25] bnxt: add support to get and clear VF specific stats
Quoted 22 lines · Ajit Khaparde
drivers/net/bnxt/rte_pmd_bnxt.c int rte_pmd_bnxt_set_vf_vlan_filter(struct rte_eth_dev *dev, uint16_t vlan, · line 494
Quoted 12 lines · On Mon, May 29, 2017 at 12:43 PM, Ferruh Yigit <[email protected]…
drivers/net/bnxt/rte_pmd_bnxt.c +12
-0+int rte_pmd_bnxt_get_tx_drop_count (uint8_t port,uint64_t *count) +{ +struct rte_eth_dev *dev; +struct rte_eth_dev_info dev_info; +struct bnxt *bp; + + dev = &rte_eth_devices[port]; +rte_eth_dev_info_get (port, &dev_info); + bp = (struct bnxt *)dev->data->dev_private; + +return bnxt_hwrm_func_qstats_tx_drop (bp,0xffff , count); +}This function is not to get VF stats from PF. As far as I can see this just gets queue stats, does this really needs to be PMD specific API, isn't this something generic?
Quoted 8 lines
Yes. That is right. It returns a count of number of packets which were not transmitted
because it did not pass the MAC/VLAN spoof check.
It does not
necessarily mean "failure to transmit" and so I don't think it is right to map it to oerrors.
So in the current form I don't see a way to make a generic function out of it.
I see, this is implemented because there is no place in basic stats to put tx_drop_pkts.
Can xstats be used to get this value? Can new .xstats_get_by_id help here?
Re: [PATCH v2 20/25] bnxt: add support to get and clear VF specific stats
Quoted 33 lines · Ferruh Yigit
Quoted 4 lines · Ajit Khaparde
On Mon, May 29, 2017 at 12:43 PM, Ferruh Yigit <[email protected] <mailto:[email protected]>> wrote:
Quoted 14 lines
drivers/net/bnxt/rte_pmd_bnxt.c int rte_pmd_bnxt_set_vf_vlan_filter(struct rte_eth_dev *dev, uint16_t vlan, · line 494
Quoted 12 lines
drivers/net/bnxt/rte_pmd_bnxt.c +12
-0+int rte_pmd_bnxt_get_tx_drop_count (uint8_t port,uint64_t *count) +{ +struct rte_eth_dev *dev; +struct rte_eth_dev_info dev_info; +struct bnxt *bp; + + dev = &rte_eth_devices[port]; +rte_eth_dev_info_get (port, &dev_info); + bp = (struct bnxt *)dev->data->dev_private; + +return bnxt_hwrm_func_qstats_tx_drop (bp,0xffff , count); +}This function is not to get VF stats from PF. As far as I can see
this
Quoted 4 lines
just gets queue stats, does this really needs to be PMD specific API, isn't this something generic?
Quoted 8 lines
Yes. That is right. It returns a count of number of packets which were not transmitted
because it did not pass the MAC/VLAN spoof check.
It does not
necessarily mean "failure to transmit" and so I don't think it is right to map it to oerrors.
So in the current form I don't see a way to make a generic function out of it.
Quoted 5 lines
I see, this is implemented because there is no place in basic stats to put
tx_drop_pkts.Can xstats be used to get this value? Can new .xstats_get_by_id help here?
May be we could. Do we have time for that?
Re: [PATCH v2 20/25] bnxt: add support to get and clear VF specific stats
Quoted 48 lines · Ajit Khaparde
On Wed, May 31, 2017 at 4:57 AM, Ferruh Yigit <[email protected] <mailto:[email protected]>>wrote:
On 5/31/2017 3:12 AM, Ajit Khaparde wrote: > > On Mon, May 29, 2017 at 12:43 PM, Ferruh Yigit <[email protected] <mailto:[email protected]> > <mailto:[email protected] <mailto:[email protected]>>> wrote: > > > +int rte_pmd_bnxt_get_tx_drop_count(uint8_t port, uint64_t *count) > > +{ > > + struct rte_eth_dev *dev; > > + struct rte_eth_dev_info dev_info; > > + struct bnxt *bp; > > + > > + dev = &rte_eth_devices[port]; > > + rte_eth_dev_info_get(port, &dev_info); > > + bp = (struct bnxt *)dev->data->dev_private; > > + > > + return bnxt_hwrm_func_qstats_tx_drop(bp, 0xffff, count); > > +} > > This function is not to get VF stats from PF. As far as I can see this > just gets queue stats, does this really needs to be PMD specific API, > isn't this something generic? > > > Yes. That is right. It returns a count of number of packets which were > not transmitted > because it did not pass the MAC/VLAN spoof check. > It does not > necessarily mean "failure to transmit" and so I don't think it is right > to map it to oerrors. > So in the current form I don't see a way to make a generic function out > of it. I see, this is implemented because there is no place in basic stats to put tx_drop_pkts. Can xstats be used to get this value? Can new .xstats_get_by_id help here?
Quoted 1 line
May be we could. Do we have time for that?
Agreed that this may require effort, but I believe we should not use PMD specific APIs as much as possible, and stick to ethdev abstraction layer.
PMD specific API kills the portability, and only should be used to benefit from features that are available only for that PMD.
This was my concern to start implementing more thing in PMD layer, like getting tx_drop stats..
Thanks,
ferruh
Re: [PATCH v2 20/25] bnxt: add support to get and clear VF specific stats
31/05/2017 16:46, Ferruh Yigit:
Quoted 51 lines · Ajit Khaparde
Quoted 48 lines
On Wed, May 31, 2017 at 4:57 AM, Ferruh Yigit <[email protected] <mailto:[email protected]>>wrote:
On 5/31/2017 3:12 AM, Ajit Khaparde wrote: > > On Mon, May 29, 2017 at 12:43 PM, Ferruh Yigit <[email protected] <mailto:[email protected]> > <mailto:[email protected] <mailto:[email protected]>>> wrote: > > > +int rte_pmd_bnxt_get_tx_drop_count(uint8_t port, uint64_t *count) > > +{ > > + struct rte_eth_dev *dev; > > + struct rte_eth_dev_info dev_info; > > + struct bnxt *bp; > > + > > + dev = &rte_eth_devices[port]; > > + rte_eth_dev_info_get(port, &dev_info); > > + bp = (struct bnxt *)dev->data->dev_private; > > + > > + return bnxt_hwrm_func_qstats_tx_drop(bp, 0xffff, count); > > +} > > This function is not to get VF stats from PF. As far as I can see this > just gets queue stats, does this really needs to be PMD specific API, > isn't this something generic? > > > Yes. That is right. It returns a count of number of packets which were > not transmitted > because it did not pass the MAC/VLAN spoof check. > It does not > necessarily mean "failure to transmit" and so I don't think it is right > to map it to oerrors. > So in the current form I don't see a way to make a generic function out > of it. I see, this is implemented because there is no place in basic stats to put tx_drop_pkts. Can xstats be used to get this value? Can new .xstats_get_by_id help here?Quoted 1 line
May be we could. Do we have time for that?
Quoted 8 lines
Agreed that this may require effort, but I believe we should not use PMD specific APIs as much as possible, and stick to ethdev abstraction layer.
PMD specific API kills the portability, and only should be used to benefit from features that are available only for that PMD.
This was my concern to start implementing more thing in PMD layer, like getting
tx_dropstats..
Yes I agree the specific statistics should be added in xstats.
Re: [PATCH v2 20/25] bnxt: add support to get and clear VF specific stats
Quoted 60 lines · Thomas Monjalon
31/05/2017 16:46, Ferruh Yigit:
Quoted 7 lines · Ajit Khaparde
Quoted 6 lines
On Wed, May 31, 2017 at 4:57 AM, Ferruh Yigit <[email protected] <mailto:[email protected]>>wrote:
On 5/31/2017 3:12 AM, Ajit Khaparde wrote: > > On Mon, May 29, 2017 at 12:43 PM, Ferruh Yigit <[email protected] <mailto:[email protected]>
Quoted 15 lines
Quoted 15 lines
Quoted 1 line
<mailto:[email protected] <mailto:[email protected]>>>
wrote: > > > +int rte_pmd_bnxt_get_tx_drop_count(uint8_t port, uint64_t *count) > > +{ > > + struct rte_eth_dev *dev; > > + struct rte_eth_dev_info dev_info; > > + struct bnxt *bp; > > + > > + dev = &rte_eth_devices[port]; > > + rte_eth_dev_info_get(port, &dev_info); > > + bp = (struct bnxt *)dev->data->dev_private; > > + > > + return bnxt_hwrm_func_qstats_tx_drop(bp, 0xffff,count);
Quoted 10 lines
Quoted 10 lines
Quoted 3 lines
Quoted 1 line
+}
This function is not to get VF stats from PF. As far as I can
see this
> just gets queue stats, does this really needs to be PMD
specific API,
> isn't this something generic?
>
>
> Yes. That is right. It returns a count of number of packetswhich
Quoted 11 lines
Quoted 11 lines
were
> not transmitted
> because it did not pass the MAC/VLAN spoof check.
> It does not
> necessarily mean "failure to transmit" and so I don't think it is right
> to map it to oerrors.
> So in the current form I don't see a way to make a generic function out
> of it.Quoted 1 line
Quoted 1 line
I see, this is implemented because there is no place in basic
stats to
Quoted 3 lines
Quoted 3 lines
put
tx_drop_pkts.Can xstats be used to get this value? Can new .xstats_get_by_id
help
Quoted 7 lines
Quoted 3 lines
here?
May be we could. Do we have time for that?
Agreed that this may require effort, but I believe we should not use PMD specific APIs as much as possible, and stick to ethdev abstraction layer.
Quoted 8 lines
Quoted 5 lines
PMD specific API kills the portability, and only should be used to benefit from features that are available only for that PMD.
This was my concern to start implementing more thing in PMD layer, like getting
tx_dropstats..Yes I agree the specific statistics should be added in xstats.
And I am already working on that. Thanks
PATCH v2 21/25 bnxt: add code to determine the Rx status of VF
In reply to Ajit KhapardeThis patch adds code to determine the Rx status of a VF. It adds the rte_pmd_bnxt_get_vf_rx_status call, which calculates the VNIC count of the function to get the Rx status.
--v1->v2: regroup related patches and incorporate other review comments
--- drivers/net/bnxt/bnxt_hwrm.c | 24 ++++++++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 1 + drivers/net/bnxt/rte_pmd_bnxt.c | 23 +++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 17 +++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 5 +++++ 5 files changed, 70 insertions(+)
drivers/net/bnxt/bnxt_hwrm.c +24 -0
@@ -2626,6 +2626,30 @@ int bnxt_hwrm_port_led_cfg(struct bnxt *bp, bool led_on)return rc; } +static void bnxt_vnic_count (struct bnxt_vnic_info *vnic,void *cbdata) +{ +uint32_t *count = cbdata; + +if (vnic->func_default) + *count = *count +1 ; +} + +static int bnxt_vnic_count_hwrm_stub(struct bnxt *bp __rte_unused, + struct bnxt_vnic_info *vnic __rte_unused) +{ +return 0 ; +} + +int bnxt_vf_default_vnic_count (struct bnxt *bp,uint16_t vf) +{ +uint32_t count =0 ; + +bnxt_hwrm_func_vf_vnic_query_and_config (bp, vf, bnxt_vnic_count, + &count, bnxt_vnic_count_hwrm_stub); + +return count; +} +static int bnxt_hwrm_func_vf_vnic_query (struct bnxt *bp,uint16_t vf,uint16_t *vnic_ids) {
drivers/net/bnxt/bnxt_hwrm.h +1 -0
@@ -141,6 +141,7 @@ int bnxt_hwrm_port_clr_stats(struct bnxt *bp);int bnxt_hwrm_port_led_cfg (struct bnxt *bp,bool led_on);int bnxt_hwrm_port_led_qcaps (struct bnxt *bp);int bnxt_hwrm_func_cfg_vf_set_flags (struct bnxt *bp,uint16_t vf); +int bnxt_vf_default_vnic_count (struct bnxt *bp,uint16_t vf);int bnxt_hwrm_func_vf_vnic_query_and_config (struct bnxt *bp,uint16_t vf,void (*vnic_cb)(struct bnxt_vnic_info *,void *),void *cbdata,int (*hwrm_cb)(struct bnxt *bp,struct bnxt_vnic_info *vnic));
drivers/net/bnxt/rte_pmd_bnxt.c +23 -0
@@ -480,6 +480,29 @@ int rte_pmd_bnxt_reset_vf_stats(uint8_t port,return bnxt_hwrm_func_clr_stats (bp, bp->pf.first_vf_id + vf_id); } +int rte_pmd_bnxt_get_vf_rx_status (uint8_t port,uint16_t vf_id) +{ +struct rte_eth_dev *dev; +struct rte_eth_dev_info dev_info; +struct bnxt *bp; + + dev = &rte_eth_devices[port]; +rte_eth_dev_info_get (port, &dev_info); + bp = (struct bnxt *)dev->data->dev_private; + +if (vf_id >= dev_info.max_vfs) +return -EINVAL ; + +if (!BNXT_PF (bp)) { +RTE_LOG (ERR ,PMD , +"Attempt to query VF %d RX stats on non-PF port %d!\n" , + vf_id, port); +return -ENOTSUP ; + } + +return bnxt_vf_default_vnic_count (bp, vf_id); +} +int rte_pmd_bnxt_get_tx_drop_count (uint8_t port,uint64_t *count) {struct rte_eth_dev *dev;
drivers/net/bnxt/rte_pmd_bnxt.h +17 -0
@@ -217,6 +217,23 @@ int rte_pmd_bnxt_reset_vf_stats(uint8_t port,*/ int rte_pmd_bnxt_set_vf_vlan_anti_spoof (uint8_t port,uint16_t vf,uint8_t on); + +/** +* Returns the number of default RX queues on a VF +* +* @param port +* The port identifier of the Ethernet device. +* @param vf +* VF id. +* @return +* - Non-negative value - Number of default RX queues +* - (-EINVAL) if bad parameter. +* - (-ENOTSUP) if on a function without VFs +* - (-ENOMEM) on an allocation failure +* - (-1) firmware interface error +*/ +int rte_pmd_bnxt_get_vf_rx_status (uint8_t port,uint16_t vf_id); +/** * Queries the TX drop counter for the function *
drivers/net/bnxt/rte_pmd_bnxt_version.map +5 -0
@@ -9,6 +9,11 @@ DPDK_17.08 { rte_pmd_bnxt_set_tx_loopback; rte_pmd_bnxt_set_all_queues_drop_en; + rte_pmd_bnxt_get_vf_stats; + rte_pmd_bnxt_reset_vf_stats; + rte_pmd_bnxt_get_vf_rx_status; + rte_pmd_bnxt_get_vf_tx_drop_count; + rte_pmd_bnxt_get_tx_drop_count; rte_pmd_bnxt_set_vf_mac_addr; rte_pmd_bnxt_set_vf_mac_anti_spoof; rte_pmd_bnxt_set_vf_rate_limit;
Signature · 1 line
2.10.1 (Apple Git-78)
Re: [PATCH v2 21/25] bnxt: add code to determine the Rx status of VF
Quoted 6 lines · Ajit Khaparde
This patch adds code to determine the Rx status of a VF. It adds the
rte_pmd_bnxt_get_vf_rx_statuscall, which calculates the VNIC count of the function to get the Rx status.Signed-off-by Stephen Hurd <[email protected]>Signed-off-by Ajit Khaparde <[email protected]>
<..>
drivers/net/bnxt/rte_pmd_bnxt_version.map DPDK_17.08 { · line 16
Quoted 13 lines
drivers/net/bnxt/rte_pmd_bnxt_version.map +5
-0@@ -9,6 +9,11 @@ DPDK_17.08 { rte_pmd_bnxt_set_tx_loopback; rte_pmd_bnxt_set_all_queues_drop_en; + rte_pmd_bnxt_get_vf_stats; + rte_pmd_bnxt_reset_vf_stats; + rte_pmd_bnxt_get_vf_rx_status; + rte_pmd_bnxt_get_vf_tx_drop_count; + rte_pmd_bnxt_get_tx_drop_count;
Some of these should go to previous patch.
Quoted 4 lines
drivers/net/bnxt/rte_pmd_bnxt_version.map +0
-0rte_pmd_bnxt_set_vf_mac_addr; rte_pmd_bnxt_set_vf_mac_anti_spoof; rte_pmd_bnxt_set_vf_rate_limit;
PATCH v2 22/25 bnxt: add support to add a VF MAC address
In reply to Ajit KhapardeThis patch adds support to allocate a filter and program it in the hardware for every MAC address added to the specified function.
--v1->v2: regroup related patches and incorporate other review comments
--- drivers/net/bnxt/bnxt_filter.c | 22 ++++++++++ drivers/net/bnxt/bnxt_filter.h | 1 + drivers/net/bnxt/rte_pmd_bnxt.c | 73 +++++++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 18 ++++++++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 1 + 5 files changed, 115 insertions(+)
drivers/net/bnxt/bnxt_filter.c +22 -0
@@ -68,6 +68,22 @@ struct bnxt_filter_info *bnxt_alloc_filter(struct bnxt *bp)return filter; } +struct bnxt_filter_info *bnxt_alloc_vf_filter (struct bnxt *bp,uint16_t vf) +{ +struct bnxt_filter_info *filter; + + filter =rte_zmalloc ("bnxt_vf_filter_info" ,sizeof (*filter),0 ); +if (!filter) { +RTE_LOG (ERR ,PMD ,"Failed to alloc memory for VF %hu filters\n" , + vf); +return NULL ; + } + + filter->fw_l2_filter_id =UINT64_MAX ; +STAILQ_INSERT_TAIL (&bp->pf.vf_info[vf].filter, filter, next); +return filter; +} +void bnxt_init_filters (struct bnxt *bp) {struct bnxt_filter_info *filter;
@@ -102,6 +118,12 @@ void bnxt_free_all_filters(struct bnxt *bp)STAILQ_INIT (&vnic->filter); } } + +for (i =0 ; i < bp->pf.max_vfs; i++) { + STAILQ_FOREACH(filter, &bp->pf.vf_info[i].filter, next) { +bnxt_hwrm_clear_filter (bp, filter); + } + } }void bnxt_free_filter_mem (struct bnxt *bp)
drivers/net/bnxt/bnxt_filter.h +1 -0
@@ -68,6 +68,7 @@ struct bnxt_filter_info { };struct bnxt_filter_info *bnxt_alloc_filter (struct bnxt *bp); +struct bnxt_filter_info *bnxt_alloc_vf_filter (struct bnxt *bp,uint16_t vf);void bnxt_init_filters (struct bnxt *bp);void bnxt_free_all_filters (struct bnxt *bp);void bnxt_free_filter_mem (struct bnxt *bp);
drivers/net/bnxt/rte_pmd_bnxt.c +73 -0
76 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt.h +18 -0
@@ -262,4 +262,22 @@ int rte_pmd_bnxt_get_tx_drop_count(uint8_t port, uint64_t *count);*/ int rte_pmd_bnxt_get_vf_tx_drop_count (uint8_t port,uint16_t vf_id,uint64_t *count); + +/** +* Programs the MAC address for the function specified +* +* @param port +* The port identifier of the Ethernet device. +* @param mac_addr +* The MAC address to be programmed in the filter. +* @param vf_id +* VF on which to get. +* @return +* - Positive Non-zero value - Error code from HWRM +* - (-EINVAL) invalid vf_id specified. +* - (-ENOTSUP) Ethernet device is not a PF +* - (-ENOMEM) on an allocation failure +*/ +int rte_pmd_bnxt_mac_addr_add (uint8_t port,struct ether_addr *mac_addr, +uint32_t vf_id);#endif /* _PMD_BNXT_H_ */
drivers/net/bnxt/rte_pmd_bnxt_version.map +1 -0
@@ -14,6 +14,7 @@ DPDK_17.08 { rte_pmd_bnxt_get_vf_rx_status; rte_pmd_bnxt_get_vf_tx_drop_count; rte_pmd_bnxt_get_tx_drop_count; + rte_pmd_bnxt_mac_addr_add; rte_pmd_bnxt_set_vf_mac_addr; rte_pmd_bnxt_set_vf_mac_anti_spoof; rte_pmd_bnxt_set_vf_rate_limit;
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v2 23/25 bnxt: add code to configure a default VF VLAN
In reply to Ajit KhapardeThis patch adds code to insert a default VF VLAN.
Also track the current default VLAN per vnic for the VF. When setting the default VLAN, avoid setting it to the current value.
--v1->v2: regroup related patches and incorporate other review comments
--- drivers/net/bnxt/bnxt.h | 2 +- drivers/net/bnxt/bnxt_hwrm.c | 39 +++++++++++++++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 2 ++ drivers/net/bnxt/rte_pmd_bnxt.c | 35 +++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 20 ++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 1 + 6 files changed, 98 insertions(+), 1 deletion(-)
drivers/net/bnxt/bnxt.h +1 -1
@@ -103,8 +103,8 @@ struct bnxt_child_vf_info {uint32_t func_cfg_flags;uint32_t l2_rx_mask;uint16_t fid; -uint16_t dflt_vlan;uint16_t max_tx_rate; +uint16_t dflt_vlan;uint16_t vlan_count;uint8_t mac_spoof_en;uint8_t vlan_spoof_en;
drivers/net/bnxt/bnxt_hwrm.c +39 -0
@@ -2069,6 +2069,27 @@ static void reserve_resources_from_vf(struct bnxt *bp, bp->max_ring_grps -=rte_le_to_cpu_16 (resp->max_hw_ring_grps); } +int bnxt_hwrm_func_qcfg_current_vf_vlan (struct bnxt *bp,int vf) +{ +struct hwrm_func_qcfg_input req = {0 }; +struct hwrm_func_qcfg_output *resp = bp->hwrm_cmd_resp_addr; +int rc; + +/* Check for zero MAC address */ +HWRM_PREP (req,FUNC_QCFG ,-1 , resp); + req.fid =rte_cpu_to_le_16 (bp->pf.vf_info[vf].fid); + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); +if (rc) { +RTE_LOG (ERR ,PMD ,"hwrm_func_qcfg failed rc:%d\n" , rc); +return -1 ; + }else if (resp->error_code) { + rc =rte_le_to_cpu_16 (resp->error_code); +RTE_LOG (ERR ,PMD ,"hwrm_func_qcfg error %d\n" , rc); +return -1 ; + } +return rte_le_to_cpu_16 (resp->vlan); +} +static int update_pf_resource_max (struct bnxt *bp) {struct hwrm_func_qcfg_input req = {0 };
@@ -2423,6 +2444,24 @@ int bnxt_hwrm_func_bw_cfg(struct bnxt *bp, uint16_t vf,return rc; } +int bnxt_hwrm_set_vf_vlan (struct bnxt *bp,int vf) +{ +struct hwrm_func_cfg_input req = {0 }; +struct hwrm_func_cfg_output *resp = bp->hwrm_cmd_resp_addr; +int rc =0 ; + +HWRM_PREP (req,FUNC_CFG ,-1 , resp); + req.flags =rte_cpu_to_le_32 (bp->pf.vf_info[vf].func_cfg_flags); + req.fid =rte_cpu_to_le_16 (bp->pf.vf_info[vf].fid); + req.enables |=rte_cpu_to_le_32 (HWRM_FUNC_CFG_INPUT_ENABLES_DFLT_VLAN ); + req.dflt_vlan =rte_cpu_to_le_16 (bp->pf.vf_info[vf].dflt_vlan); + + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); +HWRM_CHECK_RESULT ; + +return rc; +} +int bnxt_hwrm_reject_fwd_resp (struct bnxt *bp,uint16_t target_id,void *encaped,size_t ec_size) {
drivers/net/bnxt/bnxt_hwrm.h +2 -0
@@ -128,8 +128,10 @@ int bnxt_hwrm_func_vf_mac(struct bnxt *bp, uint16_t vf,int bnxt_hwrm_pf_evb_mode (struct bnxt *bp);int bnxt_hwrm_func_bw_cfg (struct bnxt *bp,uint16_t vf,uint16_t max_bw,uint16_t enables); +int bnxt_hwrm_set_vf_vlan (struct bnxt *bp,int vf);int bnxt_hwrm_func_qcfg_vf_default_mac (struct bnxt *bp,uint16_t vf,struct ether_addr *mac); +int bnxt_hwrm_func_qcfg_current_vf_vlan (struct bnxt *bp,int vf);int bnxt_hwrm_tunnel_dst_port_alloc (struct bnxt *bp,uint16_t port,uint8_t tunnel_type); int bnxt_hwrm_tunnel_dst_port_free(struct bnxt *bp, uint16_t port,
drivers/net/bnxt/rte_pmd_bnxt.c +35 -0
@@ -356,6 +356,41 @@ rte_pmd_bnxt_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on)return rc; } +int +rte_pmd_bnxt_set_vf_vlan_insert (uint8_t port,uint16_t vf, +uint16_t vlan_id) +{ +struct rte_eth_dev *dev; +struct rte_eth_dev_info dev_info; +struct bnxt *bp; +int rc; + +RTE_ETH_VALID_PORTID_OR_ERR_RET (port, -ENODEV ); + + dev = &rte_eth_devices[port]; +rte_eth_dev_info_get (port, &dev_info); + bp = (struct bnxt *)dev->data->dev_private; + +if (vf >= dev_info.max_vfs) +return -EINVAL ; + +if (!BNXT_PF (bp)) { +RTE_LOG (ERR ,PMD , +"Attempt to set VF %d vlan insert on non-PF port %d!\n" , + vf, port); +return -ENOTSUP ; + } + + bp->pf.vf_info[vf].dflt_vlan = vlan_id; +if (bnxt_hwrm_func_qcfg_current_vf_vlan (bp, vf) == + bp->pf.vf_info[vf].dflt_vlan) +return 0 ; + + rc =bnxt_hwrm_set_vf_vlan (bp, vf); + +return rc; +} +int rte_pmd_bnxt_set_vf_vlan_filter (struct rte_eth_dev *dev,uint16_t vlan,uint64_t vf_mask,uint8_t vlan_on) {
drivers/net/bnxt/rte_pmd_bnxt.h +20 -0
@@ -92,6 +92,26 @@ int rte_pmd_bnxt_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on);/** +* Enable/Disable vf vlan insert +* +* @param port +* The port identifier of the Ethernet device. +* @param vf +* ID specifying VF. +* @param vlan_id +* 0 - Disable VF's vlan insert. +* n - Enable; n is inserted as the vlan id. +* +* @return +* - (0) if successful. +* - (-ENODEV) if *port* invalid. +* - (-EINVAL) if bad parameter. +*/ +int +rte_pmd_bnxt_set_vf_vlan_insert (uint8_t port,uint16_t vf, +uint16_t vlan_id); + +/** * Enable/Disable hardware VF VLAN filtering by an Ethernet device of * received VLAN packets tagged with a given VLAN Tag Identifier. *
drivers/net/bnxt/rte_pmd_bnxt_version.map +1 -0
@@ -21,4 +21,5 @@ DPDK_17.08 { rte_pmd_bnxt_set_vf_vlan_stripq; rte_pmd_bnxt_set_vf_vlan_filter; rte_pmd_bnxt_set_vf_vlan_anti_spoof; + rte_pmd_bnxt_set_vf_vlan_insert; };
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v2 24/25 bnxt: Add support to set VF rxmode
In reply to Ajit KhapardeThis patch adds support to configure the VF L2 Rx settings. The per VF setting is maintained in bnxt_child_vf_info.l2_rx_mask
--v1->v2: regroup related patches and incorporate other review comments
--- drivers/net/bnxt/bnxt_hwrm.c | 24 +++++++++++++-- drivers/net/bnxt/bnxt_hwrm.h | 2 ++ drivers/net/bnxt/bnxt_rxq.c | 13 ++++++-- drivers/net/bnxt/bnxt_vnic.h | 5 +++ drivers/net/bnxt/rte_pmd_bnxt.c | 51 +++++++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 19 ++++++++++++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 1 + 7 files changed, 109 insertions(+), 6 deletions(-)
drivers/net/bnxt/bnxt_hwrm.c +21 -3
@@ -229,23 +229,29 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp,/* FIXME add multicast flag, when multicast adding options is supported * by ethtool. */ +if (vnic->flags &BNXT_VNIC_INFO_BCAST ) + mask =HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_BCAST ; +if (vnic->flags &BNXT_VNIC_INFO_UNTAGGED ) + mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_VLAN_NONVLAN ;if (vnic->flags &BNXT_VNIC_INFO_PROMISC ) - mask =HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_PROMISCUOUS ; + mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_PROMISCUOUS ;if (vnic->flags &BNXT_VNIC_INFO_ALLMULTI ) mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_ALL_MCAST ; +if (vnic->flags &BNXT_VNIC_INFO_MCAST ) + mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_MCAST ;if (vnic->mc_addr_cnt) { mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_MCAST ; req.num_mc_entries =rte_cpu_to_le_32 (vnic->mc_addr_cnt); req.mc_tbl_addr =rte_cpu_to_le_64 (vnic->mc_list_dma_addr); } - req.mask =rte_cpu_to_le_32 (HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_BCAST | - mask);if (vlan_count && vlan_table) { mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_VLANONLY ; req.vlan_tag_tbl_addr =rte_cpu_to_le_16 (rte_mem_virt2phy (vlan_table)); req.num_vlan_tags =rte_cpu_to_le_32 ((uint32_t )vlan_count); } + req.mask =rte_cpu_to_le_32 (HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_BCAST | + mask); rc =bnxt_hwrm_send_message (bp, &req,sizeof (req));
@@ -2317,6 +2323,18 @@ int bnxt_hwrm_func_cfg_vf_set_flags(struct bnxt *bp, uint16_t vf)return rc; } +void vf_vnic_set_rxmask_cb (struct bnxt_vnic_info *vnic,void *flagp) +{ +uint32_t *flag = flagp; + + vnic->flags = *flag; +} + +int bnxt_set_rx_mask_no_vlan (struct bnxt *bp,struct bnxt_vnic_info *vnic) +{ +return bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic,0 ,NULL ); +} +int bnxt_hwrm_func_buf_rgtr (struct bnxt *bp) {int rc =0 ;
drivers/net/bnxt/bnxt_hwrm.h +2 -0
@@ -143,6 +143,8 @@ int bnxt_hwrm_port_clr_stats(struct bnxt *bp);int bnxt_hwrm_port_led_cfg (struct bnxt *bp,bool led_on);int bnxt_hwrm_port_led_qcaps (struct bnxt *bp);int bnxt_hwrm_func_cfg_vf_set_flags (struct bnxt *bp,uint16_t vf); +void vf_vnic_set_rxmask_cb (struct bnxt_vnic_info *vnic,void *flagp); +int bnxt_set_rx_mask_no_vlan (struct bnxt *bp,struct bnxt_vnic_info *vnic);int bnxt_vf_default_vnic_count (struct bnxt *bp,uint16_t vf); int bnxt_hwrm_func_vf_vnic_query_and_config(struct bnxt *bp, uint16_t vf, void (*vnic_cb)(struct bnxt_vnic_info *, void *), void *cbdata,
drivers/net/bnxt/bnxt_rxq.c +10 -3
@@ -76,6 +76,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp) rc = -ENOMEM ; goto err_out; } + vnic->flags |=BNXT_VNIC_INFO_BCAST ;STAILQ_INSERT_TAIL (&bp->ff_pool[0 ], vnic, next); bp->nr_vnics++;
@@ -120,6 +121,9 @@ int bnxt_mq_rx_configure(struct bnxt *bp) }/* For each pool, allocate MACVLAN CFA rule & VNIC */ if (!pools) { + pools =RTE_MIN (bp->max_vnics, +RTE_MIN (bp->max_l2_ctx, +RTE_MIN (bp->max_rsscos_ctx,ETH_64_POOLS )));RTE_LOG (ERR ,PMD ,"VMDq pool not set, defaulted to 64\n" ); pools =ETH_64_POOLS ;
@@ -137,6 +141,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp) rc = -ENOMEM ; goto err_out; } + vnic->flags |=BNXT_VNIC_INFO_BCAST ;STAILQ_INSERT_TAIL (&bp->ff_pool[i], vnic, next); bp->nr_vnics++;
@@ -177,6 +182,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp) rc = -ENOMEM ; goto err_out; } + vnic->flags |=BNXT_VNIC_INFO_BCAST ;/* Partition the rx queues for the single pool */ for (i =0 ; i < bp->rx_cp_nr_rings; i++) { rxq = bp->eth_dev->data->rx_queues[i];
@@ -295,7 +301,7 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,int rc =0 ;if (!nb_desc || nb_desc >MAX_RX_DESC_CNT ) { -RTE_LOG (ERR ,PMD ,"nb_desc %d is invalid" , nb_desc); +RTE_LOG (ERR ,PMD ,"nb_desc %d is invalid\n" , nb_desc); rc = -EINVAL ; goto out; }
@@ -308,7 +314,7 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, rxq =rte_zmalloc_socket ("bnxt_rx_queue" ,sizeof (struct bnxt_rx_queue ),RTE_CACHE_LINE_SIZE , socket_id);if (!rxq) { -RTE_LOG (ERR ,PMD ,"bnxt_rx_queue allocation failed!" ); +RTE_LOG (ERR ,PMD ,"bnxt_rx_queue allocation failed!\n" ); rc = -ENOMEM ; goto out; }
@@ -333,7 +339,8 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,/* Allocate RX ring hardware descriptors */ if (bnxt_alloc_rings (bp, queue_idx,NULL , rxq->rx_ring, rxq->cp_ring,"rxr" )) { -RTE_LOG (ERR ,PMD ,"ring_dma_zone_reserve for rx_ring failed!" ); +RTE_LOG (ERR ,PMD , +"ring_dma_zone_reserve for rx_ring failed!\n" );bnxt_rx_queue_release_op (rxq); rc = -ENOMEM ; goto out;
drivers/net/bnxt/bnxt_vnic.h +5 -0
@@ -64,6 +64,11 @@ struct bnxt_vnic_info {uint32_t flags;#define BNXT_VNIC_INFO_PROMISC (1 << 0)#define BNXT_VNIC_INFO_ALLMULTI (1 << 1) +#define BNXT_VNIC_INFO_BCAST (1 << 2) +#define BNXT_VNIC_INFO_UCAST (1 << 3) +#define BNXT_VNIC_INFO_MCAST (1 << 4) +#define BNXT_VNIC_INFO_TAGGED (1 << 5) +#define BNXT_VNIC_INFO_UNTAGGED (1 << 6)uint16_t cos_rule;uint16_t lb_rule;
drivers/net/bnxt/rte_pmd_bnxt.c +51 -0
57 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt.h +19 -0
@@ -237,6 +237,25 @@ int rte_pmd_bnxt_reset_vf_stats(uint8_t port,*/ int rte_pmd_bnxt_set_vf_vlan_anti_spoof (uint8_t port,uint16_t vf,uint8_t on); +/** +* Set RX L2 Filtering mode of a VF of an Ethernet device. +* +* @param port +* The port identifier of the Ethernet device. +* @param vf +* VF id. +* @param rx_mask +* The RX mode mask +* @param on +* 1 - Enable a VF RX mode. +* 0 - Disable a VF RX mode. +* @return +* - (0) if successful. +* - (-ENODEV) if *port_id* invalid. +* - (-EINVAL) if bad parameter. +*/ +int rte_pmd_bnxt_set_vf_rxmode (uint8_t port,uint16_t vf, +uint16_t rx_mask,uint8_t on);/** * Returns the number of default RX queues on a VF
drivers/net/bnxt/rte_pmd_bnxt_version.map +1 -0
@@ -22,4 +22,5 @@ DPDK_17.08 { rte_pmd_bnxt_set_vf_vlan_filter; rte_pmd_bnxt_set_vf_vlan_anti_spoof; rte_pmd_bnxt_set_vf_vlan_insert; + rte_pmd_bnxt_set_vf_rxmode; };
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v2 25/25 update release notes
In reply to Ajit KhapardeUpdate release doc briefly describing updates to bnxt PMD.
--- doc/guides/rel_notes/release_17_08.rst | 8 ++++++++ 1 file changed, 8 insertions(+)
doc/guides/rel_notes/release_17_08.rst +8 -0
@@ -69,6 +69,14 @@ EAL Drivers ~~~~~~~ +* **Updated bnxt PMD.** + + Major enhancements include: + * Support MTU modification. + * Support LRO. + * Support VLAN filter and strip functionality. + * Other enhancements to add support for more dev_ops. + * Add PMD specific APIs mainly to control VF from PF. Libraries ~~~~~~~~~
Signature · 1 line
2.10.1 (Apple Git-78)
Re: [PATCH v2 25/25] update release notes
Quoted 12 lines · Ajit Khaparde
Update release doc briefly describing updates to bnxt PMD.
Signed-off-by Ajit Khaparde <[email protected]>--- doc/guides/rel_notes/release_17_08.rst | 8 ++++++++ 1 file changed, 8 insertions(+)doc/guides/rel_notes/release_17_08.rst +0
-0
doc/guides/rel_notes/release_17_08.rst EAL · line 70
Quoted 2 lines
doc/guides/rel_notes/release_17_08.rst +0
-0@@ -69,6 +69,14 @@ EAL Drivers ~~~~~~~
This is "Resolved Issues" section of the document, please move following to the "New Features" section.
doc/guides/rel_notes/release_17_08.rst EAL · line 79
Quoted 9 lines
doc/guides/rel_notes/release_17_08.rst +8
-0+* **Updated bnxt PMD.** + + Major enhancements include: + * Support MTU modification. + * Support LRO. + * Support VLAN filter and strip functionality. + * Other enhancements to add support for more dev_ops. + * Add PMD specific APIs mainly to control VF from PF.
Update HWRM version to 1.7.7 ?
Quoted 4 lines
doc/guides/rel_notes/release_17_08.rst +0
-0Libraries ~~~~~~~~~
Quoted 25 lines · Ajit Khaparde
This patchset amongst other changes adds support few more
dev_ops, updates HWRM to version 1.7.7, switches to polling stats from the hardware, support for Jumbo MTU, LRO etc..
As suggedted for the previous submission:
Grouped in the end, it also has PMD specific APIs to control VF from PF. I have updated the release notes and the features file wherever possible.--
bnxt: update to new HWRM version
bnxt: code reorg to properly allocate resources for PF/VF
bnxt: handle VF/PF initialization appropriately
bnxt: support lack of huge pages
bnxt: add additonal HWRM debug info to error messages
bnxt: add tunneling support
bnxt: add support for xstats get/reset
bnxt: Add support for VLAN filter and stripdev_ops
bnxt: add support for set multicast addr list and MAC addr set
bnxt: add support forfw_version_getdev_op
bnxt: add support to set MTU
bnxt: add support for LRO
bnxt: add rxq/txqinfo_getdev_ops
bnxt: add code to support VLAN pvid setdev_op
bnxt: reorg the query stats code
bnxt: add support for led on/off
bnxt: add support for tx loopback, set vf mac and queues drop
Quoted 8 lines
bnxt: add support for set VF QOS and MAC anti spoof
bnxt: add support for VLAN stripq, anti spoof and filtering for VFs
bnxt: add support to get and clear VF specific stats
bnxt: add code to determine the Rx status of VF
bnxt: add support to add a VF MAC address
bnxt: add code to configure a default VF VLAN
bnxt: Add support to set VF rxmode
update release notes
I have sent some comments for the patchset.
Also generic to the whole patchset, there are a few minor details it would be helpful if you can apply in next version of the patchset (otherwise maintainers have to fix them) :
- rebase patchset on top of latest next-net, there are two easy to fix conflicts because of merged patches to next-net
- patch subject starts with "next/bnxt: " for driver and "doc: " for document patch.
- in patch subject, after ":", sentences starts with lowercase char
- instead mentioning added dev_ops name in the patch subject, it would be better to mention feature added.
Thanks,
ferruh
v3 cover bnxt patchset
This patchset amongst other changes adds support few more dev_ops, updates HWRM to version 1.7.7, switches to polling stats from the hardware, support for Jumbo MTU, LRO etc..
v1->v2:
- Grouped in the end, it also has PMD specific APIs to control VF from PF.
- I have updated the release notes and the features file wherever possible.
v2->v3:
- Rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
- update testpmd to use the vendor specific APIs
- Addressed other review comments as appropriate
--
net/bnxt: update to new HWRM version
net/bnxt: code reorg to properly allocate resources for PF/VF net/bnxt: handle VF/PF initialization appropriately net/bnxt: support lack of huge pages
net/bnxt: add additonal HWRM debug info to error messages net/bnxt: add tunneling support
net/bnxt: add support for xstats get/reset
net/bnxt: add support for VLAN filter and strip net/bnxt: add support for set multicast addr list and MAC addr set
doc: update bnxt.ini to document Allmulticast mode net/bnxt: add support to get fw version
net/bnxt: add support to set MTU
net/bnxt: add support for LRO
net/bnxt: add rxq/txq info_get
net/bnxt: add code to support VLAN pvid
net/bnxt: reorg the query stats code
doc: update default.ini to add LED support
net/bnxt: add support for led on/off
net/bnxt: add support for tx loopback, set vf mac and queues drop net/bnxt: add support for set VF QOS and MAC anti spoof net/bnxt: add support to get and clear VF specific stats net/bnxt: add code to determine the Rx status of VF net/bnxt: add support to add a VF MAC address
net/bnxt: add code to configure a default VF VLAN net/bnxt: add support to set VF rxmode
doc: update release notes
app/test-pmd/Makefile | 4 + app/test-pmd/cmdline.c | 92 +- app/test-pmd/config.c | 20 +- doc/guides/nics/features/bnxt.ini | 10 + doc/guides/nics/features/default.ini | 1 + doc/guides/rel_notes/release_17_08.rst | 10 + drivers/net/bnxt/Makefile | 4 + drivers/net/bnxt/bnxt.h | 144 +- drivers/net/bnxt/bnxt_cpr.c | 132 +- drivers/net/bnxt/bnxt_cpr.h | 17 + drivers/net/bnxt/bnxt_ethdev.c | 852 ++- drivers/net/bnxt/bnxt_filter.c | 54 +- drivers/net/bnxt/bnxt_filter.h | 3 + drivers/net/bnxt/bnxt_hwrm.c | 1605 ++++- drivers/net/bnxt/bnxt_hwrm.h | 66 +- drivers/net/bnxt/bnxt_irq.c | 21 +- drivers/net/bnxt/bnxt_ring.c | 159 +- drivers/net/bnxt/bnxt_ring.h | 4 +- drivers/net/bnxt/bnxt_rxq.c | 54 +- drivers/net/bnxt/bnxt_rxq.h | 3 + drivers/net/bnxt/bnxt_rxr.c | 396 +- drivers/net/bnxt/bnxt_rxr.h | 46 + drivers/net/bnxt/bnxt_stats.c | 322 +- drivers/net/bnxt/bnxt_stats.h | 10 + drivers/net/bnxt/bnxt_txr.c | 3 +- drivers/net/bnxt/bnxt_vnic.c | 68 +- drivers/net/bnxt/bnxt_vnic.h | 20 +- drivers/net/bnxt/hsi_struct_def_dpdk.h | 9678 +++++++++++++++++++++-------- drivers/net/bnxt/rte_pmd_bnxt.c | 757 +++ drivers/net/bnxt/rte_pmd_bnxt.h | 310 + drivers/net/bnxt/rte_pmd_bnxt_version.map | 19 +- 31 files changed, 11918 insertions(+), 2966 deletions(-) create mode 100644 drivers/net/bnxt/rte_pmd_bnxt.c create mode 100644 drivers/net/bnxt/rte_pmd_bnxt.h
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 1/26 net/bnxt: update to new HWRM version
This patch updates the Broadcom bnxt PMD to version 1.7.7 Most of the changes in the patch are in the hsi_struct_def_dpdk.h - an autogenerated file. The changes in the *.c files are because of changes in the macro names.
--v1->v2: regroup related patches per review comment
v2->v3:
- rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
--- drivers/net/bnxt/bnxt_hwrm.c | 10 +- drivers/net/bnxt/bnxt_ring.c | 8 +- drivers/net/bnxt/hsi_struct_def_dpdk.h | 8710 +++++++++++++++++++++++--------- 3 files changed, 6241 insertions(+), 2487 deletions(-)
drivers/net/bnxt/bnxt_hwrm.c +5 -5
@@ -511,7 +511,7 @@ static int bnxt_hwrm_port_phy_cfg(struct bnxt *bp, struct bnxt_link_info *conf) req.enables =rte_cpu_to_le_32 (enables); }else { req.flags = -rte_cpu_to_le_32 (HWRM_PORT_PHY_CFG_INPUT_FLAGS_FORCE_LINK_DOWN ); +rte_cpu_to_le_32 (HWRM_PORT_PHY_CFG_INPUT_FLAGS_FORCE_LINK_DWN );RTE_LOG (INFO ,PMD ,"Force Link Down\n" ); }
@@ -618,7 +618,7 @@ int bnxt_hwrm_ring_alloc(struct bnxt *bp, req.enables =rte_cpu_to_le_32 (rte_le_to_cpu_32 (req.enables) |HWRM_RING_ALLOC_INPUT_ENABLES_STAT_CTX_ID_VALID );break ; -case HWRM_RING_ALLOC_INPUT_RING_TYPE_CMPL : +case HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL : req.ring_type = ring_type;/* * TODO: Some HWRM versions crash with
@@ -639,7 +639,7 @@ int bnxt_hwrm_ring_alloc(struct bnxt *bp,if (rc ==0 && resp->error_code) rc =rte_le_to_cpu_16 (resp->error_code);switch (ring_type) { -case HWRM_RING_FREE_INPUT_RING_TYPE_CMPL : +case HWRM_RING_FREE_INPUT_RING_TYPE_L2_CMPL :RTE_LOG (ERR ,PMD ,"hwrm_ring_alloc cp failed. rc:%d\n" , rc);return rc;
@@ -680,7 +680,7 @@ int bnxt_hwrm_ring_free(struct bnxt *bp, rc =rte_le_to_cpu_16 (resp->error_code);switch (ring_type) { -case HWRM_RING_FREE_INPUT_RING_TYPE_CMPL : +case HWRM_RING_FREE_INPUT_RING_TYPE_L2_CMPL :RTE_LOG (ERR ,PMD ,"hwrm_ring_free cp failed. rc:%d\n" , rc);return rc;
@@ -1063,7 +1063,7 @@ static void bnxt_free_cp_ring(struct bnxt *bp,struct bnxt_ring *cp_ring = cpr->cp_ring_struct;bnxt_hwrm_ring_free (bp, cp_ring, -HWRM_RING_FREE_INPUT_RING_TYPE_CMPL ); +HWRM_RING_FREE_INPUT_RING_TYPE_L2_CMPL ); cp_ring->fw_ring_id =INVALID_HW_RING_ID ; bp->grp_info[idx].cp_fw_ring_id =INVALID_HW_RING_ID ; memset(cpr->cp_desc_ring, 0, cpr->cp_ring_struct->ring_size *
drivers/net/bnxt/bnxt_ring.c +4 -4
@@ -219,8 +219,8 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)struct bnxt_ring *cp_ring = cpr->cp_ring_struct; rc =bnxt_hwrm_ring_alloc (bp, cp_ring, -HWRM_RING_ALLOC_INPUT_RING_TYPE_CMPL , -0 ,HWRM_NA_SIGNATURE ); +HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL , +0 ,HWRM_NA_SIGNATURE );if (rc) goto err_out; cpr->cp_doorbell = pci_dev->mem_resource[2 ].addr;
@@ -238,7 +238,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)/* Rx cmpl */ rc =bnxt_hwrm_ring_alloc (bp, cp_ring, -HWRM_RING_ALLOC_INPUT_RING_TYPE_CMPL , +HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL , idx,HWRM_NA_SIGNATURE );if (rc) goto err_out;
@@ -276,7 +276,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)/* Tx cmpl */ rc =bnxt_hwrm_ring_alloc (bp, cp_ring, -HWRM_RING_ALLOC_INPUT_RING_TYPE_CMPL , +HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL , idx,HWRM_NA_SIGNATURE );if (rc) goto err_out;
drivers/net/bnxt/hsi_struct_def_dpdk.h +6232 -2478
2,934 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.10.1 (Apple Git-78)
Part of the diff is not shown here. View the raw message.
PATCH v3 2/26 net/bnxt: code reorg to properly allocate resources for PF/VF
In reply to Ajit Khaparde1) Move the function reset to bnxt_dev_init.
On the same lines, setup, enable and request interrupt to init path. Memory allocation is also being done in the init path.
2) After a function reset, configure the VFs. Distribute resources evenly between all functions (PF and VF) for now. In the future, this should be controllable.
3) The bnxt_vf_info and bnxt_pf_info had lot of duplication. Move the common items to struct bnxt. And only unique items specific to PF remain in the struct bnxt_pf_info.
4) Program the firmware to allow certain commands sent by a VF. Disallowing these will prevent clean VF driver cleanup.
5) Since PF/VF need to allocate resources from a pool in the hardware, use func_qcaps and func_qcfg to appropriately query the capabilities and available resources.
6) If a PF is being initialized and no VFs are allocated, explicitly call func_cfg to allocate the resources.
7) Once resources are requested from the firmware, update local copy of resource count in struct bnxt only after sending the func_qcfg to make sure the allocation request in the firmware went through.
The changes in this patch will be used by the subsequent patches to allow proper initialization of PF/VF instance.
--v1->v2: Regroup related patches per review comment
Also split bigger patch into smaller patches if possible.
v2->v3:
- rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
--- drivers/net/bnxt/bnxt.h | 80 ++++-- drivers/net/bnxt/bnxt_ethdev.c | 155 ++++++++--- drivers/net/bnxt/bnxt_filter.c | 30 +- drivers/net/bnxt/bnxt_hwrm.c | 614 +++++++++++++++++++++++++++++++++++++---- drivers/net/bnxt/bnxt_hwrm.h | 17 +- drivers/net/bnxt/bnxt_vnic.c | 45 +-- drivers/net/bnxt/bnxt_vnic.h | 11 +- 7 files changed, 764 insertions(+), 188 deletions(-)
drivers/net/bnxt/bnxt.h +59 -21
@@ -35,6 +35,7 @@#define _BNXT_H_#include <inttypes.h> +#include <stdbool.h> #include <sys/queue.h> #include <rte_ethdev.h>
@@ -54,17 +55,19 @@ enum bnxt_hw_context { HW_CONTEXT_IS_LB = 3, }; -struct bnxt_vf_info { -uint16_t fw_fid; -uint8_t mac_addr[ETHER_ADDR_LEN ]; -uint16_t max_rsscos_ctx; -uint16_t max_cp_rings; -uint16_t max_tx_rings; -uint16_t max_rx_rings; -uint16_t max_l2_ctx; -uint16_t max_vnics; -uint16_t vlan; -struct bnxt_pf_info *pf; +struct bnxt_vlan_table_entry { +uint16_t tpid; +uint16_t vid; +} __attribute__((packed)); + +struct bnxt_child_vf_info { +void *req_buf; +struct bnxt_vlan_table_entry *vlan_table; + STAILQ_HEAD(, bnxt_filter_info) filter; +uint32_t func_cfg_flags; +uint32_t l2_rx_mask; +uint16_t fid; +bool random_mac; };struct bnxt_pf_info {
@@ -73,22 +76,20 @@ struct bnxt_pf_info {#define BNXT_FIRST_VF_FID 128#define BNXT_PF_RINGS_USED (bp) bnxt_get_num_queues(bp)#define BNXT_PF_RINGS_AVAIL (bp) (bp->pf.max_cp_rings - BNXT_PF_RINGS_USED(bp)) -uint32_t fw_fid;uint8_t port_id; -uint8_t mac_addr[ETHER_ADDR_LEN ]; -uint16_t max_rsscos_ctx; -uint16_t max_cp_rings; -uint16_t max_tx_rings; -uint16_t max_rx_rings; -uint16_t max_l2_ctx; -uint16_t max_vnics;uint16_t first_vf_id;uint16_t active_vfs;uint16_t max_vfs; +uint32_t func_cfg_flags;void *vf_req_buf;phys_addr_t vf_req_buf_dma_addr;uint32_t vf_req_fwd[8 ]; -struct bnxt_vf_info *vf; +uint16_t total_vnics; +struct bnxt_child_vf_info *vf_info; +#define BNXT_EVB_MODE_NONE 0 +#define BNXT_EVB_MODE_VEB 1 +#define BNXT_EVB_MODE_VEPA 2 +uint8_t evb_mode; };/* Max wait time is 10 * 100ms = 1s */
@@ -174,12 +175,49 @@ struct bnxt {struct bnxt_link_info link_info;struct bnxt_cos_queue_info cos_queue[BNXT_COS_QUEUE_COUNT ]; +uint16_t fw_fid; +uint8_t dflt_mac_addr[ETHER_ADDR_LEN ]; +uint16_t max_rsscos_ctx; +uint16_t max_cp_rings; +uint16_t max_tx_rings; +uint16_t max_rx_rings; +uint16_t max_l2_ctx; +uint16_t max_vnics; +uint16_t max_stat_ctx; +uint16_t vlan;struct bnxt_pf_info pf; -struct bnxt_vf_info vf;uint8_t port_partition_type;uint8_t dev_stopped; + uint32_t fw_ver; +}; + +/* +* Response sent back to the caller after callback +*/ +enum rte_pmd_bnxt_mb_event_rsp { +RTE_PMD_BNXT_MB_EVENT_NOOP_ACK ,/**< skip mbox request and ACK */ +RTE_PMD_BNXT_MB_EVENT_NOOP_NACK ,/**< skip mbox request and NACK */ +RTE_PMD_BNXT_MB_EVENT_PROCEED ,/**< proceed with mbox request */ +RTE_PMD_BNXT_MB_EVENT_MAX /**< max value of this enum */ +}; + +/* mailbox message types */ +#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 */ + +/* +* Data sent to the caller when the callback is executed. +*/ +struct rte_pmd_bnxt_mb_event_param { +uint16_t vf_id;/* Virtual Function number */ +int retval;/* return value */ +void *msg;/* pointer to message */ };int bnxt_link_update_op (struct rte_eth_dev *eth_dev,int wait_to_complete); +int bnxt_rcv_msg_from_vf (struct bnxt *bp,uint16_t vf_id,void *msg);#endif
drivers/net/bnxt/bnxt_ethdev.c +111 -44
242 lines not on this page · raw message
drivers/net/bnxt/bnxt_filter.c +3 -27
@@ -73,15 +73,7 @@ void bnxt_init_filters(struct bnxt *bp)struct bnxt_filter_info *filter;int i, max_filters; -if (BNXT_PF (bp)) { -struct bnxt_pf_info *pf = &bp->pf; - - max_filters = pf->max_l2_ctx; - }else { -struct bnxt_vf_info *vf = &bp->vf; - - max_filters = vf->max_l2_ctx; - } + max_filters = bp->max_l2_ctx;STAILQ_INIT (&bp->free_filter_list);for (i =0 ; i < max_filters; i++) { filter = &bp->filter_info[i];
@@ -122,15 +114,7 @@ void bnxt_free_filter_mem(struct bnxt *bp)return ;/* Ensure that all filters are freed */ -if (BNXT_PF (bp)) { -struct bnxt_pf_info *pf = &bp->pf; - - max_filters = pf->max_l2_ctx; - }else { -struct bnxt_vf_info *vf = &bp->vf; - - max_filters = vf->max_l2_ctx; - } + max_filters = bp->max_l2_ctx;for (i =0 ; i < max_filters; i++) { filter = &bp->filter_info[i];if (filter->fw_l2_filter_id != ((uint64_t )-1 )) {
@@ -155,15 +139,7 @@ int bnxt_alloc_filter_mem(struct bnxt *bp)struct bnxt_filter_info *filter_mem;uint16_t max_filters; -if (BNXT_PF (bp)) { -struct bnxt_pf_info *pf = &bp->pf; - - max_filters = pf->max_l2_ctx; - }else { -struct bnxt_vf_info *vf = &bp->vf; - - max_filters = vf->max_l2_ctx; - } + max_filters = bp->max_l2_ctx;/* Allocate memory for VNIC pool and filter pool */ filter_mem = rte_zmalloc("bnxt_filter_info", max_filters * sizeof(struct bnxt_filter_info),
drivers/net/bnxt/bnxt_hwrm.c +561 -53
738 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +14 -3
@@ -51,14 +51,17 @@ int bnxt_hwrm_clear_filter(struct bnxt *bp,int bnxt_hwrm_set_filter (struct bnxt *bp,struct bnxt_vnic_info *vnic,struct bnxt_filter_info *filter); -int bnxt_hwrm_exec_fwd_resp (struct bnxt *bp,void *fwd_cmd); +int bnxt_hwrm_reject_fwd_resp (struct bnxt *bp,uint16_t target_id, +void *encaped,size_t ec_size); -int bnxt_hwrm_func_driver_register (struct bnxt *bp,uint32_t flags, -uint32_t *vf_req_fwd); +int bnxt_hwrm_func_buf_rgtr (struct bnxt *bp); +int bnxt_hwrm_func_buf_unrgtr (struct bnxt *bp); +int bnxt_hwrm_func_driver_register (struct bnxt *bp);int bnxt_hwrm_func_qcaps (struct bnxt *bp);int bnxt_hwrm_func_reset (struct bnxt *bp);int bnxt_hwrm_func_driver_unregister (struct bnxt *bp,uint32_t flags); +int bnxt_hwrm_func_cfg_def_cp (struct bnxt *bp);int bnxt_hwrm_queue_qportcfg (struct bnxt *bp);
@@ -81,6 +84,8 @@ int bnxt_hwrm_ver_get(struct bnxt *bp);int bnxt_hwrm_vnic_alloc (struct bnxt *bp,struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_cfg (struct bnxt *bp,struct bnxt_vnic_info *vnic); +int bnxt_hwrm_vnic_qcfg (struct bnxt *bp,struct bnxt_vnic_info *vnic, +int16_t fw_vf_id);int bnxt_hwrm_vnic_ctx_alloc (struct bnxt *bp,struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_ctx_free (struct bnxt *bp,struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_free (struct bnxt *bp,struct bnxt_vnic_info *vnic);
@@ -101,5 +106,11 @@ int bnxt_alloc_hwrm_resources(struct bnxt *bp);int bnxt_get_hwrm_link_config (struct bnxt *bp,struct rte_eth_link *link);int bnxt_set_hwrm_link_config (struct bnxt *bp,bool link_up);int bnxt_hwrm_func_qcfg (struct bnxt *bp); +int bnxt_hwrm_allocate_pf_only (struct bnxt *bp); +int bnxt_hwrm_allocate_vfs (struct bnxt *bp,int num_vfs); +int bnxt_hwrm_func_vf_mac (struct bnxt *bp,uint16_t vf, +const uint8_t *mac_addr); +int bnxt_hwrm_func_qcfg_vf_default_mac (struct bnxt *bp,uint16_t vf, +struct ether_addr *mac);#endif
drivers/net/bnxt/bnxt_vnic.c +7 -38
73 lines not on this page · raw message
drivers/net/bnxt/bnxt_vnic.h +9 -2
@@ -42,8 +42,7 @@ struct bnxt_vnic_info {uint8_t ff_pool_idx;uint16_t fw_vnic_id;/* returned by Chimp during alloc */ -uint16_t fw_rss_cos_lb_ctx; -uint16_t ctx_is_rss_cos_lb; +uint16_t rss_rule;#define MAX_NUM_TRAFFIC_CLASSES 8#define MAX_NUM_RSS_QUEUES_PER_VNIC 16#define MAX_QUEUES_PER_VNIC (MAX_NUM_RSS_QUEUES_PER_VNIC + \
@@ -51,6 +50,8 @@ struct bnxt_vnic_info {uint16_t start_grp_id;uint16_t end_grp_id;uint16_t fw_grp_ids[MAX_QUEUES_PER_VNIC ]; +uint16_t dflt_ring_grp; +uint16_t mru;uint16_t hash_type;phys_addr_t rss_table_dma_addr;uint16_t *rss_table;
@@ -60,8 +61,14 @@ struct bnxt_vnic_info {#define BNXT_VNIC_INFO_PROMISC (1 << 0)#define BNXT_VNIC_INFO_ALLMULTI (1 << 1) +uint16_t cos_rule; +uint16_t lb_rule;bool vlan_strip;bool func_default; +bool bd_stall; +bool roce_dual; +bool roce_only; +bool rss_dflt_cr; STAILQ_HEAD(, bnxt_filter_info) filter; };
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 3/26 net/bnxt: handle VF/PF initialization appropriately
In reply to Ajit Khaparde1) For a VF, query the firmware to determine if a MAC address is already configured. If not configure a random default MAC address.
2) Do not initialize the default completion ring in bnxt_alloc_hwrm_rings().
3) While registering for async events with the firmware,
use func_vf_cfg for a VF and use func_cfg for a PF.
4) Query the VNIC plcmode config using the bnxt_hwrm_vnic_plcmodes_qcfg before a VNIC is updated. Reconfigure the VNIC with the plcmode configuration queried earlier. Not doing this could overwrite the plcmodes in some cases.
5) Reorg the bnxt_handle_fwd_req to properly handle the forwarded requests. The previous code did not handle it completely.
--v1->v2: regroup related patches and incorporate other
review comments.
v2->v3:
- rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
--- doc/guides/nics/features/bnxt.ini | 2 + drivers/net/bnxt/bnxt_cpr.c | 131 ++++++++++++++++++++++--------- drivers/net/bnxt/bnxt_cpr.h | 17 ++++ drivers/net/bnxt/bnxt_ethdev.c | 30 +++++--- drivers/net/bnxt/bnxt_filter.c | 2 +- drivers/net/bnxt/bnxt_hwrm.c | 158 +++++++++++++++++++++++++++++++++----- drivers/net/bnxt/bnxt_hwrm.h | 4 +- drivers/net/bnxt/bnxt_irq.c | 21 +++-- drivers/net/bnxt/bnxt_ring.c | 17 +--- 9 files changed, 294 insertions(+), 88 deletions(-)
doc/guides/nics/features/bnxt.ini +2 -0
@@ -12,5 +12,7 @@ Multicast MAC filter = Y RSS reta update = Y Basic stats = Y Extended stats = Y +SR-IOV = Y +Linux VFIO = Y Linux UIO = Y x86-64 = Y
drivers/net/bnxt/bnxt_cpr.c +95 -36
151 lines not on this page · raw message
drivers/net/bnxt/bnxt_cpr.h +17 -0
@@ -33,6 +33,7 @@#ifndef _BNXT_CPR_H_#define _BNXT_CPR_H_ +#include <stdbool.h> #include <rte_io.h>
@@ -56,6 +57,19 @@ RING_CMP(((cpr)->cp_ring_struct), raw_cons)), \ ((cpr)->cp_doorbell)) +#define B_CP_DB_ARM (cpr) rte_write32((DB_KEY_CP), ((cpr)->cp_doorbell)) +#define B_CP_DB_DISARM (cpr) (*(uint32_t *)((cpr)->cp_doorbell) = \ + DB_KEY_CP | DB_IRQ_DIS) + +#define B_CP_DB_IDX_ARM (cpr, cons) \ + (*(uint32_t *)((cpr)->cp_doorbell) = (DB_CP_REARM_FLAGS | \ + (cons))) + +#define B_CP_DB_IDX_DISARM (cpr, cons) do { \ + rte_smp_wmb(); \ + (*(uint32_t *)((cpr)->cp_doorbell) = (DB_CP_FLAGS | \ + (cons)); \ +} while (0)#define B_CP_DIS_DB (cpr, raw_cons) \ rte_write32((DB_CP_FLAGS | \ RING_CMP(((cpr)->cp_ring_struct), raw_cons)), \
@@ -75,6 +89,8 @@ struct bnxt_cp_ring_info {uint32_t hw_stats_ctx_id;struct bnxt_ring *cp_ring_struct; +uint16_t cp_cons; +bool v; };#define RX_CMP_L2_ERRORS \
@@ -82,6 +98,7 @@ struct bnxt_cp_ring_info {struct bnxt ; +int bnxt_alloc_def_cp_ring (struct bnxt *bp);void bnxt_free_def_cp_ring (struct bnxt *bp);int bnxt_init_def_ring_struct (struct bnxt *bp,unsigned int socket_id);void bnxt_handle_async_event (struct bnxt *bp,struct cmpl_base *cmp);
drivers/net/bnxt/bnxt_ethdev.c +19 -11
@@ -228,28 +228,31 @@ static int bnxt_init_chip(struct bnxt *bp) rc =bnxt_hwrm_vnic_alloc (bp, vnic);if (rc) { -RTE_LOG (ERR ,PMD ,"HWRM vnic alloc failure rc: %x\n" , - rc); +RTE_LOG (ERR ,PMD ,"HWRM vnic %d alloc failure rc: %x\n" , + i, rc); goto err_out; } rc =bnxt_hwrm_vnic_ctx_alloc (bp, vnic);if (rc) {RTE_LOG (ERR ,PMD , -"HWRM vnic ctx alloc failure rc: %x\n" , rc); +"HWRM vnic %d ctx alloc failure rc: %x\n" , + i, rc); goto err_out; } rc =bnxt_hwrm_vnic_cfg (bp, vnic);if (rc) { -RTE_LOG (ERR ,PMD ,"HWRM vnic cfg failure rc: %x\n" , rc); +RTE_LOG (ERR ,PMD ,"HWRM vnic %d cfg failure rc: %x\n" , + i, rc); goto err_out; } rc =bnxt_set_hwrm_vnic_filters (bp, vnic);if (rc) { -RTE_LOG (ERR ,PMD ,"HWRM vnic filter failure rc: %x\n" , - rc); +RTE_LOG (ERR ,PMD , +"HWRM vnic %d filter failure rc: %x\n" , + i, rc); goto err_out; }if (vnic->rss_table && vnic->hash_type) {
@@ -269,8 +272,8 @@ static int bnxt_init_chip(struct bnxt *bp) rc =bnxt_hwrm_vnic_rss_cfg (bp, vnic);if (rc) {RTE_LOG (ERR ,PMD , -"HWRM vnic set RSS failure rc: %x\n" , - rc); +"HWRM vnic %d set RSS failure rc: %x\n" , + i, rc); goto err_out; } }
@@ -638,7 +641,7 @@ int bnxt_link_update_op(struct rte_eth_dev *eth_dev, int wait_to_complete) new.link_speed =ETH_LINK_SPEED_100M ; new.link_duplex =ETH_LINK_FULL_DUPLEX ;RTE_LOG (ERR ,PMD , -"Failed to retrieve link rc = 0x%x!" , rc); +"Failed to retrieve link rc = 0x%x!\n" , rc); goto out; }rte_delay_ms (BNXT_LINK_WAIT_INTERVAL );
@@ -1010,7 +1013,8 @@ static bool bnxt_vf_pciid(uint16_t id)if (id ==BROADCOM_DEV_ID_57304_VF || id ==BROADCOM_DEV_ID_57406_VF || id ==BROADCOM_DEV_ID_5731X_VF || - id ==BROADCOM_DEV_ID_5741X_VF ) + id ==BROADCOM_DEV_ID_5741X_VF || + id ==BROADCOM_DEV_ID_57414_VF )return true;return false; }
@@ -1066,7 +1070,7 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)int rc;if (version_printed++ ==0 ) -RTE_LOG (INFO ,PMD ,"%s" , bnxt_version); +RTE_LOG (INFO ,PMD ,"%s\n" , bnxt_version);rte_eth_copy_pci_info (eth_dev, pci_dev); eth_dev->data->dev_flags |=RTE_ETH_DEV_DETACHABLE ;
@@ -1207,6 +1211,10 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)if (rc) goto error_free_int; + rc =bnxt_alloc_def_cp_ring (bp); +if (rc) + goto error_free_int; +bnxt_enable_int (bp);return 0 ;
drivers/net/bnxt/bnxt_filter.c +1 -1
@@ -126,7 +126,7 @@ void bnxt_free_filter_mem(struct bnxt *bp)"HWRM filter cannot be freed rc = %d\n" , rc); } - filter->fw_l2_filter_id =-1 ; + filter->fw_l2_filter_id =UINT64_MAX ; }STAILQ_INIT (&bp->free_filter_list);
drivers/net/bnxt/bnxt_hwrm.c +140 -18
209 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +3 -1
@@ -51,7 +51,8 @@ int bnxt_hwrm_clear_filter(struct bnxt *bp,int bnxt_hwrm_set_filter (struct bnxt *bp,struct bnxt_vnic_info *vnic,struct bnxt_filter_info *filter); -int bnxt_hwrm_exec_fwd_resp (struct bnxt *bp,void *fwd_cmd); +int bnxt_hwrm_exec_fwd_resp (struct bnxt *bp,uint16_t target_id, +void *encaped,size_t ec_size);int bnxt_hwrm_reject_fwd_resp (struct bnxt *bp,uint16_t target_id,void *encaped,size_t ec_size);
@@ -62,6 +63,7 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp);int bnxt_hwrm_func_reset (struct bnxt *bp);int bnxt_hwrm_func_driver_unregister (struct bnxt *bp,uint32_t flags);int bnxt_hwrm_func_cfg_def_cp (struct bnxt *bp); +int bnxt_hwrm_vf_func_cfg_def_cp (struct bnxt *bp);int bnxt_hwrm_queue_qportcfg (struct bnxt *bp);
drivers/net/bnxt/bnxt_irq.c +16 -5
@@ -66,16 +66,26 @@ static void bnxt_int_handler(void *param)/* Handle any async event */ bnxt_handle_async_event (bp, cmp);break ; -case CMPL_BASE_TYPE_HWRM_FWD_RESP : +case CMPL_BASE_TYPE_HWRM_FWD_REQ :/* Handle HWRM forwarded responses */ bnxt_handle_fwd_req (bp, cmp);break ;default :/* Ignore any other events */ +if (cmp->type &rte_cpu_to_le_16 (0x01 )) { +if (!CMP_VALID (cmp, raw_cons, + cpr->cp_ring_struct)) + goto no_more; + } +RTE_LOG (INFO ,PMD , +"Ignoring %02x completion\n" ,CMP_TYPE (cmp));break ; } raw_cons =NEXT_RAW_CMP (raw_cons); - } + + }; +no_more: + cpr->cp_raw_cons = raw_cons;B_CP_DB_REARM (cpr, cpr->cp_raw_cons); }
@@ -102,14 +112,15 @@ void bnxt_disable_int(struct bnxt *bp)struct bnxt_cp_ring_info *cpr = bp->def_cp_ring;/* Only the default completion ring */ -B_CP_DIS_DB (cpr, cpr->cp_raw_cons); +if (cpr !=NULL && cpr->cp_doorbell !=NULL ) +B_CP_DB_DISARM (cpr); }void bnxt_enable_int (struct bnxt *bp) {struct bnxt_cp_ring_info *cpr = bp->def_cp_ring; -B_CP_DB_REARM (cpr, cpr->cp_raw_cons); +B_CP_DB_ARM (cpr); }int bnxt_setup_int (struct bnxt *bp)
@@ -136,7 +147,7 @@ int bnxt_setup_int(struct bnxt *bp)return 0 ; setup_exit: -RTE_LOG (ERR ,PMD ,"bnxt_irq_tbl setup failed" ); +RTE_LOG (ERR ,PMD ,"bnxt_irq_tbl setup failed\n" );return rc; }
drivers/net/bnxt/bnxt_ring.c +1 -16
@@ -213,21 +213,6 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)unsigned int i;int rc =0 ; -/* Default completion ring */ - { -struct bnxt_cp_ring_info *cpr = bp->def_cp_ring; -struct bnxt_ring *cp_ring = cpr->cp_ring_struct; - - rc =bnxt_hwrm_ring_alloc (bp, cp_ring, -HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL , -0 ,HWRM_NA_SIGNATURE ); -if (rc) - goto err_out; - cpr->cp_doorbell = pci_dev->mem_resource[2 ].addr; -B_CP_DIS_DB (cpr, cpr->cp_raw_cons); - bp->grp_info[0 ].cp_fw_ring_id = cp_ring->fw_ring_id; - } -for (i =0 ; i < bp->rx_cp_nr_rings; i++) {struct bnxt_rx_queue *rxq = bp->rx_queues[i];struct bnxt_cp_ring_info *cpr = rxq->cp_ring;
@@ -259,7 +244,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp) bp->grp_info[idx].rx_fw_ring_id = ring->fw_ring_id;B_RX_DB (rxr->rx_doorbell, rxr->rx_prod);if (bnxt_init_one_rx_ring (rxq)) { -RTE_LOG (ERR ,PMD ,"bnxt_init_one_rx_ring failed!" ); +RTE_LOG (ERR ,PMD ,"bnxt_init_one_rx_ring failed!\n" );bnxt_rx_queue_release_op (rxq);return -ENOMEM ; }
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 4/26 net/bnxt: support lack of huge pages
In reply to Ajit Khaparderte_malloc_virt2phy() does not return a physical address if huge pages aren't in use. Further, rte_memzone->phys_addr is not a physical address.
Use rte_mem_virt2phy() and manually lock pages to support lack of huge pages.
Also check the return value of rte_mem_virt2phy()
Verify the function returns an address. Otherwise return an error and log a message.
--v1->v2: regroup related patches and incorporate other review comments
v2->v3:
- rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
--- drivers/net/bnxt/bnxt_hwrm.c | 17 +++++++++++++++-- drivers/net/bnxt/bnxt_ring.c | 31 +++++++++++++++++++++++++------ drivers/net/bnxt/bnxt_vnic.c | 16 +++++++++++++++- 3 files changed, 55 insertions(+), 9 deletions(-)
drivers/net/bnxt/bnxt_hwrm.c +15 -2
@@ -489,8 +489,15 @@ int bnxt_hwrm_ver_get(struct bnxt *bp) rc = -ENOMEM ; goto error; } +rte_mem_lock_page (bp->hwrm_cmd_resp_addr); bp->hwrm_cmd_resp_dma_addr = -rte_malloc_virt2phy (bp->hwrm_cmd_resp_addr); +rte_mem_virt2phy (bp->hwrm_cmd_resp_addr); +if (bp->hwrm_cmd_resp_dma_addr ==0 ) { +RTE_LOG (ERR ,PMD , +"Unable to map response buffer to physical memory.\n" ); + rc = -ENOMEM ; + goto error; + } bp->max_resp_len = max_resp_len; }
@@ -1363,10 +1370,16 @@ int bnxt_alloc_hwrm_resources(struct bnxt *bp) bp->max_req_len =HWRM_MAX_REQ_LEN ; bp->max_resp_len =HWRM_MAX_RESP_LEN ; bp->hwrm_cmd_resp_addr =rte_malloc (type, bp->max_resp_len,0 ); +rte_mem_lock_page (bp->hwrm_cmd_resp_addr);if (bp->hwrm_cmd_resp_addr ==NULL )return -ENOMEM ; bp->hwrm_cmd_resp_dma_addr = -rte_malloc_virt2phy (bp->hwrm_cmd_resp_addr); +rte_mem_virt2phy (bp->hwrm_cmd_resp_addr); +if (bp->hwrm_cmd_resp_dma_addr ==0 ) { +RTE_LOG (ERR ,PMD , +"unable to map response address to physical memory\n" ); +return -ENOMEM ; + }rte_spinlock_init (&bp->hwrm_lock);return 0 ;
drivers/net/bnxt/bnxt_ring.c +25 -6
@@ -32,6 +32,7 @@*/ #include <rte_memzone.h> +#include <unistd.h> #include "bnxt.h" #include "bnxt_cpr.h"
@@ -96,6 +97,8 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,struct rte_pci_device *pdev = bp->pdev;const struct rte_memzone *mz =NULL ;char mz_name[RTE_MEMZONE_NAMESIZE ]; +phys_addr_t mz_phys_addr; +int sz;int stats_len = (tx_ring_info || rx_ring_info) ?RTE_CACHE_LINE_ROUNDUP (sizeof (struct ctx_hw_stats64 )) :0 ;
@@ -136,21 +139,37 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx, mz_name[RTE_MEMZONE_NAMESIZE -1 ] =0 ; mz =rte_memzone_lookup (mz_name);if (!mz) { - mz =rte_memzone_reserve (mz_name, total_alloc_len, + mz =rte_memzone_reserve_aligned (mz_name, total_alloc_len,SOCKET_ID_ANY ,RTE_MEMZONE_2MB | -RTE_MEMZONE_SIZE_HINT_ONLY ); +RTE_MEMZONE_SIZE_HINT_ONLY , +getpagesize ());if (mz ==NULL )return -ENOMEM ; }memset (mz->addr,0 , mz->len); + mz_phys_addr = mz->phys_addr; +if ((unsigned long )mz->addr == mz_phys_addr) { +RTE_LOG (WARNING ,PMD , +"Memzone physical address same as virtual.\n" ); +RTE_LOG (WARNING ,PMD , +"Using rte_mem_virt2phy()\n" ); +for (sz =0 ; sz < total_alloc_len; sz +=getpagesize ()) +rte_mem_lock_page (((char *)mz->addr) + sz); + mz_phys_addr =rte_mem_virt2phy (mz->addr); +if (mz_phys_addr ==0 ) { +RTE_LOG (ERR ,PMD , +"unable to map ring address to physical memory\n" ); +return -ENOMEM ; + } + }if (tx_ring_info) { tx_ring = tx_ring_info->tx_ring_struct; tx_ring->bd = ((char *)mz->addr + tx_ring_start); tx_ring_info->tx_desc_ring = (struct tx_bd_long *)tx_ring->bd; - tx_ring->bd_dma = mz->phys_addr + tx_ring_start; + tx_ring->bd_dma = mz_phys_addr + tx_ring_start; tx_ring_info->tx_desc_mapping = tx_ring->bd_dma; tx_ring->mem_zone = (const void *)mz;
@@ -170,7 +189,7 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx, rx_ring->bd = ((char *)mz->addr + rx_ring_start); rx_ring_info->rx_desc_ring = (struct rx_prod_pkt_bd *)rx_ring->bd; - rx_ring->bd_dma = mz->phys_addr + rx_ring_start; + rx_ring->bd_dma = mz_phys_addr + rx_ring_start; rx_ring_info->rx_desc_mapping = rx_ring->bd_dma; rx_ring->mem_zone = (const void *)mz;
@@ -185,7 +204,7 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx, } cp_ring->bd = ((char *)mz->addr + cp_ring_start); - cp_ring->bd_dma = mz->phys_addr + cp_ring_start; + cp_ring->bd_dma = mz_phys_addr + cp_ring_start; cp_ring_info->cp_desc_ring = cp_ring->bd; cp_ring_info->cp_desc_mapping = cp_ring->bd_dma; cp_ring->mem_zone = (const void *)mz;
@@ -196,7 +215,7 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx, *cp_ring->vmem = ((char *)mz->addr + stats_len);if (stats_len) { cp_ring_info->hw_stats = mz->addr; - cp_ring_info->hw_stats_map = mz->phys_addr; + cp_ring_info->hw_stats_map = mz_phys_addr; } cp_ring_info->hw_stats_ctx_id =HWRM_NA_SIGNATURE ;return 0 ;
drivers/net/bnxt/bnxt_vnic.c +15 -1
@@ -173,6 +173,7 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp) HW_HASH_KEY_SIZE);uint16_t max_vnics;int i; +phys_addr_t mz_phys_addr; max_vnics = bp->max_vnics; snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
@@ -189,6 +190,19 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)if (!mz)return -ENOMEM ; } + mz_phys_addr = mz->phys_addr; +if ((unsigned long )mz->addr == mz_phys_addr) { +RTE_LOG (WARNING ,PMD , +"Memzone physical address same as virtual.\n" ); +RTE_LOG (WARNING ,PMD , +"Using rte_mem_virt2phy()\n" ); + mz_phys_addr =rte_mem_virt2phy (mz->addr); +if (mz_phys_addr ==0 ) { +RTE_LOG (ERR ,PMD , +"unable to map vnic address to physical memory\n" ); +return -ENOMEM ; + } + }for (i =0 ; i < max_vnics; i++) { vnic = &bp->vnic_info[i];
@@ -198,7 +212,7 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp) (void *)((char *)mz->addr + (entry_length * i));memset (vnic->rss_table,-1 , entry_length); - vnic->rss_table_dma_addr = mz->phys_addr + (entry_length * i); + vnic->rss_table_dma_addr = mz_phys_addr + (entry_length * i); vnic->rss_hash_key = (void *)((char *)vnic->rss_table +HW_HASH_INDEX_SIZE *sizeof (*vnic->rss_table));
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 5/26 net/bnxt: add additonal HWRM debug info to error messages
In reply to Ajit KhapardeAdd the cmd_err and opaque_0 and opaque_1 fields to HWRM error messages. These allow better debugging of some classes of HWRM errors.
--v1->v2: regroup related patches and incorporate other review comments
v2->v3:
- rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
--- drivers/net/bnxt/bnxt_hwrm.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
drivers/net/bnxt/bnxt_hwrm.c +17 -2
@@ -139,7 +139,7 @@ static int bnxt_hwrm_send_message_locked(struct bnxt *bp, void *msg, }if (i >=HWRM_CMD_TIMEOUT ) { -RTE_LOG (ERR ,PMD ,"Error sending msg %x\n" , +RTE_LOG (ERR ,PMD ,"Error sending msg 0x%04x\n" , req->req_type); goto err_ret; }
@@ -176,7 +176,22 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg, uint32_t msg_len) } \if (resp->error_code) { \ rc =rte_le_to_cpu_16 (resp->error_code); \ -RTE_LOG (ERR ,PMD ,"%s error %d\n" , __func__, rc); \ +if (resp->resp_len >=16 ) { \ +struct hwrm_err_output *tmp_hwrm_err_op = \ + (void *)resp; \ +RTE_LOG (ERR ,PMD , \ +"%s error %d:%d:%08x:%04x\n" , \ + __func__, \ + rc, tmp_hwrm_err_op->cmd_err, \ +rte_le_to_cpu_32 (\ + tmp_hwrm_err_op->opaque_0), \ +rte_le_to_cpu_16 (\ + tmp_hwrm_err_op->opaque_1)); \ + } \ +else { \ +RTE_LOG (ERR ,PMD , \ +"%s error %d\n" , __func__, rc); \ + } \return rc; \ } \ }
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 6/26 net/bnxt: add tunneling support
In reply to Ajit KhapardeAdd support for udp_tunnel_port_add/del dev_ops to configure a UDP port for VXLAN and Geneve Tunnel protocols.
The HWRM supports only one global destination port for a tunnel type, use a referene counter to keep track of its usage.
Cache the configured VXLAN/Geneve ports and use that value to check if the right UDP port is being freed up.
Skip calling bnxt_hwrm_tunnel_dst_port_alloc if the same UDP port is being programmed.
Skip calling bnxt_hwrm_tunnel_dst_port_free if no UDP port has been configured.
Also update tx offload capabilities
--v1->v2: regroup related patches and incorporate other review comments
v2->v3:
- rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
--- drivers/net/bnxt/bnxt.h | 6 +++ drivers/net/bnxt/bnxt_ethdev.c | 119 ++++++++++++++++++++++++++++++++++++++++- drivers/net/bnxt/bnxt_hwrm.c | 56 +++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 5 ++ drivers/net/bnxt/bnxt_txr.c | 3 +- 5 files changed, 187 insertions(+), 2 deletions(-)
drivers/net/bnxt/bnxt.h +6 -0
@@ -188,6 +188,12 @@ struct bnxt {struct bnxt_pf_info pf;uint8_t port_partition_type;uint8_t dev_stopped; +uint8_t vxlan_port_cnt; +uint8_t geneve_port_cnt; +uint16_t vxlan_port; +uint16_t geneve_port; +uint16_t vxlan_fw_dst_port_id; +uint16_t geneve_fw_dst_port_id;uint32_t fw_ver; };
drivers/net/bnxt/bnxt_ethdev.c +118 -1
137 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.c +56 -0
74 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +5 -0
@@ -114,5 +114,10 @@ int bnxt_hwrm_func_vf_mac(struct bnxt *bp, uint16_t vf, const uint8_t *mac_addr);int bnxt_hwrm_func_qcfg_vf_default_mac (struct bnxt *bp,uint16_t vf,struct ether_addr *mac); +int bnxt_hwrm_tunnel_dst_port_alloc (struct bnxt *bp,uint16_t port, +uint8_t tunnel_type); +int bnxt_hwrm_tunnel_dst_port_free (struct bnxt *bp,uint16_t port, +uint8_t tunnel_type); +void bnxt_free_tunnel_ports (struct bnxt *bp);#endif
drivers/net/bnxt/bnxt_txr.c +2 -1
@@ -213,7 +213,8 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,/* TSO */ txbd1->lflags =TX_BD_LONG_LFLAGS_LSO ; txbd1->hdr_size = tx_pkt->l2_len + tx_pkt->l3_len + - tx_pkt->l4_len; + tx_pkt->l4_len + tx_pkt->outer_l2_len + + tx_pkt->outer_l3_len; txbd1->mss = tx_pkt->tso_segsz; } else if (tx_pkt->ol_flags & (PKT_TX_TCP_CKSUM |
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 7/26 net/bnxt: add support for xstats get/reset
In reply to Ajit KhapardeThis patch adds support to get and reset xstats dev_ops
dev_ops added:xstats_get, xstats_get_name, xstats_reset
HWRM commands added:hwrm_port_qstats, hwrm_port_clr_stats
--v1->v2: regroup related patches and incorporate other review comments
v2->v3:
- rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
--- drivers/net/bnxt/bnxt.h | 7 ++ drivers/net/bnxt/bnxt_ethdev.c | 84 +++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.c | 36 +++++++ drivers/net/bnxt/bnxt_hwrm.h | 3 +- drivers/net/bnxt/bnxt_stats.c | 207 +++++++++++++++++++++++++++++++++++++++++ drivers/net/bnxt/bnxt_stats.h | 10 ++ 6 files changed, 346 insertions(+), 1 deletion(-)
drivers/net/bnxt/bnxt.h +7 -0
@@ -130,6 +130,7 @@ struct bnxt {uint32_t flags;#define BNXT_FLAG_REGISTERED (1 << 0)#define BNXT_FLAG_VF (1 << 1) +#define BNXT_FLAG_PORT_STATS (1 << 2)#define BNXT_PF (bp) (!((bp)->flags & BNXT_FLAG_VF))#define BNXT_VF (bp) ((bp)->flags & BNXT_FLAG_VF)#define BNXT_NPAR_ENABLED (bp) ((bp)->port_partition_type)
@@ -138,10 +139,16 @@ struct bnxt {unsigned int rx_nr_rings;unsigned int rx_cp_nr_rings;struct bnxt_rx_queue **rx_queues; +const void *rx_mem_zone; +struct rx_port_stats *hw_rx_port_stats; +phys_addr_t hw_rx_port_stats_map;unsigned int tx_nr_rings;unsigned int tx_cp_nr_rings;struct bnxt_tx_queue **tx_queues; +const void *tx_mem_zone; +struct tx_port_stats *hw_tx_port_stats; +phys_addr_t hw_tx_port_stats_map;/* Default completion ring */ struct bnxt_cp_ring_info *def_cp_ring;
drivers/net/bnxt/bnxt_ethdev.c +84 -0
115 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.c +36 -0
@@ -2246,3 +2246,39 @@ int bnxt_hwrm_exec_fwd_resp(struct bnxt *bp, uint16_t target_id,return rc; } + +int bnxt_hwrm_port_qstats (struct bnxt *bp) +{ +struct hwrm_port_qstats_input req = {0 }; +struct hwrm_port_qstats_output *resp = bp->hwrm_cmd_resp_addr; +struct bnxt_pf_info *pf = &bp->pf; +int rc; + +if (!(bp->flags &BNXT_FLAG_PORT_STATS )) +return 0 ; + +HWRM_PREP (req,PORT_QSTATS ,-1 , resp); + req.port_id =rte_cpu_to_le_16 (pf->port_id); + req.tx_stat_host_addr =rte_cpu_to_le_64 (bp->hw_tx_port_stats_map); + req.rx_stat_host_addr =rte_cpu_to_le_64 (bp->hw_rx_port_stats_map); + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); +HWRM_CHECK_RESULT ; +return rc; +} + +int bnxt_hwrm_port_clr_stats (struct bnxt *bp) +{ +struct hwrm_port_clr_stats_input req = {0 }; +struct hwrm_port_clr_stats_output *resp = bp->hwrm_cmd_resp_addr; +struct bnxt_pf_info *pf = &bp->pf; +int rc; + +if (!(bp->flags &BNXT_FLAG_PORT_STATS )) +return 0 ; + +HWRM_PREP (req,PORT_CLR_STATS ,-1 , resp); + req.port_id =rte_cpu_to_le_16 (pf->port_id); + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); +HWRM_CHECK_RESULT ; +return rc; +}
drivers/net/bnxt/bnxt_hwrm.h +2 -1
@@ -119,5 +119,6 @@ int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,int bnxt_hwrm_tunnel_dst_port_free (struct bnxt *bp,uint16_t port,uint8_t tunnel_type);void bnxt_free_tunnel_ports (struct bnxt *bp); - +int bnxt_hwrm_port_qstats (struct bnxt *bp); +int bnxt_hwrm_port_clr_stats (struct bnxt *bp);#endif
drivers/net/bnxt/bnxt_stats.c +207 -0
216 lines not on this page · raw message
drivers/net/bnxt/bnxt_stats.h +10 -0
@@ -40,5 +40,15 @@ void bnxt_free_stats(struct bnxt *bp);void bnxt_stats_get_op (struct rte_eth_dev *eth_dev,struct rte_eth_stats *bnxt_stats);void bnxt_stats_reset_op (struct rte_eth_dev *eth_dev); +int bnxt_dev_xstats_get_names_op(__rte_unused struct rte_eth_dev *eth_dev, +struct rte_eth_xstat_name *xstats_names, + __rte_unused unsigned int limit); +int bnxt_dev_xstats_get_op (struct rte_eth_dev *eth_dev, +struct rte_eth_xstat *xstats,unsigned int n); +void bnxt_dev_xstats_reset_op (struct rte_eth_dev *eth_dev); +struct bnxt_xstats_name_off { +char name[RTE_ETH_XSTATS_NAME_SIZE ]; +uint64_t offset; +};#endif
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 8/26 net/bnxt: add support for VLAN filter and strip
In reply to Ajit KhapardeThis patch adds VLAN strip and offload callbacks.
To add a VLAN filter:
For each VNIC and each associated filter(s)
if VLAN exists:
if VLAN matches vlan_id
VLAN filter already exists, just skip and continue
else
add a new MAC+VLAN filter
else
Remove the old MAC only filter
Add a new MAC+VLAN filter
To remove a VLAN filter:
For each VNIC and each associated filter(s)
if VLAN exists && VLAN matches vlan_id
remove the MAC+VLAN filter
add a new MAC only filter
else
VLAN filter doesn't exist, just skip and continue
--v1->v2: regroup related patches and incorporate other review comments
v2->v3:
- rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
- Fix a "pointer from integer" warning seen during compilation
--- doc/guides/nics/features/bnxt.ini | 2 + drivers/net/bnxt/bnxt_ethdev.c | 201 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+)
doc/guides/nics/features/bnxt.ini +2 -0
@@ -9,6 +9,8 @@ Queue start/stop = Y Promiscuous mode = Y Unicast MAC filter = Y Multicast MAC filter = Y +VLAN filter = Y +VLAN offload = Y RSS reta update = Y Basic stats = Y Extended stats = Y
drivers/net/bnxt/bnxt_ethdev.c +201 -0
231 lines not on this page · raw message
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 9/26 net/bnxt: add support for set multicast addr list and MAC addr set
In reply to Ajit KhapardeThis patch adds support for set_mc_addr_list andmac_addr_set dev_ops
--v1->v2: regroup related patches and incorporate other review comments
v2->v3:
- rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
- Split the patch to document "Allmulticast mode" in bnxt.ini
--- drivers/net/bnxt/bnxt_ethdev.c | 74 ++++++++++++++++++++++++++++++++++++++++-- drivers/net/bnxt/bnxt_hwrm.c | 13 +++++--- drivers/net/bnxt/bnxt_hwrm.h | 2 +- drivers/net/bnxt/bnxt_vnic.c | 7 +++- drivers/net/bnxt/bnxt_vnic.h | 4 +++ 5 files changed, 91 insertions(+), 9 deletions(-)
drivers/net/bnxt/bnxt_ethdev.c +71 -3
@@ -638,7 +638,7 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,STAILQ_INSERT_TAIL (&vnic->filter, filter, next); filter->mac_index = index;memcpy (filter->l2_addr, mac_addr,ETHER_ADDR_LEN ); -return bnxt_hwrm_set_filter (bp, vnic, filter); +return bnxt_hwrm_set_filter (bp, vnic->fw_vnic_id, filter); }int bnxt_link_update_op (struct rte_eth_dev *eth_dev,int wait_to_complete)
@@ -1155,7 +1155,7 @@ static int bnxt_del_vlan_filter(struct bnxt *bp, uint16_t vlan_id) filter->l2_addr, ETHER_ADDR_LEN);/* MAC only filter */ rc =bnxt_hwrm_set_filter (bp, - vnic, + vnic->fw_vnic_id, new_filter);if (rc) goto exit;
@@ -1229,7 +1229,7 @@ static int bnxt_add_vlan_filter(struct bnxt *bp, uint16_t vlan_id) new_filter->l2_ovlan = vlan_id; new_filter->l2_ovlan_mask =0xF000 ; new_filter->enables |= en; - rc =bnxt_hwrm_set_filter (bp, vnic, + rc =bnxt_hwrm_set_filter (bp, vnic->fw_vnic_id, new_filter);if (rc) goto exit;
@@ -1290,6 +1290,72 @@ bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask)RTE_LOG (ERR ,PMD ,"Extend VLAN Not supported\n" ); } +static void +bnxt_set_default_mac_addr_op (struct rte_eth_dev *dev,struct ether_addr *addr) +{ +struct bnxt *bp = (struct bnxt *)dev->data->dev_private; +/* Default Filter is tied to VNIC 0 */ +struct bnxt_vnic_info *vnic = &bp->vnic_info[0 ]; +struct bnxt_filter_info *filter; +int rc; + +if (BNXT_VF (bp)) +return ; + +memcpy (bp->mac_addr, addr,sizeof (bp->mac_addr)); +memcpy (&dev->data->mac_addrs[0 ], bp->mac_addr,ETHER_ADDR_LEN ); + + STAILQ_FOREACH(filter, &vnic->filter, next) { +/* Default Filter is at Index 0 */ +if (filter->mac_index !=0 ) +continue ; + rc =bnxt_hwrm_clear_filter (bp, filter); +if (rc) +break ; +memcpy (filter->l2_addr, bp->mac_addr,ETHER_ADDR_LEN ); +memset (filter->l2_addr_mask,0xff ,ETHER_ADDR_LEN ); + filter->flags |=HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX ; + filter->enables |= +HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR | +HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR_MASK ; + rc =bnxt_hwrm_set_filter (bp, vnic->fw_vnic_id, filter); +if (rc) +break ; + filter->mac_index =0 ; +RTE_LOG (DEBUG ,PMD ,"Set MAC addr\n" ); + } +} + +static int +bnxt_dev_set_mc_addr_list_op (struct rte_eth_dev *eth_dev, +struct ether_addr *mc_addr_set, +uint32_t nb_mc_addr) +{ +struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private; +char *mc_addr_list = (char *)mc_addr_set; +struct bnxt_vnic_info *vnic; +uint32_t off =0 , i =0 ; + + vnic = &bp->vnic_info[0 ]; + +if (nb_mc_addr >BNXT_MAX_MC_ADDRS ) { + vnic->flags |=BNXT_VNIC_INFO_ALLMULTI ; + goto allmulti; + } + +/* TODO Check for Duplicate mcast addresses */ + vnic->flags &= ~BNXT_VNIC_INFO_ALLMULTI ; +for (i =0 ; i < nb_mc_addr; i++) { +memcpy (vnic->mc_list + off, &mc_addr_list[i],ETHER_ADDR_LEN ); + off +=ETHER_ADDR_LEN ; + } + + vnic->mc_addr_cnt = i; + +allmulti: +return bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic); +} +/* * Initialization */
@@ -1325,9 +1391,11 @@ static const struct eth_dev_ops bnxt_dev_ops = { .udp_tunnel_port_del = bnxt_udp_tunnel_port_del_op, .vlan_filter_set = bnxt_vlan_filter_set_op, .vlan_offload_set = bnxt_vlan_offload_set_op, + .mac_addr_set = bnxt_set_default_mac_addr_op, .xstats_get = bnxt_dev_xstats_get_op, .xstats_get_names = bnxt_dev_xstats_get_names_op, .xstats_reset = bnxt_dev_xstats_reset_op, + .set_mc_addr_list = bnxt_dev_set_mc_addr_list_op, };static bool bnxt_vf_pciid (uint16_t id)
drivers/net/bnxt/bnxt_hwrm.c +9 -4
@@ -229,7 +229,12 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, struct bnxt_vnic_info *vnic)if (vnic->flags &BNXT_VNIC_INFO_PROMISC ) mask =HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_PROMISCUOUS ;if (vnic->flags &BNXT_VNIC_INFO_ALLMULTI ) - mask =HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_ALL_MCAST ; + mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_ALL_MCAST ; +if (vnic->mc_addr_cnt) { + mask |=HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_MCAST ; + req.num_mc_entries =rte_cpu_to_le_32 (vnic->mc_addr_cnt); + req.mc_tbl_addr =rte_cpu_to_le_64 (vnic->mc_list_dma_addr); + } req.mask =rte_cpu_to_le_32 (HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_BCAST | mask);
@@ -261,7 +266,7 @@ int bnxt_hwrm_clear_filter(struct bnxt *bp, }int bnxt_hwrm_set_filter (struct bnxt *bp, -struct bnxt_vnic_info *vnic, +uint16_t dst_id,struct bnxt_filter_info *filter) {int rc =0 ;
@@ -275,7 +280,7 @@ int bnxt_hwrm_set_filter(struct bnxt *bp, enables = filter->enables |HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_DST_ID ; - req.dst_id =rte_cpu_to_le_16 (vnic->fw_vnic_id); + req.dst_id =rte_cpu_to_le_16 (dst_id);if (enables &HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR )
@@ -1419,7 +1424,7 @@ int bnxt_set_hwrm_vnic_filters(struct bnxt *bp, struct bnxt_vnic_info *vnic)int rc =0 ; STAILQ_FOREACH(filter, &vnic->filter, next) { - rc =bnxt_hwrm_set_filter (bp, vnic, filter); + rc =bnxt_hwrm_set_filter (bp, vnic->fw_vnic_id, filter);if (rc)break ; }
drivers/net/bnxt/bnxt_hwrm.h +1 -1
@@ -49,7 +49,7 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, struct bnxt_vnic_info *vnic);int bnxt_hwrm_clear_filter (struct bnxt *bp,struct bnxt_filter_info *filter);int bnxt_hwrm_set_filter (struct bnxt *bp, -struct bnxt_vnic_info *vnic, +uint16_t dst_id,struct bnxt_filter_info *filter);int bnxt_hwrm_exec_fwd_resp (struct bnxt *bp,uint16_t target_id,void *encaped,size_t ec_size);
drivers/net/bnxt/bnxt_vnic.c +6 -1
@@ -170,7 +170,8 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)char mz_name[RTE_MEMZONE_NAMESIZE ];uint32_t entry_length =RTE_CACHE_LINE_ROUNDUP (HW_HASH_INDEX_SIZE *sizeof (*vnic->rss_table) + -HW_HASH_KEY_SIZE ); +HW_HASH_KEY_SIZE + +BNXT_MAX_MC_ADDRS *ETHER_ADDR_LEN );uint16_t max_vnics;int i;phys_addr_t mz_phys_addr;
@@ -218,6 +219,10 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp) vnic->rss_hash_key_dma_addr = vnic->rss_table_dma_addr +HW_HASH_INDEX_SIZE *sizeof (*vnic->rss_table); + vnic->mc_list = (void *)((char *)vnic->rss_hash_key + +HW_HASH_KEY_SIZE ); + vnic->mc_list_dma_addr = vnic->rss_hash_key_dma_addr + +HW_HASH_KEY_SIZE ; }return 0 ;
drivers/net/bnxt/bnxt_vnic.h +4 -0
@@ -57,6 +57,10 @@ struct bnxt_vnic_info {uint16_t *rss_table;phys_addr_t rss_hash_key_dma_addr;void *rss_hash_key; +phys_addr_t mc_list_dma_addr; +char *mc_list; +uint32_t mc_addr_cnt; +#define BNXT_MAX_MC_ADDRS 16uint32_t flags;#define BNXT_VNIC_INFO_PROMISC (1 << 0)#define BNXT_VNIC_INFO_ALLMULTI (1 << 1)
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 10/26 doc: update bnxt.ini to document Allmulticast mode
In reply to Ajit KhapardeThis patch update bnxt.int to document Allmulticast mode which is already supported by the PMD.
--- doc/guides/nics/features/bnxt.ini | 1 + 1 file changed, 1 insertion(+)
doc/guides/nics/features/bnxt.ini +1 -0
@@ -11,6 +11,7 @@ Unicast MAC filter = Y Multicast MAC filter = Y VLAN filter = Y VLAN offload = Y +Allmulticast mode = Y RSS reta update = Y Basic stats = Y Extended stats = Y
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 11/26 net/bnxt: add support to get fw version
In reply to Ajit KhapardeThis patch adds support for fw_version_get dev_op
--v1->v2: regroup related patches and incorporate other review comments
v2->v3:
- rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
- Avoid using dev_ops in the patch subject line
--- doc/guides/nics/features/bnxt.ini | 1 + drivers/net/bnxt/bnxt_ethdev.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+)
doc/guides/nics/features/bnxt.ini +1 -0
@@ -16,6 +16,7 @@ RSS reta update = Y Basic stats = Y Extended stats = Y SR-IOV = Y +FW version = Y Linux VFIO = Y Linux UIO = Y x86-64 = Y
drivers/net/bnxt/bnxt_ethdev.c +20 -0
@@ -1356,6 +1356,25 @@ bnxt_dev_set_mc_addr_list_op(struct rte_eth_dev *eth_dev,return bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic); } +static int +bnxt_fw_version_get (struct rte_eth_dev *dev,char *fw_version,size_t fw_size) +{ +struct bnxt *bp = (struct bnxt *)dev->data->dev_private; +uint8_t fw_major = (bp->fw_ver >>24 ) &0xff ; +uint8_t fw_minor = (bp->fw_ver >>16 ) &0xff ; +uint8_t fw_updt = (bp->fw_ver >>8 ) &0xff ; +int ret; + + ret =snprintf (fw_version, fw_size,"%d.%d.%d" , + fw_major, fw_minor, fw_updt); + + ret +=1 ;/* add the size of '\0' */ +if (fw_size < (uint32_t )ret) +return ret; +else +return 0 ; +} +/* * Initialization */
@@ -1395,6 +1414,7 @@ static const struct eth_dev_ops bnxt_dev_ops = { .xstats_get = bnxt_dev_xstats_get_op, .xstats_get_names = bnxt_dev_xstats_get_names_op, .xstats_reset = bnxt_dev_xstats_reset_op, + .fw_version_get = bnxt_fw_version_get, .set_mc_addr_list = bnxt_dev_set_mc_addr_list_op, };
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 12/26 net/bnxt: add support to set MTU
In reply to Ajit KhapardeThis patch adds support to modify MTU using the set_mtu dev_op. To support frames > 2k, the PMD creates an aggregator ring. When a frame greater than 2k is received, it is fragmented and the resulting fragments are DMA'ed to the aggregator ring. Now the driver can support jumbo frames upto 9500 bytes.
--v1->v2: regroup related patches and incorporate other review comments
v2->v3:
- rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
--- doc/guides/nics/features/bnxt.ini | 2 + drivers/net/bnxt/bnxt.h | 4 +- drivers/net/bnxt/bnxt_cpr.c | 3 +- drivers/net/bnxt/bnxt_ethdev.c | 59 ++++++++++ drivers/net/bnxt/bnxt_hwrm.c | 121 ++++++++++++-------- drivers/net/bnxt/bnxt_hwrm.h | 4 +- drivers/net/bnxt/bnxt_ring.c | 81 ++++++++++++-- drivers/net/bnxt/bnxt_ring.h | 2 + drivers/net/bnxt/bnxt_rxq.c | 29 +++-- drivers/net/bnxt/bnxt_rxq.h | 1 + drivers/net/bnxt/bnxt_rxr.c | 195 +++++++++++++++++++++++++++++---- drivers/net/bnxt/bnxt_rxr.h | 6 + drivers/net/bnxt/hsi_struct_def_dpdk.h | 1 - 13 files changed, 422 insertions(+), 86 deletions(-)
doc/guides/nics/features/bnxt.ini +2 -0
@@ -17,6 +17,8 @@ Basic stats = Y Extended stats = Y SR-IOV = Y FW version = Y +Jumbo frame = Y +MTU update = Y Linux VFIO = Y Linux UIO = Y x86-64 = Y
drivers/net/bnxt/bnxt.h +3 -1
@@ -45,7 +45,7 @@#include "bnxt_cpr.h" -#define BNXT_MAX_MTU 9000 +#define BNXT_MAX_MTU 9500#define VLAN_TAG_SIZE 4enum bnxt_hw_context {
@@ -131,6 +131,7 @@ struct bnxt {#define BNXT_FLAG_REGISTERED (1 << 0)#define BNXT_FLAG_VF (1 << 1)#define BNXT_FLAG_PORT_STATS (1 << 2) +#define BNXT_FLAG_JUMBO (1 << 3)#define BNXT_PF (bp) (!((bp)->flags & BNXT_FLAG_VF))#define BNXT_VF (bp) ((bp)->flags & BNXT_FLAG_VF)#define BNXT_NPAR_ENABLED (bp) ((bp)->port_partition_type)
@@ -233,4 +234,5 @@ struct rte_pmd_bnxt_mb_event_param {int bnxt_link_update_op (struct rte_eth_dev *eth_dev,int wait_to_complete);int bnxt_rcv_msg_from_vf (struct bnxt *bp,uint16_t vf_id,void *msg); +#define RX_PROD_AGG_BD_TYPE_RX_PROD_AGG 0x6#endif
drivers/net/bnxt/bnxt_cpr.c +2 -1
@@ -159,7 +159,8 @@ int bnxt_alloc_def_cp_ring(struct bnxt *bp) rc =bnxt_hwrm_ring_alloc (bp, cp_ring,HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL , -0 ,HWRM_NA_SIGNATURE ); +0 ,HWRM_NA_SIGNATURE , +HWRM_NA_SIGNATURE );if (rc) goto err_out; cpr->cp_doorbell = bp->pdev->mem_resource[2 ].addr;
drivers/net/bnxt/bnxt_ethdev.c +59 -0
77 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.c +76 -45
258 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +3 -1
@@ -70,7 +70,7 @@ int bnxt_hwrm_queue_qportcfg(struct bnxt *bp);int bnxt_hwrm_ring_alloc (struct bnxt *bp,struct bnxt_ring *ring,uint32_t ring_type,uint32_t map_index, -uint32_t stats_ctx_id); +uint32_t stats_ctx_id,uint32_t cmpl_ring_id);int bnxt_hwrm_ring_free (struct bnxt *bp,struct bnxt_ring *ring,uint32_t ring_type);int bnxt_hwrm_ring_grp_alloc (struct bnxt *bp,unsigned int idx);
@@ -93,6 +93,8 @@ int bnxt_hwrm_vnic_ctx_free(struct bnxt *bp, struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_free (struct bnxt *bp,struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_rss_cfg (struct bnxt *bp,struct bnxt_vnic_info *vnic); +int bnxt_hwrm_vnic_plcmode_cfg (struct bnxt *bp, +struct bnxt_vnic_info *vnic);int bnxt_alloc_all_hwrm_stat_ctxs (struct bnxt *bp);int bnxt_clear_all_hwrm_stat_ctxs (struct bnxt *bp);
drivers/net/bnxt/bnxt_ring.c +72 -9
156 lines not on this page · raw message
drivers/net/bnxt/bnxt_ring.h +2 -0
@@ -58,6 +58,7 @@#define DEFAULT_TX_RING_SIZE 256#define MAX_TPA 128 +#define AGG_RING_SIZE_FACTOR 2/* These assume 4k pages */ #define MAX_RX_DESC_CNT (8 * 1024)
@@ -65,6 +66,7 @@#define MAX_CP_DESC_CNT (16 * 1024)#define INVALID_HW_RING_ID ((uint16_t)-1) +#define INVALID_STATS_CTX_ID ((uint16_t)-1)struct bnxt_ring {void *bd;
drivers/net/bnxt/bnxt_rxq.c +21 -8
@@ -84,9 +84,8 @@ int bnxt_mq_rx_configure(struct bnxt *bp) vnic->func_default = true; vnic->ff_pool_idx =0 ; - vnic->start_grp_id =1 ; - vnic->end_grp_id = vnic->start_grp_id + - bp->rx_cp_nr_rings -1 ; + vnic->start_grp_id =0 ; + vnic->end_grp_id = vnic->start_grp_id; filter =bnxt_alloc_filter (bp);if (!filter) {RTE_LOG (ERR ,PMD ,"L2 filter alloc failed\n" );
@@ -126,8 +125,8 @@ int bnxt_mq_rx_configure(struct bnxt *bp) pools =ETH_64_POOLS ; } nb_q_per_grp = bp->rx_cp_nr_rings / pools; - start_grp_id =1 ; - end_grp_id = start_grp_id + nb_q_per_grp -1 ; + start_grp_id =0 ; + end_grp_id = nb_q_per_grp; ring_idx =0 ;for (i =0 ; i < pools; i++) {
@@ -188,9 +187,8 @@ int bnxt_mq_rx_configure(struct bnxt *bp) vnic->func_default = true; vnic->ff_pool_idx =0 ; - vnic->start_grp_id =1 ; - vnic->end_grp_id = vnic->start_grp_id + - bp->rx_cp_nr_rings -1 ; + vnic->start_grp_id =0 ; + vnic->end_grp_id = bp->rx_cp_nr_rings; filter =bnxt_alloc_filter (bp);if (!filter) {RTE_LOG (ERR ,PMD ,"L2 filter alloc failed\n" );
@@ -228,6 +226,16 @@ static void bnxt_rx_queue_release_mbufs(struct bnxt_rx_queue *rxq) } } } +/* Free up mbufs in Agg ring */ + sw_ring = rxq->rx_ring->ag_buf_ring; +if (sw_ring) { +for (i =0 ; i < rxq->nb_rx_desc; i++) { +if (sw_ring[i].mbuf) { +rte_pktmbuf_free_seg (sw_ring[i].mbuf); + sw_ring[i].mbuf =NULL ; + } + } + } } }
@@ -251,6 +259,8 @@ void bnxt_rx_queue_release_op(void *rx_queue)/* Free RX ring hardware descriptors */ bnxt_free_ring (rxq->rx_ring->rx_ring_struct); +/* Free RX Agg ring hardware descriptors */ +bnxt_free_ring (rxq->rx_ring->ag_ring_struct);/* Free RX completion ring hardware descriptors */ bnxt_free_ring (rxq->cp_ring->cp_ring_struct);
@@ -295,6 +305,9 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, rxq->nb_rx_desc = nb_desc; rxq->rx_free_thresh = rx_conf->rx_free_thresh; +RTE_LOG (DEBUG ,PMD ,"RX Buf size is %d\n" , rxq->rx_buf_use_size); +RTE_LOG (DEBUG ,PMD ,"RX Buf MTU %d\n" , eth_dev->data->mtu); + rc =bnxt_init_rx_ring_struct (rxq, socket_id);if (rc) goto out;
drivers/net/bnxt/bnxt_rxq.h +1 -0
@@ -52,6 +52,7 @@ struct bnxt_rx_queue {uint8_t crc_len;/* 0 if CRC stripped, 4 otherwise */ struct bnxt *bp; +int index;struct bnxt_vnic_info *vnic;uint32_t rx_buf_size;
drivers/net/bnxt/bnxt_rxr.c +175 -20
332 lines not on this page · raw message
drivers/net/bnxt/bnxt_rxr.h +6 -0
@@ -43,14 +43,20 @@ struct bnxt_sw_rx_bd {struct bnxt_rx_ring_info {uint16_t rx_prod; +uint16_t ag_prod;void *rx_doorbell; +void *ag_doorbell;struct rx_prod_pkt_bd *rx_desc_ring; +struct rx_prod_pkt_bd *ag_desc_ring;struct bnxt_sw_rx_bd *rx_buf_ring;/* sw ring */ +struct bnxt_sw_rx_bd *ag_buf_ring;/* sw ring */ phys_addr_t rx_desc_mapping; +phys_addr_t ag_desc_mapping;struct bnxt_ring *rx_ring_struct; +struct bnxt_ring *ag_ring_struct; }; uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
drivers/net/bnxt/hsi_struct_def_dpdk.h +0 -1
@@ -7252,7 +7252,6 @@ struct hwrm_vnic_tpa_cfg_output {*/ } __attribute__((packed)); -/* hwrm_ring_alloc */ /* * Description: This command allocates and does basic preparation for a ring.
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 13/26 net/bnxt: add support for LRO
In reply to Ajit KhapardeThis patch adds support to enable and disable LRO
To support this feature, the driver creates an aggregrator ring. When the hardware starts doing LRO, it sends a tpa_start completion. When the driver receives a tpa_end completion, it indicates that the LRO chaining is complete.
--v1->v2: regroup related patches and incorporate other review comments
v2->v3:
- rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
--- doc/guides/nics/features/bnxt.ini | 1 + drivers/net/bnxt/bnxt_ethdev.c | 7 + drivers/net/bnxt/bnxt_hwrm.c | 44 +++++- drivers/net/bnxt/bnxt_hwrm.h | 2 + drivers/net/bnxt/bnxt_ring.c | 32 +++- drivers/net/bnxt/bnxt_ring.h | 4 +- drivers/net/bnxt/bnxt_rxq.c | 12 ++ drivers/net/bnxt/bnxt_rxq.h | 2 + drivers/net/bnxt/bnxt_rxr.c | 315 +++++++++++++++++++++++++++++--------- drivers/net/bnxt/bnxt_rxr.h | 40 +++++ 10 files changed, 374 insertions(+), 85 deletions(-)
doc/guides/nics/features/bnxt.ini +1 -0
@@ -19,6 +19,7 @@ SR-IOV = Y FW version = Y Jumbo frame = Y MTU update = Y +LRO = Y Linux VFIO = Y Linux UIO = Y x86-64 = Y
drivers/net/bnxt/bnxt_ethdev.c +7 -0
@@ -286,6 +286,13 @@ static int bnxt_init_chip(struct bnxt *bp) goto err_out; } } + +bnxt_hwrm_vnic_plcmode_cfg (bp, vnic); + +if (bp->eth_dev->data->dev_conf.rxmode.enable_lro) +bnxt_hwrm_vnic_tpa_cfg (bp, vnic,1 ); +else +bnxt_hwrm_vnic_tpa_cfg (bp, vnic,0 ); } rc =bnxt_hwrm_cfa_l2_set_rx_mask (bp, &bp->vnic_info[0 ]);if (rc) {
drivers/net/bnxt/bnxt_hwrm.c +39 -5
70 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +2 -0
@@ -95,6 +95,8 @@ int bnxt_hwrm_vnic_rss_cfg(struct bnxt *bp, struct bnxt_vnic_info *vnic);int bnxt_hwrm_vnic_plcmode_cfg (struct bnxt *bp,struct bnxt_vnic_info *vnic); +int bnxt_hwrm_vnic_tpa_cfg (struct bnxt *bp, +struct bnxt_vnic_info *vnic,bool enable);int bnxt_alloc_all_hwrm_stat_ctxs (struct bnxt *bp);int bnxt_clear_all_hwrm_stat_ctxs (struct bnxt *bp);
drivers/net/bnxt/bnxt_ring.c +28 -4
@@ -31,6 +31,7 @@* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <rte_bitmap.h> #include <rte_memzone.h> #include <unistd.h>
@@ -137,11 +138,23 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,RTE_CACHE_LINE_ROUNDUP (rx_ring_info->rx_ring_struct->ring_size * sizeof(struct rx_prod_pkt_bd)) : 0; -int total_alloc_len = rx_ring_start + rx_ring_len; -int ag_ring_start =0 ; +int ag_ring_start = rx_ring_start + rx_ring_len; +int ag_ring_len = rx_ring_len *AGG_RING_SIZE_FACTOR ; - ag_ring_start = rx_ring_start + rx_ring_len; - total_alloc_len = ag_ring_start + rx_ring_len *AGG_RING_SIZE_FACTOR ; +int ag_bitmap_start = ag_ring_start + ag_ring_len; +int ag_bitmap_len = rx_ring_info ? +RTE_CACHE_LINE_ROUNDUP (rte_bitmap_get_memory_footprint ( + rx_ring_info->rx_ring_struct->ring_size * +AGG_RING_SIZE_FACTOR )) :0 ; + +int tpa_info_start = ag_bitmap_start + ag_bitmap_len; +int tpa_info_len = rx_ring_info ? +RTE_CACHE_LINE_ROUNDUP (BNXT_TPA_MAX * +sizeof (struct bnxt_tpa_info )) :0 ; + +int total_alloc_len = tpa_info_start; +if (bp->eth_dev->data->dev_conf.rxmode.enable_lro) + total_alloc_len += tpa_info_len; snprintf(mz_name, RTE_MEMZONE_NAMESIZE, "bnxt_%04x:%02x:%02x:%02x-%04x_%s", pdev->addr.domain,
@@ -230,6 +243,17 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx, rx_ring_info->ag_buf_ring = (struct bnxt_sw_rx_bd *)rx_ring->vmem; } + + rx_ring_info->ag_bitmap = +rte_bitmap_init (rx_ring_info->rx_ring_struct->ring_size * +AGG_RING_SIZE_FACTOR , (uint8_t *)mz->addr + + ag_bitmap_start, ag_bitmap_len); + +/* TPA info */ +if (bp->eth_dev->data->dev_conf.rxmode.enable_lro) + rx_ring_info->tpa_info = + ((struct bnxt_tpa_info *)((char *)mz->addr + + tpa_info_start)); } cp_ring->bd = ((char *)mz->addr + cp_ring_start);
drivers/net/bnxt/bnxt_ring.h +2 -2
@@ -57,8 +57,8 @@#define DEFAULT_RX_RING_SIZE 256#define DEFAULT_TX_RING_SIZE 256 -#define MAX_TPA 128 -#define AGG_RING_SIZE_FACTOR 2 +#define BNXT_TPA_MAX 64 +#define AGG_RING_SIZE_FACTOR 2/* These assume 4k pages */ #define MAX_RX_DESC_CNT (8 * 1024)
drivers/net/bnxt/bnxt_rxq.c +12 -0
@@ -214,6 +214,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp)static void bnxt_rx_queue_release_mbufs (struct bnxt_rx_queue *rxq) {struct bnxt_sw_rx_bd *sw_ring; +struct bnxt_tpa_info *tpa_info;uint16_t i;if (rxq) {
@@ -236,6 +237,17 @@ static void bnxt_rx_queue_release_mbufs(struct bnxt_rx_queue *rxq) } } } + +/* Free up mbufs in TPA */ + tpa_info = rxq->rx_ring->tpa_info; +if (tpa_info) { +for (i =0 ; i <BNXT_TPA_MAX ; i++) { +if (tpa_info[i].mbuf) { +rte_pktmbuf_free_seg (tpa_info[i].mbuf); + tpa_info[i].mbuf =NULL ; + } + } + } } }
drivers/net/bnxt/bnxt_rxq.h +2 -0
@@ -59,6 +59,8 @@ struct bnxt_rx_queue {uint32_t rx_buf_use_size;/* useable size */ struct bnxt_rx_ring_info *rx_ring;struct bnxt_cp_ring_info *cp_ring; + +struct bnxt_tpa_info *rx_tpa; };void bnxt_free_rxq_stats (struct bnxt_rx_queue *rxq);
drivers/net/bnxt/bnxt_rxr.c +241 -74
405 lines not on this page · raw message
drivers/net/bnxt/bnxt_rxr.h +40 -0
@@ -37,6 +37,39 @@#define B_RX_DB (db, prod) \ (*(uint32_t *)db = (DB_KEY_RX | prod)) +#define BNXT_TPA_L4_SIZE (x) \ + { \ + typeof(x) hdr_info = (x); \ + (((hdr_info) & 0xf8000000) ? ((hdr_info) >> 27) : 32) \ + } + +#define BNXT_TPA_INNER_L3_OFF (hdr_info) \ + (((hdr_info) >> 18) & 0x1ff) + +#define BNXT_TPA_INNER_L2_OFF (hdr_info) \ + (((hdr_info) >> 9) & 0x1ff) + +#define BNXT_TPA_OUTER_L3_OFF (hdr_info) \ + ((hdr_info) & 0x1ff) + +enum pkt_hash_types { +PKT_HASH_TYPE_NONE ,/* Undefined type */ +PKT_HASH_TYPE_L2 ,/* Input: src_MAC, dest_MAC */ +PKT_HASH_TYPE_L3 ,/* Input: src_IP, dst_IP */ +PKT_HASH_TYPE_L4 ,/* Input: src_IP, dst_IP, src_port, dst_port */ +}; + +struct bnxt_tpa_info { +struct rte_mbuf *mbuf; +uint16_t len; +unsigned short gso_type; +uint32_t flags2; +uint32_t metadata; +enum pkt_hash_types hash_type; +uint32_t rss_hash; +uint32_t hdr_info; +}; +struct bnxt_sw_rx_bd {struct rte_mbuf *mbuf;/* data associated with RX descriptor */ };
@@ -57,6 +90,13 @@ struct bnxt_rx_ring_info {struct bnxt_ring *rx_ring_struct;struct bnxt_ring *ag_ring_struct; + +/* +* To deal with out of order return from TPA, use free buffer indicator +*/ +struct rte_bitmap *ag_bitmap; + +struct bnxt_tpa_info *tpa_info; }; uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 14/26 net/bnxt: add rxq/txq info_get
In reply to Ajit KhapardeAdd support for txq_info_get and rxq_info_get dev_ops
--v1->v2: regroup related patches and incorporate other review comments
v2->v3:
- rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
- Avoid using dev_ops in the patch subject line
--- drivers/net/bnxt/bnxt_ethdev.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)
drivers/net/bnxt/bnxt_ethdev.c +39 -0
@@ -1390,6 +1390,43 @@ bnxt_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size)return 0 ; } +static void +bnxt_rxq_info_get_op (struct rte_eth_dev *dev,uint16_t queue_id, +struct rte_eth_rxq_info *qinfo) +{ +struct bnxt_rx_queue *rxq; + + rxq = dev->data->rx_queues[queue_id]; + + qinfo->mp = rxq->mb_pool; + qinfo->scattered_rx = dev->data->scattered_rx; + qinfo->nb_desc = rxq->nb_rx_desc; + + qinfo->conf.rx_free_thresh = rxq->rx_free_thresh; + qinfo->conf.rx_drop_en =0 ; + qinfo->conf.rx_deferred_start =0 ; +} + +static void +bnxt_txq_info_get_op (struct rte_eth_dev *dev,uint16_t queue_id, +struct rte_eth_txq_info *qinfo) +{ +struct bnxt_tx_queue *txq; + + txq = dev->data->tx_queues[queue_id]; + + qinfo->nb_desc = txq->nb_tx_desc; + + qinfo->conf.tx_thresh.pthresh = txq->pthresh; + qinfo->conf.tx_thresh.hthresh = txq->hthresh; + qinfo->conf.tx_thresh.wthresh = txq->wthresh; + + qinfo->conf.tx_free_thresh = txq->tx_free_thresh; + qinfo->conf.tx_rs_thresh =0 ; + qinfo->conf.txq_flags = txq->txq_flags; + qinfo->conf.tx_deferred_start = txq->tx_deferred_start; +} +static int bnxt_mtu_set_op (struct rte_eth_dev *eth_dev,uint16_t new_mtu) {struct bnxt *bp = eth_dev->data->dev_private;
@@ -1482,6 +1519,8 @@ static const struct eth_dev_ops bnxt_dev_ops = { .xstats_reset = bnxt_dev_xstats_reset_op, .fw_version_get = bnxt_fw_version_get, .set_mc_addr_list = bnxt_dev_set_mc_addr_list_op, + .rxq_info_get = bnxt_rxq_info_get_op, + .txq_info_get = bnxt_txq_info_get_op, };static bool bnxt_vf_pciid (uint16_t id)
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 15/26 net/bnxt: add code to support VLAN pvid
In reply to Ajit KhapardeThis patch adds code to support vlan_pvid_set dev_op
--v1->v2: regroup related patches and incorporate other review comments
v2->v3:
- rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
- Avoid using dev_ops in the patch subject line
--- drivers/net/bnxt/bnxt.h | 1 + drivers/net/bnxt/bnxt_ethdev.c | 21 +++++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.c | 31 +++++++++++++++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 1 + 4 files changed, 54 insertions(+)
drivers/net/bnxt/bnxt.h +1 -0
@@ -67,6 +67,7 @@ struct bnxt_child_vf_info {uint32_t func_cfg_flags;uint32_t l2_rx_mask;uint16_t fid; +uint16_t dflt_vlan;bool random_mac; };
drivers/net/bnxt/bnxt_ethdev.c +21 -0
@@ -1477,6 +1477,26 @@ static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)return rc; } +static int +bnxt_vlan_pvid_set_op (struct rte_eth_dev *dev,uint16_t pvid,int on) +{ +struct bnxt *bp = (struct bnxt *)dev->data->dev_private; +uint16_t vlan = bp->vlan; +int rc; + +if (BNXT_NPAR_PF (bp) ||BNXT_VF (bp)) { +RTE_LOG (ERR ,PMD , +"PVID cannot be modified for this function\n" ); +return -ENOTSUP ; + } + bp->vlan = on ? pvid :0 ; + + rc =bnxt_hwrm_set_default_vlan (bp,0 ,0 ); +if (rc) + bp->vlan = vlan; +return rc; +} +/* * Initialization */
@@ -1512,6 +1532,7 @@ static const struct eth_dev_ops bnxt_dev_ops = { .udp_tunnel_port_del = bnxt_udp_tunnel_port_del_op, .vlan_filter_set = bnxt_vlan_filter_set_op, .vlan_offload_set = bnxt_vlan_offload_set_op, + .vlan_pvid_set = bnxt_vlan_pvid_set_op, .mtu_set = bnxt_mtu_set_op, .mac_addr_set = bnxt_set_default_mac_addr_op, .xstats_get = bnxt_dev_xstats_get_op,
drivers/net/bnxt/bnxt_hwrm.c +31 -0
@@ -2256,6 +2256,37 @@ int bnxt_hwrm_vf_func_cfg_def_cp(struct bnxt *bp)return rc; } +int bnxt_hwrm_set_default_vlan (struct bnxt *bp,int vf,uint8_t is_vf) +{ +struct hwrm_func_cfg_input req = {0 }; +struct hwrm_func_cfg_output *resp = bp->hwrm_cmd_resp_addr; +uint16_t dflt_vlan, fid; +uint32_t func_cfg_flags; +int rc =0 ; + +HWRM_PREP (req,FUNC_CFG ,-1 , resp); + +if (is_vf) { + dflt_vlan = bp->pf.vf_info[vf].dflt_vlan; + fid = bp->pf.vf_info[vf].fid; + func_cfg_flags = bp->pf.vf_info[vf].func_cfg_flags; + }else { + fid =rte_cpu_to_le_16 (0xffff ); + func_cfg_flags = bp->pf.func_cfg_flags; + dflt_vlan = bp->vlan; + } + + req.flags =rte_cpu_to_le_32 (func_cfg_flags); + req.fid =rte_cpu_to_le_16 (fid); + req.enables |=rte_cpu_to_le_32 (HWRM_FUNC_CFG_INPUT_ENABLES_DFLT_VLAN ); + req.dflt_vlan =rte_cpu_to_le_16 (dflt_vlan); + + rc =bnxt_hwrm_send_message (bp, &req,sizeof (req)); +HWRM_CHECK_RESULT ; + +return rc; +} +int bnxt_hwrm_reject_fwd_resp (struct bnxt *bp,uint16_t target_id,void *encaped,size_t ec_size) {
drivers/net/bnxt/bnxt_hwrm.h +1 -0
@@ -123,6 +123,7 @@ int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,int bnxt_hwrm_tunnel_dst_port_free (struct bnxt *bp,uint16_t port,uint8_t tunnel_type);void bnxt_free_tunnel_ports (struct bnxt *bp); +int bnxt_hwrm_set_default_vlan (struct bnxt *bp,int vf,uint8_t is_vf);int bnxt_hwrm_port_qstats (struct bnxt *bp);int bnxt_hwrm_port_clr_stats (struct bnxt *bp);#endif
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 16/26 net/bnxt: reorg the query stats code
In reply to Ajit Khaparde1) Use hwrm_stat_ctx_query command to query statistics Using hwrm_stat_ctx_query command will allow polling
the statistics from hardware instead of using the current push model from the hardware which does a DMA of the stats to the host at fixed intervals.
2) Use the rx_mbuf_alloc_fail to track mbuf alloc failures.
3) We were wrongly incrementing hwrm_cmd_seq in bnxt_hwrm_stat_clear and bnxt_hwrm_stat_ctx_alloc functions. This patch fixes that.
--v1->v2: regroup related patches and incorporate other review comments
v2->v3:
- rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
--- drivers/net/bnxt/bnxt.h | 1 + drivers/net/bnxt/bnxt_ethdev.c | 2 ++ drivers/net/bnxt/bnxt_hwrm.c | 82 ++++++++++++++++++++++++++++++++++++++---- drivers/net/bnxt/bnxt_hwrm.h | 4 +++ drivers/net/bnxt/bnxt_rxr.c | 16 ++++++--- drivers/net/bnxt/bnxt_stats.c | 59 ++++-------------------------- 6 files changed, 102 insertions(+), 62 deletions(-)
drivers/net/bnxt/bnxt.h +1 -0
@@ -204,6 +204,7 @@ struct bnxt {uint16_t vxlan_fw_dst_port_id;uint16_t geneve_fw_dst_port_id;uint32_t fw_ver; +rte_atomic64_t rx_mbuf_alloc_fail; };/*
drivers/net/bnxt/bnxt_ethdev.c +2 -0
@@ -1616,6 +1616,8 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev) eth_dev->data->dev_flags |=RTE_ETH_DEV_DETACHABLE ; bp = eth_dev->data->dev_private; + +rte_atomic64_init (&bp->rx_mbuf_alloc_fail); bp->dev_stopped =1 ;if (bnxt_vf_pciid (pci_dev->id.device_id))
drivers/net/bnxt/bnxt_hwrm.c +76 -6
117 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +4 -0
@@ -62,6 +62,8 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp);int bnxt_hwrm_func_qcaps (struct bnxt *bp);int bnxt_hwrm_func_reset (struct bnxt *bp);int bnxt_hwrm_func_driver_unregister (struct bnxt *bp,uint32_t flags); +int bnxt_hwrm_func_qstats (struct bnxt *bp,uint16_t fid, +struct rte_eth_stats *stats);int bnxt_hwrm_func_cfg_def_cp (struct bnxt *bp);int bnxt_hwrm_vf_func_cfg_def_cp (struct bnxt *bp);
@@ -81,6 +83,8 @@ int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, unsigned int idx);int bnxt_hwrm_stat_ctx_free (struct bnxt *bp,struct bnxt_cp_ring_info *cpr,unsigned int idx); +int bnxt_hwrm_ctx_qstats (struct bnxt *bp,uint32_t cid,int idx, +struct rte_eth_stats *stats);int bnxt_hwrm_ver_get (struct bnxt *bp);
drivers/net/bnxt/bnxt_rxr.c +12 -4
@@ -68,8 +68,10 @@ static inline int bnxt_alloc_rx_data(struct bnxt_rx_queue *rxq,struct rte_mbuf *data; data =__bnxt_alloc_rx_data (rxq->mb_pool); -if (!data) +if (!data) { +rte_atomic64_inc (&rxq->bp->rx_mbuf_alloc_fail);return -ENOMEM ; + } rx_buf->mbuf = data;
@@ -87,8 +89,10 @@ static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq,struct rte_mbuf *data; data =__bnxt_alloc_rx_data (rxq->mb_pool); -if (!data) +if (!data) { +rte_atomic64_inc (&rxq->bp->rx_mbuf_alloc_fail);return -ENOMEM ; + }if (rxbd ==NULL )RTE_LOG (ERR ,PMD ,"Jumbo Frame. rxbd is NULL\n" );
@@ -321,8 +325,10 @@ static inline struct rte_mbuf *bnxt_tpa_end(struct rte_mbuf *new_data =__bnxt_alloc_rx_data (rxq->mb_pool);RTE_ASSERT (new_data !=NULL ); -if (!new_data) +if (!new_data) { +rte_atomic64_inc (&rxq->bp->rx_mbuf_alloc_fail);return NULL ; + } tpa_info->mbuf = new_data;return mbuf;
@@ -679,8 +685,10 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)for (i =0 ; i <BNXT_TPA_MAX ; i++) { rxr->tpa_info[i].mbuf =__bnxt_alloc_rx_data (rxq->mb_pool); -if (!rxr->tpa_info[i].mbuf) +if (!rxr->tpa_info[i].mbuf) { +rte_atomic64_inc (&rxq->bp->rx_mbuf_alloc_fail);return -ENOMEM ; + } } }RTE_LOG (DEBUG ,PMD ,"%s TPA alloc Done!\n" , __func__);
drivers/net/bnxt/bnxt_stats.c +7 -52
77 lines not on this page · raw message
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 17/26 doc: update default.ini to add LED support
In reply to Ajit KhapardeUpdate default.ini to indicate LED on/off support
--- doc/guides/nics/features/default.ini | 1 + 1 file changed, 1 insertion(+)
doc/guides/nics/features/default.ini +1 -0
@@ -60,6 +60,7 @@ Stats per queue = FW version = EEPROM dump = Registers dump = +LED = Multiprocess aware = BSD nic_uio = Linux UIO =
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 18/26 net/bnxt: add support for led on/off
In reply to Ajit KhapardeThis patch adds support for dev_led_on/off dev_ops
HWRM calls added:bnxt_hwrm_port_led_qcaps()bnxt_hwrm_port_led_cfg()
--
v1-v2:
- rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
- Update bnxt.ini indicating support for LED on/off
--- doc/guides/nics/features/bnxt.ini | 1 + drivers/net/bnxt/bnxt.h | 39 ++ drivers/net/bnxt/bnxt_ethdev.c | 20 + drivers/net/bnxt/bnxt_hwrm.c | 70 +++ drivers/net/bnxt/bnxt_hwrm.h | 2 + drivers/net/bnxt/hsi_struct_def_dpdk.h | 977 +++++++++++++++++++++++++++++++++ 6 files changed, 1109 insertions(+)
doc/guides/nics/features/bnxt.ini +1 -0
@@ -20,6 +20,7 @@ FW version = Y Jumbo frame = Y MTU update = Y LRO = Y +LED = Y Linux VFIO = Y Linux UIO = Y x86-64 = Y
drivers/net/bnxt/bnxt.h +39 -0
@@ -47,6 +47,42 @@#define BNXT_MAX_MTU 9500#define VLAN_TAG_SIZE 4 +#define BNXT_MAX_LED 4 + +struct bnxt_led_info { +uint8_t led_id; +uint8_t led_type; +uint8_t led_group_id; +uint8_t unused; +uint16_t led_state_caps; +#define BNXT_LED_ALT_BLINK_CAP (x) ((x) & \ + rte_cpu_to_le_16(HWRM_PORT_LED_QCFG_OUTPUT_LED0_STATE_BLINKALT)) + +uint16_t led_color_caps; +}; + +struct bnxt_led_cfg { +uint8_t led_id; +uint8_t led_state; +uint8_t led_color; +uint8_t unused; +uint16_t led_blink_on; +uint16_t led_blink_off; +uint8_t led_group_id; +uint8_t rsvd; +}; + +#define BNXT_LED_DFLT_ENA \ + (HWRM_PORT_LED_CFG_INPUT_ENABLES_LED0_ID | \ + HWRM_PORT_LED_CFG_INPUT_ENABLES_LED0_STATE | \ + HWRM_PORT_LED_CFG_INPUT_ENABLES_LED0_BLINK_ON | \ + HWRM_PORT_LED_CFG_INPUT_ENABLES_LED0_BLINK_OFF | \ + HWRM_PORT_LED_CFG_INPUT_ENABLES_LED0_GROUP_ID) + +#define BNXT_LED_DFLT_ENA_SHIFT 6 + +#define BNXT_LED_DFLT_ENABLES (x) \ + rte_cpu_to_le_32(BNXT_LED_DFLT_ENA << (BNXT_LED_DFLT_ENA_SHIFT * (x)))enum bnxt_hw_context {HW_CONTEXT_NONE =0 ,
@@ -205,6 +241,9 @@ struct bnxt {uint16_t geneve_fw_dst_port_id;uint32_t fw_ver;rte_atomic64_t rx_mbuf_alloc_fail; + +struct bnxt_led_info leds[BNXT_MAX_LED ]; +uint8_t num_leds; };/*
drivers/net/bnxt/bnxt_ethdev.c +20 -0
@@ -1497,6 +1497,22 @@ bnxt_vlan_pvid_set_op(struct rte_eth_dev *dev, uint16_t pvid, int on)return rc; } +static int +bnxt_dev_led_on_op (struct rte_eth_dev *dev) +{ +struct bnxt *bp = (struct bnxt *)dev->data->dev_private; + +return bnxt_hwrm_port_led_cfg (bp, true); +} + +static int +bnxt_dev_led_off_op (struct rte_eth_dev *dev) +{ +struct bnxt *bp = (struct bnxt *)dev->data->dev_private; + +return bnxt_hwrm_port_led_cfg (bp, false); +} +/* * Initialization */
@@ -1542,6 +1558,8 @@ static const struct eth_dev_ops bnxt_dev_ops = { .set_mc_addr_list = bnxt_dev_set_mc_addr_list_op, .rxq_info_get = bnxt_rxq_info_get_op, .txq_info_get = bnxt_txq_info_get_op, + .dev_led_on = bnxt_dev_led_on_op, + .dev_led_off = bnxt_dev_led_off_op, };static bool bnxt_vf_pciid (uint16_t id)
@@ -1815,6 +1833,8 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev) } } +bnxt_hwrm_port_led_qcaps (bp); + rc =bnxt_setup_int (bp);if (rc) goto error_free;
drivers/net/bnxt/bnxt_hwrm.c +70 -0
73 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +2 -0
@@ -130,4 +130,6 @@ void bnxt_free_tunnel_ports(struct bnxt *bp);int bnxt_hwrm_set_default_vlan (struct bnxt *bp,int vf,uint8_t is_vf);int bnxt_hwrm_port_qstats (struct bnxt *bp);int bnxt_hwrm_port_clr_stats (struct bnxt *bp); +int bnxt_hwrm_port_led_cfg (struct bnxt *bp,bool led_on); +int bnxt_hwrm_port_led_qcaps (struct bnxt *bp);#endif
drivers/net/bnxt/hsi_struct_def_dpdk.h +977 -0
983 lines not on this page · raw message
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 19/26 net/bnxt: add support for tx loopback, set vf mac and queues drop
In reply to Ajit KhapardeAdd functions rte_pmd_bnxt_set_tx_loopback, rte_pmd_bnxt_set_all_queues_drop_en and rte_pmd_bnxt_set_vf_mac_addr to configure tx_loopback, queue_drop and VF MAC address setting in the hardware. It also adds the necessary functions to send the HWRM commands to the firmware.
--v1->v2: regroup related patches and incorporate other review comments
v2->v3:
- Rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
- Add the copyright year.
- Add a protection against application calling the API for different vendor's port_id
- update testpmd to use these vendor specific APIs
--- app/test-pmd/Makefile | 4 + app/test-pmd/cmdline.c | 25 ++++- drivers/net/bnxt/Makefile | 4 + drivers/net/bnxt/bnxt.h | 2 + drivers/net/bnxt/bnxt_ethdev.c | 15 +++ drivers/net/bnxt/bnxt_hwrm.c | 106 ++++++++++++++++++ drivers/net/bnxt/bnxt_hwrm.h | 4 + drivers/net/bnxt/rte_pmd_bnxt.c | 172 ++++++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 87 +++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 7 +- 10 files changed, 422 insertions(+), 4 deletions(-) create mode 100644 drivers/net/bnxt/rte_pmd_bnxt.c create mode 100644 drivers/net/bnxt/rte_pmd_bnxt.h
app/test-pmd/Makefile +4 -0
@@ -73,6 +73,10 @@ ifeq ($(CONFIG_RTE_LIBRTE_I40E_PMD),y) LDLIBS += -lrte_pmd_i40e endif +ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD),y) +LDLIBS += -lrte_pmd_bnxt +endif + ifeq ($(CONFIG_RTE_LIBRTE_PMD_XENVIRT),y) LDLIBS += -lrte_pmd_xenvirt endif
app/test-pmd/cmdline.c +22 -3
@@ -94,6 +94,9 @@#ifdef RTE_LIBRTE_I40E_PMD #include <rte_pmd_i40e.h> #endif +#ifdef RTE_LIBRTE_BNXT_PMD +#include <rte_pmd_bnxt.h> +#endif #include "testpmd.h" static struct cmdline *testpmd_cl;
@@ -11402,6 +11405,10 @@ cmd_set_tx_loopback_parsed(if (ret == -ENOTSUP ) ret =rte_pmd_i40e_set_tx_loopback (res->port_id, is_on);#endif +#ifdef RTE_LIBRTE_BNXT_PMD +if (ret == -ENOTSUP ) + ret =rte_pmd_bnxt_set_tx_loopback (res->port_id, is_on); +#endif switch (ret) {case 0 :
@@ -11434,7 +11441,6 @@ cmdline_parse_inst_t cmd_set_tx_loopback = { }, }; -#ifdef RTE_LIBRTE_IXGBE_PMD /* all queues drop enable configuration */ /* Common result structure for all queues drop enable */
@@ -11480,13 +11486,20 @@ cmd_set_all_queues_drop_en_parsed( __attribute__((unused)) void *data) {struct cmd_all_queues_drop_en_result *res = parsed_result; -int ret =0 ; +int ret = -ENOTSUP ;int is_on = (strcmp (res->on_off,"on" ) ==0 ) ?1 :0 ;if (port_id_is_invalid (res->port_id,ENABLED_WARN ))return ; - ret =rte_pmd_ixgbe_set_all_queues_drop_en (res->port_id, is_on); +#ifdef RTE_LIBRTE_IXGBE_PMD +if (ret == -ENOTSUP ) + ret =rte_pmd_ixgbe_set_all_queues_drop_en (res->port_id, is_on); +#endif +#ifdef RTE_LIBRTE_BNXT_PMD +if (ret == -ENOTSUP ) + ret =rte_pmd_bnxt_set_all_queues_drop_en (res->port_id, is_on); +#endif switch (ret) {case 0 :break ;
@@ -11519,6 +11532,7 @@ cmdline_parse_inst_t cmd_set_all_queues_drop_en = { }, }; +#ifdef RTE_LIBRTE_IXGBE_PMD /* vf split drop enable configuration */ /* Common result structure for vf split drop enable */
@@ -11673,6 +11687,11 @@ cmd_set_vf_mac_addr_parsed( ret =rte_pmd_i40e_set_vf_mac_addr (res->port_id, res->vf_id, &res->mac_addr);#endif +#ifdef RTE_LIBRTE_BNXT_PMD +if (ret == -ENOTSUP ) + ret =rte_pmd_bnxt_set_vf_mac_addr (res->port_id, res->vf_id, + &res->mac_addr); +#endif switch (ret) {case 0 :
drivers/net/bnxt/Makefile +4 -0
@@ -38,6 +38,8 @@ include $(RTE_SDK)/mk/rte.vars.mk # LIB = librte_pmd_bnxt.a +EXPORT_MAP := rte_pmd_bnxt_version.map + LIBABIVER := 1 CFLAGS += -O3
@@ -60,10 +62,12 @@ SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_txq.c SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_txr.c SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_vnic.c SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_irq.c +SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += rte_pmd_bnxt.c # # Export include files # SYMLINK-y-include += +SYMLINK-$(CONFIG_RTE_LIBRTE_BNXT_PMD)-include := rte_pmd_bnxt.h include $(RTE_SDK)/mk/rte.lib.mk
drivers/net/bnxt/bnxt.h +2 -0
@@ -276,4 +276,6 @@ int bnxt_link_update_op(struct rte_eth_dev *eth_dev, int wait_to_complete);int bnxt_rcv_msg_from_vf (struct bnxt *bp,uint16_t vf_id,void *msg);#define RX_PROD_AGG_BD_TYPE_RX_PROD_AGG 0x6 + +bool is_bnxt_supported (struct rte_eth_dev *dev);#endif
drivers/net/bnxt/bnxt_ethdev.c +15 -0
@@ -142,6 +142,7 @@ static const struct rte_pci_id bnxt_pci_id_map[] = { ETH_RSS_NONFRAG_IPV6_UDP) static void bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask); +/***********************/ /*
@@ -1936,6 +1937,20 @@ static struct rte_pci_driver bnxt_rte_pmd = { .remove = bnxt_pci_remove, }; +static bool +is_device_supported (struct rte_eth_dev *dev,struct rte_pci_driver *drv) +{ +if (strcmp (dev->data->drv_name, drv->driver.name)) +return false; + +return true; +} + +bool is_bnxt_supported (struct rte_eth_dev *dev) +{ +return is_device_supported (dev, &bnxt_rte_pmd); +} +RTE_PMD_REGISTER_PCI (net_bnxt, bnxt_rte_pmd);RTE_PMD_REGISTER_PCI_TABLE (net_bnxt, bnxt_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (net_bnxt,"* igb_uio | uio_pci_generic | vfio" );
drivers/net/bnxt/bnxt_hwrm.c +106 -0
115 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +4 -0
@@ -120,6 +120,7 @@ int bnxt_hwrm_allocate_pf_only(struct bnxt *bp);int bnxt_hwrm_allocate_vfs (struct bnxt *bp,int num_vfs);int bnxt_hwrm_func_vf_mac (struct bnxt *bp,uint16_t vf,const uint8_t *mac_addr); +int bnxt_hwrm_pf_evb_mode (struct bnxt *bp);int bnxt_hwrm_func_qcfg_vf_default_mac (struct bnxt *bp,uint16_t vf,struct ether_addr *mac); int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,
@@ -132,4 +133,7 @@ int bnxt_hwrm_port_qstats(struct bnxt *bp);int bnxt_hwrm_port_clr_stats (struct bnxt *bp);int bnxt_hwrm_port_led_cfg (struct bnxt *bp,bool led_on);int bnxt_hwrm_port_led_qcaps (struct bnxt *bp); +int bnxt_hwrm_func_vf_vnic_query_and_config (struct bnxt *bp,uint16_t vf, +void (*vnic_cb)(struct bnxt_vnic_info *,void *),void *cbdata, +int (*hwrm_cb)(struct bnxt *bp,struct bnxt_vnic_info *vnic));#endif
drivers/net/bnxt/rte_pmd_bnxt.c new file +172 -0
172 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt.h new file +87 -0
87 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt_version.map +6 -1
@@ -1,4 +1,9 @@ -DPDK_16.04 { +DPDK_17.08 { + global: + + rte_pmd_bnxt_set_tx_loopback; + rte_pmd_bnxt_set_all_queues_drop_en; + rte_pmd_bnxt_set_vf_mac_addr; local: *; };
Signature · 1 line
2.10.1 (Apple Git-78)
PATCH v3 20/26 net/bnxt: add support for set VF QOS and MAC anti spoof
In reply to Ajit KhapardeThis patch adds support to
1) enable VF MAC anti spoof.
2) QOS configuration for specified VF.
--v1->v2: regroup related patches and incorporate other review comments
v2->v3:
- Rebasing to next-net tree
- Use net/bnxt instead of just bnxt in patch subject
- Add a protection against application calling the API for different vendor's port_id
- update testpmd to use these vendor specific APIs
--- app/test-pmd/cmdline.c | 24 ++- app/test-pmd/config.c | 20 ++- drivers/net/bnxt/bnxt.h | 4 + drivers/net/bnxt/bnxt_ethdev.c | 12 +- drivers/net/bnxt/bnxt_filter.h | 2 + drivers/net/bnxt/bnxt_hwrm.c | 117 +++++++++++- drivers/net/bnxt/bnxt_hwrm.h | 10 +- drivers/net/bnxt/rte_pmd_bnxt.c | 284 ++++++++++++++++++++++++++++++ drivers/net/bnxt/rte_pmd_bnxt.h | 97 ++++++++++ drivers/net/bnxt/rte_pmd_bnxt_version.map | 5 + 10 files changed, 559 insertions(+), 16 deletions(-)
app/test-pmd/cmdline.c +21 -3
@@ -6964,6 +6964,11 @@ cmd_vf_rx_vlan_filter_parsed(void *parsed_result, ret =rte_pmd_i40e_set_vf_vlan_filter (res->port_id, res->vlan_id, res->vf_mask, is_add);#endif +#ifdef RTE_LIBRTE_BNXT_PMD +if (ret == -ENOTSUP ) + ret =rte_pmd_bnxt_set_vf_vlan_filter (res->port_id, + res->vlan_id, res->vf_mask, is_add); +#endif switch (ret) {case 0 :
@@ -7089,7 +7094,6 @@ cmdline_parse_inst_t cmd_queue_rate_limit = { }, }; -#ifdef RTE_LIBRTE_IXGBE_PMD/* *** SET RATE LIMIT FOR A VF OF A PORT *** */ struct cmd_vf_rate_limit_result {cmdline_fixed_string_t set;
@@ -7168,7 +7172,6 @@ cmdline_parse_inst_t cmd_vf_rate_limit = { NULL, }, }; -#endif /* *** ADD TUNNEL FILTER OF A PORT *** */ struct cmd_tunnel_filter_result {
@@ -11015,6 +11018,11 @@ cmd_set_vf_vlan_anti_spoof_parsed( ret =rte_pmd_i40e_set_vf_vlan_anti_spoof (res->port_id, res->vf_id, is_on);#endif +#ifdef RTE_LIBRTE_BNXT_PMD +if (ret == -ENOTSUP ) + ret =rte_pmd_bnxt_set_vf_vlan_anti_spoof (res->port_id, + res->vf_id, is_on); +#endif switch (ret) {case 0 :
@@ -11116,6 +11124,11 @@ cmd_set_vf_mac_anti_spoof_parsed( ret =rte_pmd_i40e_set_vf_mac_anti_spoof (res->port_id, res->vf_id, is_on);#endif +#ifdef RTE_LIBRTE_BNXT_PMD +if (ret == -ENOTSUP ) + ret =rte_pmd_bnxt_set_vf_mac_anti_spoof (res->port_id, + res->vf_id, is_on); +#endif switch (ret) {case 0 :
@@ -11217,6 +11230,11 @@ cmd_set_vf_vlan_stripq_parsed( ret =rte_pmd_i40e_set_vf_vlan_stripq (res->port_id, res->vf_id, is_on);#endif +#ifdef RTE_LIBRTE_BNXT_PMD +if (ret == -ENOTSUP ) + ret =rte_pmd_bnxt_set_vf_vlan_stripq (res->port_id, + res->vf_id, is_on); +#endif switch (ret) {case 0 :
@@ -13752,8 +13770,8 @@ cmdline_parse_ctx_t main_ctx[] = { (cmdline_parse_inst_t *)&cmd_set_macsec_sa, (cmdline_parse_inst_t *)&cmd_set_vf_rxmode, (cmdline_parse_inst_t *)&cmd_set_vf_traffic, - (cmdline_parse_inst_t *)&cmd_vf_rate_limit, #endif + (cmdline_parse_inst_t *)&cmd_vf_rate_limit, (cmdline_parse_inst_t *)&cmd_vf_rxvlan_filter, (cmdline_parse_inst_t *)&cmd_set_vf_mac_addr, (cmdline_parse_inst_t *)&cmd_set_vf_promisc,
app/test-pmd/config.c +15 -5
@@ -97,6 +97,9 @@#ifdef RTE_LIBRTE_IXGBE_PMD #include <rte_pmd_ixgbe.h> #endif +#ifdef RTE_LIBRTE_BNXT_PMD +#include <rte_pmd_bnxt.h> +#endif #include "testpmd.h"
@@ -3053,20 +3056,27 @@ set_queue_rate_limit(portid_t port_id, uint16_t queue_idx, uint16_t rate)return diag; } -#ifdef RTE_LIBRTE_IXGBE_PMD int set_vf_rate_limit (portid_t port_id,uint16_t vf,uint16_t rate,uint64_t q_msk) { -int diag; +int diag = -ENOTSUP ; - diag =rte_pmd_ixgbe_set_vf_rate_limit (port_id, vf, rate, q_msk); +#ifdef RTE_LIBRTE_IXGBE_PMD +if (diag == -ENOTSUP ) + diag =rte_pmd_ixgbe_set_vf_rate_limit (port_id, vf, rate, + q_msk); +#endif +#ifdef RTE_LIBRTE_BNXT_PMD +if (diag == -ENOTSUP ) + diag =rte_pmd_bnxt_set_vf_rate_limit (port_id, vf, rate, q_msk); +#endif if (diag ==0 )return diag; -printf ("rte_pmd_ixgbe_set_vf_rate_limit for port_id=%d failed diag=%d\n" , + +printf ("set_vf_rate_limit for port_id=%d failed diag=%d\n" , port_id, diag);return diag; } -#endif /* * Functions to manage the set of filtered Multicast MAC addresses.
drivers/net/bnxt/bnxt.h +4 -0
@@ -104,6 +104,10 @@ struct bnxt_child_vf_info {uint32_t l2_rx_mask;uint16_t fid;uint16_t dflt_vlan; +uint16_t max_tx_rate; +uint16_t vlan_count; +uint8_t mac_spoof_en; +uint8_t vlan_spoof_en;bool random_mac; };
drivers/net/bnxt/bnxt_ethdev.c +6 -6
@@ -295,7 +295,7 @@ static int bnxt_init_chip(struct bnxt *bp)else bnxt_hwrm_vnic_tpa_cfg (bp, vnic,0 ); } - rc =bnxt_hwrm_cfa_l2_set_rx_mask (bp, &bp->vnic_info[0 ]); + rc =bnxt_hwrm_cfa_l2_set_rx_mask (bp, &bp->vnic_info[0 ],0 ,NULL );if (rc) {RTE_LOG (ERR ,PMD ,"HWRM cfa l2 rx mask failure rc: %x\n" , rc);
@@ -703,7 +703,7 @@ static void bnxt_promiscuous_enable_op(struct rte_eth_dev *eth_dev) vnic = &bp->vnic_info[0 ]; vnic->flags |=BNXT_VNIC_INFO_PROMISC ; -bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic); +bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic,0 ,NULL ); }static void bnxt_promiscuous_disable_op (struct rte_eth_dev *eth_dev)
@@ -717,7 +717,7 @@ static void bnxt_promiscuous_disable_op(struct rte_eth_dev *eth_dev) vnic = &bp->vnic_info[0 ]; vnic->flags &= ~BNXT_VNIC_INFO_PROMISC ; -bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic); +bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic,0 ,NULL ); }static void bnxt_allmulticast_enable_op (struct rte_eth_dev *eth_dev)
@@ -731,7 +731,7 @@ static void bnxt_allmulticast_enable_op(struct rte_eth_dev *eth_dev) vnic = &bp->vnic_info[0 ]; vnic->flags |=BNXT_VNIC_INFO_ALLMULTI ; -bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic); +bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic,0 ,NULL ); }static void bnxt_allmulticast_disable_op (struct rte_eth_dev *eth_dev)
@@ -745,7 +745,7 @@ static void bnxt_allmulticast_disable_op(struct rte_eth_dev *eth_dev) vnic = &bp->vnic_info[0 ]; vnic->flags &= ~BNXT_VNIC_INFO_ALLMULTI ; -bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic); +bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic,0 ,NULL ); } static int bnxt_reta_update_op(struct rte_eth_dev *eth_dev,
@@ -1369,7 +1369,7 @@ bnxt_dev_set_mc_addr_list_op(struct rte_eth_dev *eth_dev, vnic->mc_addr_cnt = i; allmulti: -return bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic); +return bnxt_hwrm_cfa_l2_set_rx_mask (bp, vnic,0 ,NULL ); } static int
drivers/net/bnxt/bnxt_filter.h +2 -0
@@ -63,6 +63,8 @@ struct bnxt_filter_info {uint32_t vni;uint8_t pri_hint;uint64_t l2_filter_id_hint; +uint32_t src_id; +uint8_t src_type; };struct bnxt_filter_info *bnxt_alloc_filter (struct bnxt *bp);
drivers/net/bnxt/bnxt_hwrm.c +116 -1
150 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +9 -1
@@ -45,7 +45,9 @@ struct bnxt_cp_ring_info;int bnxt_hwrm_cfa_l2_clear_rx_mask (struct bnxt *bp,struct bnxt_vnic_info *vnic); -int bnxt_hwrm_cfa_l2_set_rx_mask (struct bnxt *bp,struct bnxt_vnic_info *vnic); +int bnxt_hwrm_cfa_l2_set_rx_mask (struct bnxt *bp,struct bnxt_vnic_info *vnic, +uint16_t vlan_count, +struct bnxt_vlan_table_entry *vlan_table);int bnxt_hwrm_clear_filter (struct bnxt *bp,struct bnxt_filter_info *filter); int bnxt_hwrm_set_filter(struct bnxt *bp,
@@ -121,6 +123,8 @@ int bnxt_hwrm_allocate_vfs(struct bnxt *bp, int num_vfs);int bnxt_hwrm_func_vf_mac (struct bnxt *bp,uint16_t vf,const uint8_t *mac_addr);int bnxt_hwrm_pf_evb_mode (struct bnxt *bp); +int bnxt_hwrm_func_bw_cfg (struct bnxt *bp,uint16_t vf, +uint16_t max_bw,uint16_t enables);int bnxt_hwrm_func_qcfg_vf_default_mac (struct bnxt *bp,uint16_t vf,struct ether_addr *mac); int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,
@@ -133,7 +137,11 @@ int bnxt_hwrm_port_qstats(struct bnxt *bp);int bnxt_hwrm_port_clr_stats (struct bnxt *bp);int bnxt_hwrm_port_led_cfg (struct bnxt *bp,bool led_on);int bnxt_hwrm_port_led_qcaps (struct bnxt *bp); +int bnxt_hwrm_func_cfg_vf_set_flags (struct bnxt *bp,uint16_t vf);int bnxt_hwrm_func_vf_vnic_query_and_config (struct bnxt *bp,uint16_t vf,void (*vnic_cb)(struct bnxt_vnic_info *,void *),void *cbdata,int (*hwrm_cb)(struct bnxt *bp,struct bnxt_vnic_info *vnic)); +int bnxt_hwrm_func_cfg_vf_set_vlan_anti_spoof (struct bnxt *bp,uint16_t vf, +bool on); +int bnxt_hwrm_func_qcfg_vf_dflt_vnic_id (struct bnxt *bp,int vf);#endif
drivers/net/bnxt/rte_pmd_bnxt.c +284 -0
293 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt.h +97 -0
113 lines not on this page · raw message
drivers/net/bnxt/rte_pmd_bnxt_version.map +5 -0
@@ -4,6 +4,11 @@ DPDK_17.08 { rte_pmd_bnxt_set_tx_loopback; rte_pmd_bnxt_set_all_queues_drop_en; rte_pmd_bnxt_set_vf_mac_addr; + rte_pmd_bnxt_set_vf_mac_anti_spoof; + rte_pmd_bnxt_set_vf_rate_limit; + rte_pmd_bnxt_set_vf_vlan_stripq; + rte_pmd_bnxt_set_vf_vlan_filter; + rte_pmd_bnxt_set_vf_vlan_anti_spoof; local: *; };
Signature · 1 line
2.10.1 (Apple Git-78)