bnx2x: VF RSS support
Hi Dave,
This patch series adds the capability for VF functions to use multiple queues and Receive / Transmit side scaling.
Patch #1 enhances the PF's side database to allow for multiple queues per PF and configure the HW appropriately, and the PF side of the VF PF channel message for configuring the RSS.
Patch #2 adds to the VF side the ability to request multiple queues, and if obtained to configure RSS for them over the VF PF channel.
Thanks,
Ariel Elior
PATCH 1/2 bnx2x: VF RSS support - PF side
This patch adds support for Receive Side Scaling for queues of Virtual Functions on the PF side. This includes support for the requests for multiple queues from VF drivers, configuration of the HW for multiple queues per VF, and support for rss configuration of said queues.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 32 ++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 5 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 10 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 2 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 386 +++++++++++++++------ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 32 ++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 146 ++++++++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h | 41 ++- 10 files changed, 513 insertions(+), 144 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +22 -10
@@ -825,15 +825,13 @@ static inline bool bnx2x_fp_ll_polling(struct bnx2x_fastpath *fp)#define BD_UNMAP_LEN (bd) (le16_to_cpu((bd)->nbytes))#define BNX2X_DB_MIN_SHIFT 3/* 8 bytes */ -#define BNX2X_DB_SHIFT 7/* 128 bytes*/ +#define BNX2X_DB_SHIFT 3/* 8 bytes*/ #if (BNX2X_DB_SHIFT <BNX2X_DB_MIN_SHIFT )#error "Min DB doorbell stride is 8"#endif -#define DPM_TRIGER_TYPE 0x40#define DOORBELL (bp, cid, val) \ do { \ - writel((u32)(val), bp->doorbells + (bp->db_size * (cid)) + \ - DPM_TRIGER_TYPE); \ + writel((u32)(val), bp->doorbells + (bp->db_size * (cid))); \ } while (0)/* TX CSUM helpers */
@@ -1100,13 +1098,27 @@ struct bnx2x_port {extern struct workqueue_struct *bnx2x_wq;#define BNX2X_MAX_NUM_OF_VFS 64 -#define BNX2X_VF_CID_WND 0 +#define BNX2X_VF_CID_WND 4/* log num of queues per VF. HW config. */ #define BNX2X_CIDS_PER_VF (1 << BNX2X_VF_CID_WND) -#define BNX2X_CLIENTS_PER_VF 1 -#define BNX2X_FIRST_VF_CID 256 + +/* We need to reserve doorbell addresses for all VF and queue combinations */ #define BNX2X_VF_CIDS (BNX2X_MAX_NUM_OF_VFS * BNX2X_CIDS_PER_VF) + +/* The doorbell is configured to have the same number of CIDs for PFs and for +* VFs. For this reason the PF CID zone is as large as the VF zone. +*/ +#define BNX2X_FIRST_VF_CID BNX2X_VF_CIDS +#define BNX2X_MAX_NUM_VF_QUEUES 64#define BNX2X_VF_ID_INVALID 0xFF +/* the number of VF CIDS multiplied by the amount of bytes reserved for each +* cid must not exceed the size of the VF doorbell +*/ +#define BNX2X_VF_BAR_SIZE 512 +#if (BNX2X_VF_BAR_SIZE <BNX2X_CIDS_PER_VF * (1 <<BNX2X_DB_SHIFT )) +#error "VF doorbell bar size is 512" +#endif +/* * The total number of L2 queues, MSIX vectors and HW contexts (CIDs) is * control by the number of fast-path status blocks supported by the
@@ -1650,10 +1662,10 @@ struct bnx2x {dma_addr_t fw_stats_data_mapping;int fw_stats_data_sz; -/* For max 196 cids (64*3 + non-eth), 32KB ILT page size and 1KB +/* For max 1024 cids (VF RSS), 32KB ILT page size and 1KB * context size we need 8 ILT entries. */ -#define ILT_MAX_L2_LINES 8 +#define ILT_MAX_L2_LINES 32struct hw_context context[ILT_MAX_L2_LINES ];struct bnx2x_ilt *ilt;
@@ -1869,7 +1881,7 @@ extern int num_queues;#define FUNC_FLG_TPA 0x0008#define FUNC_FLG_SPQ 0x0010#define FUNC_FLG_LEADING 0x0020/* PF only */ - +#define FUNC_FLG_LEADING_STATS 0x0040struct bnx2x_func_init_params {/* dma */ dma_addr_t fw_stat_map;/* valid iff FUNC_FLG_STATS */
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +5 -0
@@ -4784,6 +4784,11 @@ int bnx2x_resume(struct pci_dev *pdev)void bnx2x_set_ctx_validation (struct bnx2x *bp,struct eth_context *cxt,u32 cid) { +if (!cxt) { +BNX2X_ERR ("bad context pointer %p\n" , cxt); +return ; + } +/* ustorm cxt validation */ cxt->ustorm_ag_context.cdu_usage = CDU_RSRVD_VALUE_TYPE_A(HW_CID(bp, cid),
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +1 -1
@@ -6893,7 +6893,7 @@ static int bnx2x_init_hw_common(struct bnx2x *bp)bnx2x_init_block (bp,BLOCK_TM ,PHASE_COMMON );bnx2x_init_block (bp,BLOCK_DORQ ,PHASE_COMMON ); -REG_WR (bp,DORQ_REG_DPM_CID_OFST ,BNX2X_DB_SHIFT ); +if (!CHIP_REV_IS_SLOW (bp))/* enable hw interrupt from doorbell Q */ REG_WR (bp,DORQ_REG_DORQ_INT_MASK ,0 );
drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h +1 -0
@@ -6335,6 +6335,7 @@#define PCI_ID_VAL2 0x438#define PCI_ID_VAL3 0x43c +#define GRC_CONFIG_REG_VF_MSIX_CONTROL 0x61C#define GRC_CONFIG_REG_PF_INIT_VF 0x624#define GRC_CR_PF_INIT_VF_PF_FIRST_VF_NUM_MASK 0xf/* First VF_NUM for PF is encoded in this register.
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c +10 -0
@@ -4416,6 +4416,16 @@ void bnx2x_init_rss_config_obj(struct bnx2x *bp, rss_obj->config_rss = bnx2x_setup_rss; } +int validate_vlan_mac (struct bnx2x *bp, +struct bnx2x_vlan_mac_obj *vlan_mac) +{ +if (!vlan_mac->get_n_elements) { +BNX2X_ERR ("vlan mac object was not intialized\n" ); +return -EINVAL ; + } +return 0 ; +} +/********************** Queue state object ***********************************/ /**
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h +2 -0
@@ -1407,4 +1407,6 @@ int bnx2x_config_rss(struct bnx2x *bp,void bnx2x_get_rss_ind_table (struct bnx2x_rss_config_obj *rss_obj,u8 *ind_table); +int validate_vlan_mac (struct bnx2x *bp, +struct bnx2x_vlan_mac_obj *vlan_mac);#endif /* BNX2X_SP_VERBS */
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +273 -113
751 lines not on this page · raw message
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h +24 -8
@@ -81,6 +81,7 @@ struct bnx2x_vf_queue {u32 cid;u16 index;u16 sb_idx; +bool is_leading; };/* struct bnx2x_vfop_qctor_params - prepare queue construction parameters:
@@ -194,6 +195,7 @@ struct bnx2x_virtf {#define VF_CFG_INT_SIMD 0x0008#define VF_CACHE_LINE 0x0010#define VF_CFG_VLAN 0x0020 +#define VF_CFG_STATS_COALESCE 0x0040u8 state;#define VF_FREE 0/* VF ready to be acquired holds no resc */
@@ -213,6 +215,7 @@ struct bnx2x_virtf {/* dma */ dma_addr_t fw_stat_map;/* valid iff VF_CFG_STATS */ +u16 stats_stride;dma_addr_t spq_map;dma_addr_t bulletin_map;
@@ -239,7 +242,10 @@ struct bnx2x_virtf {u8 igu_base_id;/* base igu status block id */ struct bnx2x_vf_queue *vfqs; -#define bnx2x_vfq (vf, nr, var) ((vf)->vfqs[(nr)].var) +#define LEADING_IDX 0 +#define bnx2x_vfq_is_leading (vfq) ((vfq)->index == LEADING_IDX) +#define bnx2x_vfq (vf, nr, var) ((vf)->vfqs[(nr)].var) +#define bnx2x_leading_vfq (vf, var) ((vf)->vfqs[LEADING_IDX].var)u8 index;/* index in the vf array */ u8 abs_vfid;
@@ -358,6 +364,10 @@ struct bnx2x_vf_sp {struct client_init_ramrod_data init_data;struct client_update_ramrod_data update_data; } q_data; + +union { +struct eth_rss_update_ramrod_data e2; + } rss_rdata; };struct hw_dma {
@@ -403,6 +413,10 @@ struct bnx2x_vfdb {#define FLRD_VFS_DWORDS (BNX2X_MAX_NUM_OF_VFS / 32)u32 flrd_vfs[FLRD_VFS_DWORDS ]; + +/* the number of msix vectors belonging to this PF designated for VFs */ +u16 vf_sbs_pool; +u16 first_vf_igu_entry; };/* queue access */
@@ -411,11 +425,6 @@ static inline struct bnx2x_vf_queue *vfq_get(struct bnx2x_virtf *vf, u8 index)return &(vf->vfqs[index]); } -static inline bool vfq_is_leading (struct bnx2x_vf_queue *vfq) -{ -return (vfq->index ==0 ); -} -/* FW ids */ static inline u8 vf_igu_sb (struct bnx2x_virtf *vf,u16 sb_idx) {
@@ -434,7 +443,10 @@ static u8 vfq_cl_id(struct bnx2x_virtf *vf, struct bnx2x_vf_queue *q)static inline u8 vfq_stat_id (struct bnx2x_virtf *vf,struct bnx2x_vf_queue *q) { -return vfq_cl_id (vf, q); +if (vf->cfg_flags &VF_CFG_STATS_COALESCE ) +return vf->leading_rss; +else +return vfq_cl_id (vf, q); }static inline u8 vfq_qzone_id (struct bnx2x_virtf *vf,struct bnx2x_vf_queue *q)
@@ -691,6 +703,10 @@ int bnx2x_vfop_release_cmd(struct bnx2x *bp,struct bnx2x_virtf *vf, struct bnx2x_vfop_cmd *cmd); +int bnx2x_vfop_rss_cmd (struct bnx2x *bp, +struct bnx2x_virtf *vf, +struct bnx2x_vfop_cmd *cmd); +/* VF release ~ VF close + VF release-resources * * Release is the ultimate SW shutdown and is called whenever an
@@ -758,7 +774,7 @@ int bnx2x_enable_sriov(struct bnx2x *bp);void bnx2x_disable_sriov (struct bnx2x *bp);static inline int bnx2x_vf_headroom (struct bnx2x *bp) { -return bp->vfdb->sriov.nr_virtfn *BNX2X_CLIENTS_PER_VF ; +return bp->vfdb->sriov.nr_virtfn *BNX2X_CIDS_PER_VF ; }void bnx2x_pf_set_vfs_vlan (struct bnx2x *bp);int bnx2x_sriov_configure (struct pci_dev *dev,int num_vfs);
drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c +137 -9
213 lines not on this page · raw message
drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h +38 -3
89 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH 2/2 bnx2x: VF RSS support - VF side
In reply to Ariel EliorIn this patch capabilities are added to the Vf driver to request multiple queues over the VF PF channel, and the logic for requesting rss configuration for said queues.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 85 ++++++++++---------- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 7 +- .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 4 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 27 ++++-- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 7 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 75 +++++++++++++++++- 6 files changed, 145 insertions(+), 60 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +43 -42
@@ -1942,7 +1942,7 @@ static void bnx2x_set_rx_buf_size(struct bnx2x *bp) } } -static int bnx2x_init_rss_pf (struct bnx2x *bp) +static int bnx2x_init_rss (struct bnx2x *bp) {int i;u8 num_eth_queues =BNX2X_NUM_ETH_QUEUES (bp);
@@ -1966,8 +1966,8 @@ static int bnx2x_init_rss_pf(struct bnx2x *bp)return bnx2x_config_rss_eth (bp, bp->port.pmf || !CHIP_IS_E1x (bp)); } -int bnx2x_config_rss_pf (struct bnx2x *bp,struct bnx2x_rss_config_obj *rss_obj, -bool config_hash) +int bnx2x_rss (struct bnx2x *bp,struct bnx2x_rss_config_obj *rss_obj, +bool config_hash,bool enable) {struct bnx2x_config_rss_params params = {NULL };
@@ -1982,17 +1982,21 @@ int bnx2x_config_rss_pf(struct bnx2x *bp, struct bnx2x_rss_config_obj *rss_obj,__set_bit (RAMROD_COMP_WAIT , ¶ms.ramrod_flags); -__set_bit (BNX2X_RSS_MODE_REGULAR , ¶ms.rss_flags); - -/* RSS configuration */ -__set_bit (BNX2X_RSS_IPV4 , ¶ms.rss_flags); -__set_bit (BNX2X_RSS_IPV4_TCP , ¶ms.rss_flags); -__set_bit (BNX2X_RSS_IPV6 , ¶ms.rss_flags); -__set_bit (BNX2X_RSS_IPV6_TCP , ¶ms.rss_flags); -if (rss_obj->udp_rss_v4) -__set_bit (BNX2X_RSS_IPV4_UDP , ¶ms.rss_flags); -if (rss_obj->udp_rss_v6) -__set_bit (BNX2X_RSS_IPV6_UDP , ¶ms.rss_flags); +if (enable) { +__set_bit (BNX2X_RSS_MODE_REGULAR , ¶ms.rss_flags); + +/* RSS configuration */ +__set_bit (BNX2X_RSS_IPV4 , ¶ms.rss_flags); +__set_bit (BNX2X_RSS_IPV4_TCP , ¶ms.rss_flags); +__set_bit (BNX2X_RSS_IPV6 , ¶ms.rss_flags); +__set_bit (BNX2X_RSS_IPV6_TCP , ¶ms.rss_flags); +if (rss_obj->udp_rss_v4) +__set_bit (BNX2X_RSS_IPV4_UDP , ¶ms.rss_flags); +if (rss_obj->udp_rss_v6) +__set_bit (BNX2X_RSS_IPV6_UDP , ¶ms.rss_flags); + }else { +__set_bit (BNX2X_RSS_MODE_DISABLED , ¶ms.rss_flags); + }/* Hash bits */ params.rss_result_mask =MULTI_MASK ;
@@ -2001,11 +2005,14 @@ int bnx2x_config_rss_pf(struct bnx2x *bp, struct bnx2x_rss_config_obj *rss_obj,if (config_hash) {/* RSS keys */ -prandom_bytes (params.rss_key,sizeof (params.rss_key)); +prandom_bytes (params.rss_key,T_ETH_RSS_KEY *4 );__set_bit (BNX2X_RSS_SET_SRCH , ¶ms.rss_flags); } -return bnx2x_config_rss (bp, ¶ms); +if (IS_PF (bp)) +return bnx2x_config_rss (bp, ¶ms); +else +return bnx2x_vfpf_config_rss (bp, ¶ms); }static int bnx2x_init_hw (struct bnx2x *bp,u32 load_code)
@@ -2645,38 +2652,32 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)/* initialize FW coalescing state machines in RAM */ bnx2x_update_coalesce (bp); + } -/* setup the leading queue */ - rc =bnx2x_setup_leading (bp); -if (rc) { -BNX2X_ERR ("Setup leading failed!\n" ); -LOAD_ERROR_EXIT (bp, load_error3); - } - -/* set up the rest of the queues */ -for_each_nondefault_eth_queue (bp, i) { - rc =bnx2x_setup_queue (bp, &bp->fp[i],0 ); -if (rc) { -BNX2X_ERR ("Queue setup failed\n" ); -LOAD_ERROR_EXIT (bp, load_error3); - } - } +/* setup the leading queue */ + rc =bnx2x_setup_leading (bp); +if (rc) { +BNX2X_ERR ("Setup leading failed!\n" ); +LOAD_ERROR_EXIT (bp, load_error3); + } -/* setup rss */ - rc =bnx2x_init_rss_pf (bp); +/* set up the rest of the queues */ +for_each_nondefault_eth_queue (bp, i) { +if (IS_PF (bp)) + rc =bnx2x_setup_queue (bp, &bp->fp[i], false); +else /* VF */ + rc =bnx2x_vfpf_setup_q (bp, &bp->fp[i], false);if (rc) { -BNX2X_ERR ("PF RSS init failed\n" ); +BNX2X_ERR ("Queue %d setup failed\n" , i);LOAD_ERROR_EXIT (bp, load_error3); } + } - }else {/* vf */ -for_each_eth_queue (bp, i) { - rc =bnx2x_vfpf_setup_q (bp, i); -if (rc) { -BNX2X_ERR ("Queue setup failed\n" ); -LOAD_ERROR_EXIT (bp, load_error3); - } - } +/* setup rss */ + rc =bnx2x_init_rss (bp); +if (rc) { +BNX2X_ERR ("PF RSS init failed\n" ); +LOAD_ERROR_EXIT (bp, load_error3); }/* Now when Clients are configured we are ready to work */
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +4 -3
@@ -105,9 +105,10 @@ void bnx2x_send_unload_done(struct bnx2x *bp, bool keep_link);* @rss_obj: RSS object to use * @ind_table: indirection table to configure * @config_hash: re-configure RSS hash keys configuration +* @enable: enabled or disabled configuration */ -int bnx2x_config_rss_pf (struct bnx2x *bp,struct bnx2x_rss_config_obj *rss_obj, -bool config_hash); +int bnx2x_rss (struct bnx2x *bp,struct bnx2x_rss_config_obj *rss_obj, +bool config_hash,bool enable);/** * bnx2x__init_func_obj - init function object
@@ -980,7 +981,7 @@ static inline int func_by_vn(struct bnx2x *bp, int vn)static inline int bnx2x_config_rss_eth (struct bnx2x *bp,bool config_hash) { -return bnx2x_config_rss_pf (bp, &bp->rss_conf_obj, config_hash); +return bnx2x_rss (bp, &bp->rss_conf_obj, config_hash, true); }/**
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +2 -2
@@ -3281,14 +3281,14 @@ static int bnx2x_set_rss_flags(struct bnx2x *bp, struct ethtool_rxnfc *info)DP (BNX2X_MSG_ETHTOOL ,"rss re-configured, UDP 4-tupple %s\n" , udp_rss_requested ?"enabled" :"disabled" ); -return bnx2x_config_rss_pf (bp, &bp->rss_conf_obj,0 ); +return bnx2x_rss (bp, &bp->rss_conf_obj, false, true); }else if ((info->flow_type ==UDP_V6_FLOW ) && (bp->rss_conf_obj.udp_rss_v6 != udp_rss_requested)) { bp->rss_conf_obj.udp_rss_v6 = udp_rss_requested;DP (BNX2X_MSG_ETHTOOL ,"rss re-configured, UDP 4-tupple %s\n" , udp_rss_requested ?"enabled" :"disabled" ); -return bnx2x_config_rss_pf (bp, &bp->rss_conf_obj,0 ); +return bnx2x_rss (bp, &bp->rss_conf_obj, false, true); }return 0 ;
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +18 -9
@@ -8060,7 +8060,10 @@ int bnx2x_set_eth_mac(struct bnx2x *bp, bool set)int bnx2x_setup_leading (struct bnx2x *bp) { -return bnx2x_setup_queue (bp, &bp->fp[0 ],1 ); +if (IS_PF (bp)) +return bnx2x_setup_queue (bp, &bp->fp[0 ], true); +else /* VF */ +return bnx2x_vfpf_setup_q (bp, &bp->fp[0 ], true); }/**
@@ -8074,8 +8077,10 @@ int bnx2x_set_int_mode(struct bnx2x *bp) {int rc =0 ; -if (IS_VF (bp) && int_mode !=BNX2X_INT_MODE_MSIX ) +if (IS_VF (bp) && int_mode !=BNX2X_INT_MODE_MSIX ) { +BNX2X_ERR ("VF not loaded since interrupt mode not msix\n" );return -EINVAL ; + }switch (int_mode) {case BNX2X_INT_MODE_MSIX :
@@ -11658,9 +11663,11 @@ static int bnx2x_init_bp(struct bnx2x *bp)* second status block for the L2 queue, and a third status block for * CNIC if supported. */ -if (CNIC_SUPPORT (bp)) +if (IS_VF (bp)) + bp->min_msix_vec_cnt =1 ; +else if (CNIC_SUPPORT (bp)) bp->min_msix_vec_cnt =3 ; -else +else /* PF w/o cnic */ bp->min_msix_vec_cnt =2 ;BNX2X_DEV_INFO ("bp->min_msix_vec_cnt %d" , bp->min_msix_vec_cnt);
@@ -12571,8 +12578,7 @@ static int bnx2x_set_qm_cid_count(struct bnx2x *bp)* @dev: pci device * */ -static int bnx2x_get_num_non_def_sbs (struct pci_dev *pdev, -int cnic_cnt,bool is_vf) +static int bnx2x_get_num_non_def_sbs (struct pci_dev *pdev,int cnic_cnt) {int index;u16 control =0 ;
@@ -12598,7 +12604,7 @@ static int bnx2x_get_num_non_def_sbs(struct pci_dev *pdev, index = control &PCI_MSIX_FLAGS_QSIZE ; -return is_vf ? index +1 : index; +return index; }static int set_max_cos_est (int chip_id)
@@ -12678,10 +12684,13 @@ static int bnx2x_init_one(struct pci_dev *pdev, is_vf =set_is_vf (ent->driver_data); cnic_cnt = is_vf ?0 :1 ; - max_non_def_sbs =bnx2x_get_num_non_def_sbs (pdev, cnic_cnt, is_vf); + max_non_def_sbs =bnx2x_get_num_non_def_sbs (pdev, cnic_cnt); + +/* add another SB for VF as it has no default SB */ + max_non_def_sbs += is_vf ?1 :0 ;/* Maximum number of RSS queues: one IGU SB goes to CNIC */ - rss_count = is_vf ?1 : max_non_def_sbs - cnic_cnt; + rss_count = max_non_def_sbs - cnic_cnt;if (rss_count <1 )return -EINVAL ;
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h +5 -2
@@ -746,9 +746,12 @@ int bnx2x_vfpf_release(struct bnx2x *bp);int bnx2x_vfpf_release (struct bnx2x *bp);int bnx2x_vfpf_init (struct bnx2x *bp);void bnx2x_vfpf_close_vf (struct bnx2x *bp); -int bnx2x_vfpf_setup_q (struct bnx2x *bp,int fp_idx); +int bnx2x_vfpf_setup_q (struct bnx2x *bp,struct bnx2x_fastpath *fp, +bool is_leading);int bnx2x_vfpf_teardown_queue (struct bnx2x *bp,int qidx);int bnx2x_vfpf_config_mac (struct bnx2x *bp,u8 *addr,u8 vf_qid,bool set); +int bnx2x_vfpf_config_rss (struct bnx2x *bp, +struct bnx2x_config_rss_params *params);int bnx2x_vfpf_set_mcast (struct net_device *dev);int bnx2x_vfpf_storm_rx_mode (struct bnx2x *bp);
@@ -809,7 +812,7 @@ static inline int bnx2x_vfpf_acquire(struct bnx2x *bp,static inline int bnx2x_vfpf_release (struct bnx2x *bp) {return 0 ; }static inline int bnx2x_vfpf_init (struct bnx2x *bp) {return 0 ; }static inline void bnx2x_vfpf_close_vf (struct bnx2x *bp) {} -static inline int bnx2x_vfpf_setup_q (struct bnx2x *bp,int fp_idx) {return 0 ; } +static inline int bnx2x_vfpf_setup_q (struct bnx2x *bp,struct bnx2x_fastpath *fp,bool is_leading) {return 0 ; }static inline int bnx2x_vfpf_teardown_queue (struct bnx2x *bp,int qidx) {return 0 ; }static inline int bnx2x_vfpf_config_mac (struct bnx2x *bp,u8 *addr,u8 vf_qid,bool set) {return 0 ; }
drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c +73 -2
102 lines not on this page · raw message
Signature · 1 line
1.7.1
David Miller
maintainerFrom: "Ariel Elior" <[email protected]>
Date: Wed, 4 Sep 2013 14:09:20 +0300
Quoted 9 lines
This patch series adds the capability for VF functions to use multiple queues and Receive / Transmit side scaling.
Patch #1 enhances the PF's side database to allow for multiple queues per PF and configure the HW appropriately, and the PF side of the VF PF channel message for configuring the RSS.
Patch #2 adds to the VF side the ability to request multiple queues, and if obtained to configure RSS for them over the VF PF channel.
Series applied, thanks.
Quoted 6 lines · David Miller
From: "Ariel Elior" <[email protected]>
Date: Wed, 4 Sep 2013 14:09:20 +0300Quoted 3 lines
This patch series adds the capability for VF functions to use multiple queues and Receive / Transmit side scaling.
Quoted 8 lines
Quoted 6 lines
Patch #1 enhances the PF's side database to allow for multiple queues per PF and configure the HW appropriately, and the PF side of the VF PF channel message for configuring the RSS.
Patch #2 adds to the VF side the ability to request multiple queues, and if obtained to configure RSS for them over the VF PF channel.
Series applied, thanks.
Hmmm
CC [M] drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.odrivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c: In function 'bnx2x_rss':drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c:2021:3: error: implicit declaration of function 'bnx2x_vfpf_config_rss' [-Werror=implicit-function-declaration]
cc1: some warnings being treated as errors
make[6]: *** [drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.o] Error 1
make[5]: *** [drivers/net/ethernet/broadcom/bnx2x] Error 2
make[4]: *** [drivers/net/ethernet/broadcom] Error 2
make[3]: *** [drivers/net/ethernet] Error 2
make[2]: *** [drivers/net] Error 2
make[1]: *** [drivers] Error 2
Quoted 18 lines · Eric Dumazet
Quoted 6 lines · David Miller
From: "Ariel Elior" <[email protected]>
Date: Wed, 4 Sep 2013 14:09:20 +0300Quoted 3 lines
This patch series adds the capability for VF functions to use multiple queues and Receive / Transmit side scaling.
Quoted 8 lines
Quoted 6 lines
Patch #1 enhances the PF's side database to allow for multiple queues per PF and configure the HW appropriately, and the PF side of the VF PF channel message for configuring the RSS.
Patch #2 adds to the VF side the ability to request multiple queues, and if obtained to configure RSS for them over the VF PF channel.
Series applied, thanks.
Hmmm
Quoted 11 lines
CC [M]
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.odrivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c: In function 'bnx2x_rss':drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c:2021:3: error: implicit declaration of function 'bnx2x_vfpf_config_rss' [-Werror=implicit-function-declaration]
cc1: some warnings being treated as errors
make[6]: *** [drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.o] Error 1
make[5]: *** [drivers/net/ethernet/broadcom/bnx2x] Error 2
make[4]: *** [drivers/net/ethernet/broadcom] Error 2
make[3]: *** [drivers/net/ethernet] Error 2
make[2]: *** [drivers/net] Error 2
make[1]: *** [drivers] Error 2
root@edumazet-glaptop:/usr/src/net-next# grep BNX2 .config CONFIG_SCSI_BNX2_ISCSI=m CONFIG_SCSI_BNX2X_FCOE=m CONFIG_BNX2=m CONFIG_BNX2X=m # CONFIG_BNX2X_SRIOV is not set