bnx2x: add DCB support
Subsystems (2)
PATCH 3/8 bnx2x: add DCB support
Adding DCB initialization and handling on 57712 FW/HW
Signed-off-by Dmitry Kravkov <[email protected]>
Signed-off-by Shmulik Ravid-Rabinovitz <[email protected]>
Signed-off-by Eilon Greenstein <[email protected]>
--- drivers/net/bnx2x/Makefile | 2 +- drivers/net/bnx2x/bnx2x.h | 15 + drivers/net/bnx2x/bnx2x_cmn.c | 2 + drivers/net/bnx2x/bnx2x_cmn.h | 7 + drivers/net/bnx2x/bnx2x_dcb.c | 1491 ++++++++++++++++++++++++++++++++++++++++ drivers/net/bnx2x/bnx2x_dcb.h | 193 ++++++ drivers/net/bnx2x/bnx2x_hsi.h | 281 ++++++++- drivers/net/bnx2x/bnx2x_link.h | 40 ++ drivers/net/bnx2x/bnx2x_main.c | 24 +- 9 files changed, 2050 insertions(+), 5 deletions(-) create mode 100644 drivers/net/bnx2x/bnx2x_dcb.c create mode 100644 drivers/net/bnx2x/bnx2x_dcb.h
drivers/net/bnx2x/Makefile +1 -1
@@ -4,4 +4,4 @@ obj-$(CONFIG_BNX2X) += bnx2x.o -bnx2x-objs := bnx2x_main.o bnx2x_link.o bnx2x_cmn.o bnx2x_ethtool.o bnx2x_stats.o +bnx2x-objs := bnx2x_main.o bnx2x_link.o bnx2x_cmn.o bnx2x_ethtool.o bnx2x_stats.o bnx2x_dcb.o
drivers/net/bnx2x/bnx2x.h +15 -0
@@ -50,6 +50,7 @@#include "bnx2x_fw_defs.h" #include "bnx2x_hsi.h" #include "bnx2x_link.h" +#include "bnx2x_dcb.h" #include "bnx2x_stats.h" /* error/debug prints */
@@ -820,6 +821,8 @@ struct bnx2x_slowpath {u32 wb_comp;u32 wb_data[4 ]; +/* pfc configuration for DCBX ramrod */ +struct flow_control_configuration pfc_config; };#define bnx2x_sp (bp, var) (&bp->slowpath->var)
@@ -1180,6 +1183,18 @@ struct bnx2x {char fw_ver[32 ];const struct firmware *firmware; +/* LLDP params */ +struct bnx2x_config_lldp_params lldp_config_params; + +/* DCBX params */ +struct bnx2x_config_dcbx_params dcbx_config_params; + +struct bnx2x_dcbx_port_params dcbx_port_params; +int dcb_version; + +/* DCBX Negotation results */ +struct dcbx_features dcbx_local_feat; +u32 dcbx_error; };/**
drivers/net/bnx2x/bnx2x_cmn.c +2 -0
@@ -1373,6 +1373,8 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode) } } +bnx2x_dcbx_init (bp); + bp->state =BNX2X_STATE_OPENING_WAIT4_PORT ; rc =bnx2x_func_start (bp);
drivers/net/bnx2x/bnx2x_cmn.h +7 -0
@@ -324,6 +324,13 @@ int bnx2x_func_start(struct bnx2x *bp);void bnx2x_ilt_set_info (struct bnx2x *bp);/** +* Inintialize dcbx protocol +* +* @param bp +*/ +void bnx2x_dcbx_init (struct bnx2x *bp); + +/** * Set power state to the requested value. Currently only D0 and * D3hot are supported. *
drivers/net/bnx2x/bnx2x_dcb.c new file +1491 -0
1,491 lines not on this page · raw message
drivers/net/bnx2x/bnx2x_dcb.h new file +193 -0
193 lines not on this page · raw message
drivers/net/bnx2x/bnx2x_hsi.h +279 -2
323 lines not on this page · raw message
drivers/net/bnx2x/bnx2x_link.h +40 -0
@@ -216,6 +216,7 @@ struct link_params {u32 feature_config_flags;#define FEATURE_CONFIG_OVERRIDE_PREEMPHASIS_ENABLED (1<<0) +#define FEATURE_CONFIG_PFC_ENABLED (1<<1)#define FEATURE_CONFIG_BC_SUPPORTS_OPT_MDL_VRFY (1<<2)#define FEATURE_CONFIG_BC_SUPPORTS_DUAL_PHY_OPT_MDL_VRFY (1<<3)/* Will be populated during common init */
@@ -332,4 +333,43 @@ u8 bnx2x_phy_probe(struct link_params *params);u8 bnx2x_fan_failure_det_req (struct bnx2x *bp,u32 shmem_base,u32 shmem2_base,u8 port); +/* PFC port configuration params */ +struct bnx2x_nig_brb_pfc_port_params { +/* NIG */ +u32 pause_enable; +u32 llfc_out_en; +u32 llfc_enable; +u32 pkt_priority_to_cos; +u32 rx_cos0_priority_mask; +u32 rx_cos1_priority_mask; +u32 llfc_high_priority_classes; +u32 llfc_low_priority_classes; +/* BRB */ +u32 cos0_pauseable; +u32 cos1_pauseable; +}; + +/** +* Used to update the PFC attributes in EMAC, BMAC, NIG and BRB +* when link is already up +*/ +void bnx2x_update_pfc (struct link_params *params, +struct link_vars *vars, +struct bnx2x_nig_brb_pfc_port_params *pfc_params); + + +/* Used to configure the ETS to disable */ +void bnx2x_ets_disabled (struct link_params *params); + +/* Used to configure the ETS to BW limited */ +void bnx2x_ets_bw_limit (const struct link_params *params,const u32 cos0_bw, +const u32 cos1_bw); + +/* Used to configure the ETS to strict */ +u8 bnx2x_ets_strict (const struct link_params *params,const u8 strict_cos); + +/* Read pfc statistic*/ +void bnx2x_pfc_statistic (struct link_params *params,struct link_vars *vars, +u32 pfc_frames_sent[2 ], +u32 pfc_frames_received[2 ]);#endif /* BNX2X_LINK_H */
drivers/net/bnx2x/bnx2x_main.c +22 -2
@@ -55,6 +55,7 @@#include "bnx2x_init.h" #include "bnx2x_init_ops.h" #include "bnx2x_cmn.h" +#include "bnx2x_dcb.h" #include <linux/firmware.h> #include "bnx2x_fw_file_hdr.h"
@@ -3105,6 +3106,11 @@ static inline void bnx2x_attn_int_deasserted3(struct bnx2x *bp, u32 attn)if ((bp->port.pmf ==0 ) && (val &DRV_STATUS_PMF ))bnx2x_pmf_update (bp); +if (bp->port.pmf && + (val &DRV_STATUS_DCBX_NEGOTIATION_RESULTS )) +/* start dcbx state machine */ +bnx2x_dcbx_set_params (bp, +BNX2X_DCBX_STATE_NEG_RECEIVED ); }else if (attn &BNX2X_MC_ASSERT_BITS ) {BNX2X_ERR ("MC assert!\n" );
@@ -3724,6 +3730,15 @@ static void bnx2x_eq_int(struct bnx2x *bp)BNX2X_FP_STATE_CLOSED ; goto next_spqe; + +case EVENT_RING_OPCODE_STOP_TRAFFIC : +DP (NETIF_MSG_IFUP ,"got STOP TRAFFIC\n" ); +bnx2x_dcbx_set_params (bp,BNX2X_DCBX_STATE_TX_PAUSED ); + goto next_spqe; +case EVENT_RING_OPCODE_START_TRAFFIC : +DP (NETIF_MSG_IFUP ,"got START TRAFFIC\n" ); +bnx2x_dcbx_set_params (bp,BNX2X_DCBX_STATE_TX_RELEASED ); + goto next_spqe; }switch (opcode | bp->state) {
@@ -4363,6 +4378,7 @@ static void bnx2x_init_internal_common(struct bnx2x *bp)static void bnx2x_init_internal_port (struct bnx2x *bp) {/* port */ +bnx2x_dcb_init_intmem_pfc (bp); }static void bnx2x_init_internal (struct bnx2x *bp,u32 load_code)
@@ -5488,8 +5504,10 @@ static int bnx2x_init_hw_port(struct bnx2x *bp)* - SF mode: bits 3-7 are masked. only bits 0-2 are in use * - MF mode: bit 3 is masked. bits 0-2 are in use as in SF * bits 4-7 are used for "per vn group attention" */ -REG_WR (bp,MISC_REG_AEU_MASK_ATTN_FUNC_0 + port*4 , - (IS_MF (bp) ?0xF7 :0x7 )); + val =IS_MF (bp) ?0xF7 :0x7 ; +/* Enable DCBX attention for all but E1 */ + val |=CHIP_IS_E1 (bp) ?0 :0x10 ; +REG_WR (bp,MISC_REG_AEU_MASK_ATTN_FUNC_0 + port*4 , val);bnx2x_init_block (bp,PXPCS_BLOCK , init_stage);bnx2x_init_block (bp,EMAC0_BLOCK , init_stage);
@@ -8775,6 +8793,8 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp) bp->timer.data = (unsigned long ) bp; bp->timer.function = bnx2x_timer; +bnx2x_dcbx_init_params (bp); +return rc; }
Signature · 1 line
1.7.1