Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 256505
b: refs/heads/master
c: 6debea8
h: refs/heads/master
i:
  256503: 4074acd
v: v3
  • Loading branch information
Dmitry Kravkov authored and David S. Miller committed Jul 19, 2011
1 parent 908d3e3 commit 0ffb6a0
Show file tree
Hide file tree
Showing 7 changed files with 269 additions and 113 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f13ac41f5165c0ac0441f9d42f7d6f6f9ee7c075
refs/heads/master: 6debea870a66be4aac2e28be0e3952dad6c7fcdb
7 changes: 2 additions & 5 deletions trunk/drivers/net/bnx2x/bnx2x.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,8 @@ struct bnx2x_slowpath {

union {
struct function_start_data func_start;
/* pfc configuration for DCBX ramrod */
struct flow_control_configuration pfc_config;
} func_rdata;

/* used by dmae command executer */
Expand All @@ -980,8 +982,6 @@ 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)
Expand Down Expand Up @@ -1417,9 +1417,6 @@ struct bnx2x {
char fw_ver[32];
const struct firmware *firmware;

/* LLDP params */
struct bnx2x_config_lldp_params lldp_config_params;

/* DCB support on/off */
u16 dcb_state;
#define BNX2X_DCB_STATE_OFF 0
Expand Down
171 changes: 71 additions & 100 deletions trunk/drivers/net/bnx2x/bnx2x_dcb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
#endif

/* forward declarations of dcbx related functions */
static void bnx2x_dcbx_stop_hw_tx(struct bnx2x *bp);
static int bnx2x_dcbx_stop_hw_tx(struct bnx2x *bp);
static void bnx2x_pfc_set_pfc(struct bnx2x *bp);
static void bnx2x_dcbx_update_ets_params(struct bnx2x *bp);
static void bnx2x_dcbx_resume_hw_tx(struct bnx2x *bp);
static int bnx2x_dcbx_resume_hw_tx(struct bnx2x *bp);
static void bnx2x_dcbx_get_ets_pri_pg_tbl(struct bnx2x *bp,
u32 *set_configuration_ets_pg,
u32 *pri_pg_tbl);
Expand All @@ -47,8 +47,25 @@ static void bnx2x_dcbx_separate_pauseable_from_non(struct bnx2x *bp,
struct cos_help_data *cos_data,
u32 *pg_pri_orginal_spread,
struct dcbx_ets_feature *ets);
static void bnx2x_dcbx_fw_struct(struct bnx2x *bp);
static void bnx2x_dcbx_fw_struct(struct bnx2x *bp,
struct bnx2x_func_tx_start_params*);

/* helpers: read/write len bytes from addr into buff by REG_RD/REG_WR */
static void bnx2x_read_data(struct bnx2x *bp, u32 *buff,
u32 addr, u32 len)
{
int i;
for (i = 0; i < len; i += 4, buff++)
*buff = REG_RD(bp, addr + i);
}

static void bnx2x_write_data(struct bnx2x *bp, u32 *buff,
u32 addr, u32 len)
{
int i;
for (i = 0; i < len; i += 4, buff++)
REG_WR(bp, addr + i, *buff);
}

static void bnx2x_pfc_set(struct bnx2x *bp)
{
Expand Down Expand Up @@ -205,7 +222,11 @@ static void bnx2x_dcbx_get_ap_feature(struct bnx2x *bp,
if (GET_FLAGS(error, DCBX_LOCAL_APP_ERROR))
DP(NETIF_MSG_LINK, "DCBX_LOCAL_APP_ERROR\n");

if (app->enabled && !GET_FLAGS(error, DCBX_LOCAL_APP_ERROR)) {
if (GET_FLAGS(error, DCBX_LOCAL_APP_MISMATCH))
DP(NETIF_MSG_LINK, "DCBX_LOCAL_APP_MISMATCH\n");

if (app->enabled &&
!GET_FLAGS(error, DCBX_LOCAL_APP_ERROR | DCBX_LOCAL_APP_MISMATCH)) {

bp->dcbx_port_params.app.enabled = true;

Expand Down Expand Up @@ -300,7 +321,7 @@ static void bnx2x_dcbx_get_pfc_feature(struct bnx2x *bp,
DP(NETIF_MSG_LINK, "DCBX_LOCAL_PFC_ERROR\n");

if (bp->dcbx_port_params.app.enabled &&
!GET_FLAGS(error, DCBX_LOCAL_PFC_ERROR) &&
!GET_FLAGS(error, DCBX_LOCAL_PFC_ERROR | DCBX_LOCAL_PFC_MISMATCH) &&
pfc->enabled) {
bp->dcbx_port_params.pfc.enabled = true;
bp->dcbx_port_params.pfc.priority_non_pauseable_mask =
Expand Down Expand Up @@ -329,8 +350,8 @@ static int bnx2x_dcbx_read_mib(struct bnx2x *bp,
u32 offset,
int read_mib_type)
{
int max_try_read = 0, i;
u32 *buff, mib_size, prefix_seq_num, suffix_seq_num;
int max_try_read = 0;
u32 mib_size, prefix_seq_num, suffix_seq_num;
struct lldp_remote_mib *remote_mib ;
struct lldp_local_mib *local_mib;

Expand All @@ -349,9 +370,7 @@ static int bnx2x_dcbx_read_mib(struct bnx2x *bp,
offset += BP_PORT(bp) * mib_size;

do {
buff = base_mib_addr;
for (i = 0; i < mib_size; i += 4, buff++)
*buff = REG_RD(bp, offset + i);
bnx2x_read_data(bp, base_mib_addr, offset, mib_size);

max_try_read++;

Expand Down Expand Up @@ -382,12 +401,8 @@ static int bnx2x_dcbx_read_mib(struct bnx2x *bp,

static void bnx2x_pfc_set_pfc(struct bnx2x *bp)
{
if (BP_PORT(bp)) {
BNX2X_ERR("4 port mode is not supported");
return;
}

if (bp->dcbx_port_params.pfc.enabled)
if (bp->dcbx_port_params.pfc.enabled &&
!(bp->dcbx_error & DCBX_REMOTE_MIB_ERROR))
/*
* 1. Fills up common PFC structures if required
* 2. Configure NIG, MAC and BRB via the elink
Expand All @@ -397,25 +412,30 @@ static void bnx2x_pfc_set_pfc(struct bnx2x *bp)
bnx2x_pfc_clear(bp);
}

static void bnx2x_dcbx_stop_hw_tx(struct bnx2x *bp)
static int bnx2x_dcbx_stop_hw_tx(struct bnx2x *bp)
{
DP(NETIF_MSG_LINK, "sending STOP TRAFFIC\n");
bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_STOP_TRAFFIC,
0 /* connectionless */,
0 /* dataHi is zero */,
0 /* dataLo is zero */,
NONE_CONNECTION_TYPE);
struct bnx2x_func_state_params func_params = {0};

func_params.f_obj = &bp->func_obj;
func_params.cmd = BNX2X_F_CMD_TX_STOP;

DP(NETIF_MSG_LINK, "STOP TRAFFIC\n");
return bnx2x_func_state_change(bp, &func_params);
}

static void bnx2x_dcbx_resume_hw_tx(struct bnx2x *bp)
static int bnx2x_dcbx_resume_hw_tx(struct bnx2x *bp)
{
bnx2x_dcbx_fw_struct(bp);
DP(NETIF_MSG_LINK, "sending START TRAFFIC\n");
bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_START_TRAFFIC,
0, /* connectionless */
U64_HI(bnx2x_sp_mapping(bp, pfc_config)),
U64_LO(bnx2x_sp_mapping(bp, pfc_config)),
NONE_CONNECTION_TYPE);
struct bnx2x_func_state_params func_params = {0};
struct bnx2x_func_tx_start_params *tx_params =
&func_params.params.tx_start;

func_params.f_obj = &bp->func_obj;
func_params.cmd = BNX2X_F_CMD_TX_START;

bnx2x_dcbx_fw_struct(bp, tx_params);

DP(NETIF_MSG_LINK, "START TRAFFIC\n");
return bnx2x_func_state_change(bp, &func_params);
}

static void bnx2x_dcbx_2cos_limit_update_ets_config(struct bnx2x *bp)
Expand Down Expand Up @@ -522,7 +542,8 @@ static void bnx2x_dcbx_update_ets_params(struct bnx2x *bp)
{
bnx2x_ets_disabled(&bp->link_params, &bp->link_vars);

if (!bp->dcbx_port_params.ets.enabled)
if (!bp->dcbx_port_params.ets.enabled ||
(bp->dcbx_error & DCBX_REMOTE_MIB_ERROR))
return;

if (CHIP_IS_E3B0(bp))
Expand Down Expand Up @@ -739,80 +760,33 @@ void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state)
}
}


#define LLDP_STATS_OFFSET(bp) (BP_PORT(bp)*\
sizeof(struct lldp_dcbx_stat))

/* calculate struct offset in array according to chip information */
#define LLDP_PARAMS_OFFSET(bp) (BP_PORT(bp)*sizeof(struct lldp_params))

#define LLDP_ADMIN_MIB_OFFSET(bp) (PORT_MAX*sizeof(struct lldp_params) + \
BP_PORT(bp)*sizeof(struct lldp_admin_mib))

static void bnx2x_dcbx_lldp_updated_params(struct bnx2x *bp,
u32 dcbx_lldp_params_offset)
{
struct lldp_params lldp_params = {0};
u32 i = 0, *buff = NULL;
u32 offset = dcbx_lldp_params_offset + LLDP_PARAMS_OFFSET(bp);

DP(NETIF_MSG_LINK, "lldp_offset 0x%x\n", offset);

if ((bp->lldp_config_params.overwrite_settings ==
BNX2X_DCBX_OVERWRITE_SETTINGS_ENABLE)) {
/* Read the data first */
buff = (u32 *)&lldp_params;
for (i = 0; i < sizeof(struct lldp_params); i += 4, buff++)
*buff = REG_RD(bp, (offset + i));

lldp_params.msg_tx_hold =
(u8)bp->lldp_config_params.msg_tx_hold;
lldp_params.msg_fast_tx_interval =
(u8)bp->lldp_config_params.msg_fast_tx;
lldp_params.tx_crd_max =
(u8)bp->lldp_config_params.tx_credit_max;
lldp_params.msg_tx_interval =
(u8)bp->lldp_config_params.msg_tx_interval;
lldp_params.tx_fast =
(u8)bp->lldp_config_params.tx_fast;

/* Write the data.*/
buff = (u32 *)&lldp_params;
for (i = 0; i < sizeof(struct lldp_params); i += 4, buff++)
REG_WR(bp, (offset + i) , *buff);


} else if (BNX2X_DCBX_OVERWRITE_SETTINGS_ENABLE ==
bp->lldp_config_params.overwrite_settings)
bp->lldp_config_params.overwrite_settings =
BNX2X_DCBX_OVERWRITE_SETTINGS_INVALID;
}

static void bnx2x_dcbx_admin_mib_updated_params(struct bnx2x *bp,
u32 dcbx_lldp_params_offset)
{
struct lldp_admin_mib admin_mib;
u32 i, other_traf_type = PREDEFINED_APP_IDX_MAX, traf_type = 0;
u32 *buff;
u32 offset = dcbx_lldp_params_offset + LLDP_ADMIN_MIB_OFFSET(bp);

/*shortcuts*/
struct dcbx_features *af = &admin_mib.features;
struct bnx2x_config_dcbx_params *dp = &bp->dcbx_config_params;

memset(&admin_mib, 0, sizeof(struct lldp_admin_mib));
buff = (u32 *)&admin_mib;

/* Read the data first */
for (i = 0; i < sizeof(struct lldp_admin_mib); i += 4, buff++)
*buff = REG_RD(bp, (offset + i));
bnx2x_read_data(bp, (u32 *)&admin_mib, offset,
sizeof(struct lldp_admin_mib));

if (bp->dcbx_enabled == BNX2X_DCBX_ENABLED_ON_NEG_ON)
SET_FLAGS(admin_mib.ver_cfg_flags, DCBX_DCBX_ENABLED);
else
RESET_FLAGS(admin_mib.ver_cfg_flags, DCBX_DCBX_ENABLED);

if ((BNX2X_DCBX_OVERWRITE_SETTINGS_ENABLE ==
dp->overwrite_settings)) {
if (dp->overwrite_settings == BNX2X_DCBX_OVERWRITE_SETTINGS_ENABLE) {

RESET_FLAGS(admin_mib.ver_cfg_flags, DCBX_CEE_VERSION_MASK);
admin_mib.ver_cfg_flags |=
(dp->admin_dcbx_version << DCBX_CEE_VERSION_SHIFT) &
Expand Down Expand Up @@ -908,19 +882,17 @@ static void bnx2x_dcbx_admin_mib_updated_params(struct bnx2x *bp,

af->app.default_pri = (u8)dp->admin_default_priority;

} else if (BNX2X_DCBX_OVERWRITE_SETTINGS_ENABLE ==
dp->overwrite_settings)
dp->overwrite_settings = BNX2X_DCBX_OVERWRITE_SETTINGS_INVALID;
}

/* Write the data. */
buff = (u32 *)&admin_mib;
for (i = 0; i < sizeof(struct lldp_admin_mib); i += 4, buff++)
REG_WR(bp, (offset + i), *buff);
bnx2x_write_data(bp, (u32 *)&admin_mib, offset,
sizeof(struct lldp_admin_mib));

}

void bnx2x_dcbx_set_state(struct bnx2x *bp, bool dcb_on, u32 dcbx_enabled)
{
if (!CHIP_IS_E1x(bp) && !CHIP_MODE_IS_4_PORT(bp)) {
if (!CHIP_IS_E1x(bp)) {
bp->dcb_state = dcb_on;
bp->dcbx_enabled = dcbx_enabled;
} else {
Expand Down Expand Up @@ -1029,9 +1001,6 @@ void bnx2x_dcbx_init(struct bnx2x *bp)
bnx2x_update_drv_flags(bp, DRV_FLAGS_DCB_CONFIGURED, 0);

if (SHMEM_LLDP_DCBX_PARAMS_NONE != dcbx_lldp_params_offset) {
bnx2x_dcbx_lldp_updated_params(bp,
dcbx_lldp_params_offset);

bnx2x_dcbx_admin_mib_updated_params(bp,
dcbx_lldp_params_offset);

Expand All @@ -1043,7 +1012,7 @@ void bnx2x_dcbx_init(struct bnx2x *bp)
}
static void
bnx2x_dcbx_print_cos_params(struct bnx2x *bp,
struct flow_control_configuration *pfc_fw_cfg)
struct bnx2x_func_tx_start_params *pfc_fw_cfg)
{
u8 pri = 0;
u8 cos = 0;
Expand Down Expand Up @@ -1821,17 +1790,19 @@ static void bnx2x_dcbx_get_ets_pri_pg_tbl(struct bnx2x *bp,
}
}

static void bnx2x_dcbx_fw_struct(struct bnx2x *bp)
static void bnx2x_dcbx_fw_struct(struct bnx2x *bp,
struct bnx2x_func_tx_start_params *pfc_fw_cfg)
{
struct flow_control_configuration *pfc_fw_cfg = NULL;
u16 pri_bit = 0;
u8 cos = 0, pri = 0;
struct priority_cos *tt2cos;
u32 *ttp = bp->dcbx_port_params.app.traffic_type_priority;

pfc_fw_cfg = (struct flow_control_configuration *)
bnx2x_sp(bp, pfc_config);
memset(pfc_fw_cfg, 0, sizeof(struct flow_control_configuration));
memset(pfc_fw_cfg, 0, sizeof(*pfc_fw_cfg));

/* to disable DCB - the structure must be zeroed */
if (bp->dcbx_error & DCBX_REMOTE_MIB_ERROR)
return;

/*shortcut*/
tt2cos = pfc_fw_cfg->traffic_type_to_priority_cos;
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/net/bnx2x/bnx2x_hsi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1834,6 +1834,7 @@ struct lldp_local_mib {
#define DCBX_LOCAL_APP_ERROR 0x00000004
#define DCBX_LOCAL_PFC_MISMATCH 0x00000010
#define DCBX_LOCAL_APP_MISMATCH 0x00000020
#define DCBX_REMOTE_MIB_ERROR 0x00000040
struct dcbx_features features;
u32 suffix_seq_num;
};
Expand Down
Loading

0 comments on commit 0ffb6a0

Please sign in to comment.