openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bnx2x: ETS changes 

Fix a problem when new traffic class is created with 0% BW, the ETS is not conforming.

Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yaniv Rosner 2011-11-28 00:49:46 +00:00 committed by David S. Miller
parent 866cedae51
commit 870516e173
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
View File

@ -874,23 +874,36 @@ static int bnx2x_ets_e3b0_set_cos_bw(struct bnx2x *bp,
******************************************************************************/ ******************************************************************************/
static int bnx2x_ets_e3b0_get_total_bw( static int bnx2x_ets_e3b0_get_total_bw(
const struct link_params *params, const struct link_params *params,
const struct bnx2x_ets_params *ets_params, struct bnx2x_ets_params *ets_params,
u16 *total_bw) u16 *total_bw)
{ {
struct bnx2x *bp = params->bp; struct bnx2x *bp = params->bp;
u8 cos_idx = 0; u8 cos_idx = 0;
u8 is_bw_cos_exist = 0;
*total_bw = 0 ; *total_bw = 0 ;
/* Calculate total BW requested */ /* Calculate total BW requested */
for (cos_idx = 0; cos_idx < ets_params->num_of_cos; cos_idx++) { for (cos_idx = 0; cos_idx < ets_params->num_of_cos; cos_idx++) {
if (bnx2x_cos_state_bw == ets_params->cos[cos_idx].state) { if (bnx2x_cos_state_bw == ets_params->cos[cos_idx].state) {
is_bw_cos_exist = 1;
if (!ets_params->cos[cos_idx].params.bw_params.bw) {
DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config BW"
"was set to 0\n");
/*
* This is to prevent a state when ramrods
* can't be sent
*/
ets_params->cos[cos_idx].params.bw_params.bw
= 1;
}
*total_bw += *total_bw +=
ets_params->cos[cos_idx].params.bw_params.bw; ets_params->cos[cos_idx].params.bw_params.bw;
} }
} }
/* Check total BW is valid */ /* Check total BW is valid */
if ((100 != *total_bw) || (0 == *total_bw)) { if ((1 == is_bw_cos_exist) && (100 != *total_bw)) {
if (0 == *total_bw) { if (0 == *total_bw) {
DP(NETIF_MSG_LINK, DP(NETIF_MSG_LINK,
"bnx2x_ets_E3B0_config toatl BW shouldn't be 0\n"); "bnx2x_ets_E3B0_config toatl BW shouldn't be 0\n");
@ -1100,7 +1113,7 @@ static int bnx2x_ets_e3b0_sp_set_pri_cli_reg(const struct link_params *params,
******************************************************************************/ ******************************************************************************/
int bnx2x_ets_e3b0_config(const struct link_params *params, int bnx2x_ets_e3b0_config(const struct link_params *params,
const struct link_vars *vars, const struct link_vars *vars,
const struct bnx2x_ets_params *ets_params) struct bnx2x_ets_params *ets_params)
{ {
struct bnx2x *bp = params->bp; struct bnx2x *bp = params->bp;
int bnx2x_status = 0; int bnx2x_status = 0;

2
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
View File

@ -479,7 +479,7 @@ int bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos);
/* Configure the COS to ETS according to BW and SP settings.*/ /* Configure the COS to ETS according to BW and SP settings.*/
int bnx2x_ets_e3b0_config(const struct link_params *params, int bnx2x_ets_e3b0_config(const struct link_params *params,
const struct link_vars *vars, const struct link_vars *vars,
const struct bnx2x_ets_params *ets_params); struct bnx2x_ets_params *ets_params);
/* Read pfc statistic*/ /* Read pfc statistic*/
void bnx2x_pfc_statistic(struct link_params *params, struct link_vars *vars, void bnx2x_pfc_statistic(struct link_params *params, struct link_vars *vars,
u32 pfc_frames_sent[2], u32 pfc_frames_sent[2],