Skip to content

L
linux
Commit 866cedae authored by Yaniv Rosner's avatar Yaniv Rosner Committed by David S. Miller
Browse files
Options

bnx2x: PFC changes 

Change BRB to work in per class guaranteed mode and handle cases for BW 0%.
Signed-off-by: default avatarYaniv Rosner <yanivr@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 690e99c4
Show whitespace changes
Inline Side-by-side
Showing with 179 additions and 76 deletions
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
View file @ 866cedae
...@@ -163,6 +163,11 @@ ...@@ -163,6 +163,11 @@
#define EDC_MODE_LIMITING 0x0044 #define EDC_MODE_LIMITING 0x0044
#define EDC_MODE_PASSIVE_DAC 0x0055 #define EDC_MODE_PASSIVE_DAC 0x0055
/* BRB default for class 0 E2 */
#define DEFAULT0_E2_BRB_MAC_PAUSE_XOFF_THR 170
#define DEFAULT0_E2_BRB_MAC_PAUSE_XON_THR 250
#define DEFAULT0_E2_BRB_MAC_FULL_XOFF_THR 10
#define DEFAULT0_E2_BRB_MAC_FULL_XON_THR 50
/* BRB thresholds for E2*/ /* BRB thresholds for E2*/
#define PFC_E2_BRB_MAC_PAUSE_XOFF_THR_PAUSE 170 #define PFC_E2_BRB_MAC_PAUSE_XOFF_THR_PAUSE 170
...@@ -177,6 +182,12 @@ ...@@ -177,6 +182,12 @@
#define PFC_E2_BRB_MAC_FULL_XON_THR_PAUSE 50 #define PFC_E2_BRB_MAC_FULL_XON_THR_PAUSE 50
#define PFC_E2_BRB_MAC_FULL_XON_THR_NON_PAUSE 250 #define PFC_E2_BRB_MAC_FULL_XON_THR_NON_PAUSE 250
/* BRB default for class 0 E3A0 */
#define DEFAULT0_E3A0_BRB_MAC_PAUSE_XOFF_THR 290
#define DEFAULT0_E3A0_BRB_MAC_PAUSE_XON_THR 410
#define DEFAULT0_E3A0_BRB_MAC_FULL_XOFF_THR 10
#define DEFAULT0_E3A0_BRB_MAC_FULL_XON_THR 50
/* BRB thresholds for E3A0 */ /* BRB thresholds for E3A0 */
#define PFC_E3A0_BRB_MAC_PAUSE_XOFF_THR_PAUSE 290 #define PFC_E3A0_BRB_MAC_PAUSE_XOFF_THR_PAUSE 290
#define PFC_E3A0_BRB_MAC_PAUSE_XOFF_THR_NON_PAUSE 0 #define PFC_E3A0_BRB_MAC_PAUSE_XOFF_THR_NON_PAUSE 0
...@@ -190,6 +201,11 @@ ...@@ -190,6 +201,11 @@
#define PFC_E3A0_BRB_MAC_FULL_XON_THR_PAUSE 50 #define PFC_E3A0_BRB_MAC_FULL_XON_THR_PAUSE 50
#define PFC_E3A0_BRB_MAC_FULL_XON_THR_NON_PAUSE 410 #define PFC_E3A0_BRB_MAC_FULL_XON_THR_NON_PAUSE 410
/* BRB default for E3B0 */
#define DEFAULT0_E3B0_BRB_MAC_PAUSE_XOFF_THR 330
#define DEFAULT0_E3B0_BRB_MAC_PAUSE_XON_THR 490
#define DEFAULT0_E3B0_BRB_MAC_FULL_XOFF_THR 15
#define DEFAULT0_E3B0_BRB_MAC_FULL_XON_THR 55
/* BRB thresholds for E3B0 2 port mode*/ /* BRB thresholds for E3B0 2 port mode*/
#define PFC_E3B0_2P_BRB_MAC_PAUSE_XOFF_THR_PAUSE 1025 #define PFC_E3B0_2P_BRB_MAC_PAUSE_XOFF_THR_PAUSE 1025
...@@ -251,6 +267,18 @@ ...@@ -251,6 +267,18 @@
#define PFC_E3B0_4P_BRB_MAC_1_CLASS_T_GUART 80 #define PFC_E3B0_4P_BRB_MAC_1_CLASS_T_GUART 80
#define PFC_E3B0_4P_BRB_MAC_1_CLASS_T_GUART_HYST 120 #define PFC_E3B0_4P_BRB_MAC_1_CLASS_T_GUART_HYST 120
/* Pause defines*/
#define DEFAULT_E3B0_BRB_FULL_LB_XOFF_THR 330
#define DEFAULT_E3B0_BRB_FULL_LB_XON_THR 490
#define DEFAULT_E3B0_LB_GUART 40
#define DEFAULT_E3B0_BRB_MAC_0_CLASS_T_GUART 40
#define DEFAULT_E3B0_BRB_MAC_0_CLASS_T_GUART_HYST 0
#define DEFAULT_E3B0_BRB_MAC_1_CLASS_T_GUART 40
#define DEFAULT_E3B0_BRB_MAC_1_CLASS_T_GUART_HYST 0
/* ETS defines*/
#define DCBX_INVALID_COS (0xFF) #define DCBX_INVALID_COS (0xFF)
#define ETS_BW_LIMIT_CREDIT_UPPER_BOUND (0x5000) #define ETS_BW_LIMIT_CREDIT_UPPER_BOUND (0x5000)
...@@ -2009,6 +2037,8 @@ struct bnx2x_pfc_brb_threshold_val { ...@@ -2009,6 +2037,8 @@ struct bnx2x_pfc_brb_threshold_val {
}; };
struct bnx2x_pfc_brb_e3b0_val { struct bnx2x_pfc_brb_e3b0_val {
u32 per_class_guaranty_mode;
u32 lb_guarantied_hyst;
u32 full_lb_xoff_th; u32 full_lb_xoff_th;
u32 full_lb_xon_threshold; u32 full_lb_xon_threshold;
u32 lb_guarantied; u32 lb_guarantied;
...@@ -2021,6 +2051,9 @@ struct bnx2x_pfc_brb_e3b0_val { ...@@ -2021,6 +2051,9 @@ struct bnx2x_pfc_brb_e3b0_val {
struct bnx2x_pfc_brb_th_val { struct bnx2x_pfc_brb_th_val {
struct bnx2x_pfc_brb_threshold_val pauseable_th; struct bnx2x_pfc_brb_threshold_val pauseable_th;
struct bnx2x_pfc_brb_threshold_val non_pauseable_th; struct bnx2x_pfc_brb_threshold_val non_pauseable_th;
struct bnx2x_pfc_brb_threshold_val default_class0;
struct bnx2x_pfc_brb_threshold_val default_class1;
}; };
static int bnx2x_pfc_brb_get_config_params( static int bnx2x_pfc_brb_get_config_params(
struct link_params *params, struct link_params *params,
...@@ -2028,7 +2061,23 @@ static int bnx2x_pfc_brb_get_config_params( ...@@ -2028,7 +2061,23 @@ static int bnx2x_pfc_brb_get_config_params(
{ {
struct bnx2x *bp = params->bp; struct bnx2x *bp = params->bp;
DP(NETIF_MSG_LINK, "Setting PFC BRB configuration\n"); DP(NETIF_MSG_LINK, "Setting PFC BRB configuration\n");
config_val->default_class1.pause_xoff = 0;
config_val->default_class1.pause_xon = 0;
config_val->default_class1.full_xoff = 0;
config_val->default_class1.full_xon = 0;
if (CHIP_IS_E2(bp)) { if (CHIP_IS_E2(bp)) {
/* class0 defaults */
config_val->default_class0.pause_xoff =
DEFAULT0_E2_BRB_MAC_PAUSE_XOFF_THR;
config_val->default_class0.pause_xon =
DEFAULT0_E2_BRB_MAC_PAUSE_XON_THR;
config_val->default_class0.full_xoff =
DEFAULT0_E2_BRB_MAC_FULL_XOFF_THR;
config_val->default_class0.full_xon =
DEFAULT0_E2_BRB_MAC_FULL_XON_THR;
/* pause able*/
config_val->pauseable_th.pause_xoff = config_val->pauseable_th.pause_xoff =
PFC_E2_BRB_MAC_PAUSE_XOFF_THR_PAUSE; PFC_E2_BRB_MAC_PAUSE_XOFF_THR_PAUSE;
config_val->pauseable_th.pause_xon = config_val->pauseable_th.pause_xon =
...@@ -2047,6 +2096,16 @@ static int bnx2x_pfc_brb_get_config_params( ...@@ -2047,6 +2096,16 @@ static int bnx2x_pfc_brb_get_config_params(
config_val->non_pauseable_th.full_xon = config_val->non_pauseable_th.full_xon =
PFC_E2_BRB_MAC_FULL_XON_THR_NON_PAUSE; PFC_E2_BRB_MAC_FULL_XON_THR_NON_PAUSE;
} else if (CHIP_IS_E3A0(bp)) { } else if (CHIP_IS_E3A0(bp)) {
/* class0 defaults */
config_val->default_class0.pause_xoff =
DEFAULT0_E3A0_BRB_MAC_PAUSE_XOFF_THR;
config_val->default_class0.pause_xon =
DEFAULT0_E3A0_BRB_MAC_PAUSE_XON_THR;
config_val->default_class0.full_xoff =
DEFAULT0_E3A0_BRB_MAC_FULL_XOFF_THR;
config_val->default_class0.full_xon =
DEFAULT0_E3A0_BRB_MAC_FULL_XON_THR;
/* pause able */
config_val->pauseable_th.pause_xoff = config_val->pauseable_th.pause_xoff =
PFC_E3A0_BRB_MAC_PAUSE_XOFF_THR_PAUSE; PFC_E3A0_BRB_MAC_PAUSE_XOFF_THR_PAUSE;
config_val->pauseable_th.pause_xon = config_val->pauseable_th.pause_xon =
...@@ -2065,6 +2124,16 @@ static int bnx2x_pfc_brb_get_config_params( ...@@ -2065,6 +2124,16 @@ static int bnx2x_pfc_brb_get_config_params(
config_val->non_pauseable_th.full_xon = config_val->non_pauseable_th.full_xon =
PFC_E3A0_BRB_MAC_FULL_XON_THR_NON_PAUSE; PFC_E3A0_BRB_MAC_FULL_XON_THR_NON_PAUSE;
} else if (CHIP_IS_E3B0(bp)) { } else if (CHIP_IS_E3B0(bp)) {
/* class0 defaults */
config_val->default_class0.pause_xoff =
DEFAULT0_E3B0_BRB_MAC_PAUSE_XOFF_THR;
config_val->default_class0.pause_xon =
DEFAULT0_E3B0_BRB_MAC_PAUSE_XON_THR;
config_val->default_class0.full_xoff =
DEFAULT0_E3B0_BRB_MAC_FULL_XOFF_THR;
config_val->default_class0.full_xon =
DEFAULT0_E3B0_BRB_MAC_FULL_XON_THR;
if (params->phy[INT_PHY].flags & if (params->phy[INT_PHY].flags &
FLAGS_4_PORT_MODE) { FLAGS_4_PORT_MODE) {
config_val->pauseable_th.pause_xoff = config_val->pauseable_th.pause_xoff =
...@@ -2109,14 +2178,19 @@ static int bnx2x_pfc_brb_get_config_params( ...@@ -2109,14 +2178,19 @@ static int bnx2x_pfc_brb_get_config_params(
return 0; return 0;
} }
static void bnx2x_pfc_brb_get_e3b0_config_params(
static void bnx2x_pfc_brb_get_e3b0_config_params(struct link_params *params, struct link_params *params,
struct bnx2x_pfc_brb_e3b0_val struct bnx2x_pfc_brb_e3b0_val
*e3b0_val, *e3b0_val,
u32 cos0_pauseable, struct bnx2x_nig_brb_pfc_port_params *pfc_params,
u32 cos1_pauseable) const u8 pfc_enabled)
{ {
if (params->phy[INT_PHY].flags & FLAGS_4_PORT_MODE) { if (pfc_enabled && pfc_params) {
e3b0_val->per_class_guaranty_mode = 1;
e3b0_val->lb_guarantied_hyst = 80;
if (params->phy[INT_PHY].flags &
FLAGS_4_PORT_MODE) {
e3b0_val->full_lb_xoff_th = e3b0_val->full_lb_xoff_th =
PFC_E3B0_4P_BRB_FULL_LB_XOFF_THR; PFC_E3B0_4P_BRB_FULL_LB_XOFF_THR;
e3b0_val->full_lb_xon_threshold = e3b0_val->full_lb_xon_threshold =
...@@ -2143,13 +2217,14 @@ static void bnx2x_pfc_brb_get_e3b0_config_params(struct link_params *params, ...@@ -2143,13 +2217,14 @@ static void bnx2x_pfc_brb_get_e3b0_config_params(struct link_params *params,
e3b0_val->mac_1_class_t_guarantied_hyst = e3b0_val->mac_1_class_t_guarantied_hyst =
PFC_E3B0_2P_BRB_MAC_1_CLASS_T_GUART_HYST; PFC_E3B0_2P_BRB_MAC_1_CLASS_T_GUART_HYST;
if (cos0_pauseable != cos1_pauseable) { if (pfc_params->cos0_pauseable !=
pfc_params->cos1_pauseable) {
/* nonpauseable= Lossy + pauseable = Lossless*/ /* nonpauseable= Lossy + pauseable = Lossless*/
e3b0_val->lb_guarantied = e3b0_val->lb_guarantied =
PFC_E3B0_2P_MIX_PAUSE_LB_GUART; PFC_E3B0_2P_MIX_PAUSE_LB_GUART;
e3b0_val->mac_0_class_t_guarantied = e3b0_val->mac_0_class_t_guarantied =
PFC_E3B0_2P_MIX_PAUSE_MAC_0_CLASS_T_GUART; PFC_E3B0_2P_MIX_PAUSE_MAC_0_CLASS_T_GUART;
} else if (cos0_pauseable) { } else if (pfc_params->cos0_pauseable) {
/* Lossless +Lossless*/ /* Lossless +Lossless*/
e3b0_val->lb_guarantied = e3b0_val->lb_guarantied =
PFC_E3B0_2P_PAUSE_LB_GUART; PFC_E3B0_2P_PAUSE_LB_GUART;
...@@ -2163,6 +2238,24 @@ static void bnx2x_pfc_brb_get_e3b0_config_params(struct link_params *params, ...@@ -2163,6 +2238,24 @@ static void bnx2x_pfc_brb_get_e3b0_config_params(struct link_params *params,
PFC_E3B0_2P_NON_PAUSE_MAC_0_CLASS_T_GUART; PFC_E3B0_2P_NON_PAUSE_MAC_0_CLASS_T_GUART;
} }
} }
} else {
e3b0_val->per_class_guaranty_mode = 0;
e3b0_val->lb_guarantied_hyst = 0;
e3b0_val->full_lb_xoff_th =
DEFAULT_E3B0_BRB_FULL_LB_XOFF_THR;
e3b0_val->full_lb_xon_threshold =
DEFAULT_E3B0_BRB_FULL_LB_XON_THR;
e3b0_val->lb_guarantied =
DEFAULT_E3B0_LB_GUART;
e3b0_val->mac_0_class_t_guarantied =
DEFAULT_E3B0_BRB_MAC_0_CLASS_T_GUART;
e3b0_val->mac_0_class_t_guarantied_hyst =
DEFAULT_E3B0_BRB_MAC_0_CLASS_T_GUART_HYST;
e3b0_val->mac_1_class_t_guarantied =
DEFAULT_E3B0_BRB_MAC_1_CLASS_T_GUART;
e3b0_val->mac_1_class_t_guarantied_hyst =
DEFAULT_E3B0_BRB_MAC_1_CLASS_T_GUART_HYST;
}
} }
static int bnx2x_update_pfc_brb(struct link_params *params, static int bnx2x_update_pfc_brb(struct link_params *params,
struct link_vars *vars, struct link_vars *vars,
...@@ -2174,8 +2267,9 @@ static int bnx2x_update_pfc_brb(struct link_params *params, ...@@ -2174,8 +2267,9 @@ static int bnx2x_update_pfc_brb(struct link_params *params,
struct bnx2x_pfc_brb_threshold_val *reg_th_config = struct bnx2x_pfc_brb_threshold_val *reg_th_config =
&config_val.pauseable_th; &config_val.pauseable_th;
struct bnx2x_pfc_brb_e3b0_val e3b0_val = {0}; struct bnx2x_pfc_brb_e3b0_val e3b0_val = {0};
int set_pfc = params->feature_config_flags & const int set_pfc = params->feature_config_flags &
FEATURE_CONFIG_PFC_ENABLED; FEATURE_CONFIG_PFC_ENABLED;
const u8 pfc_enabled = (set_pfc && pfc_params);
int bnx2x_status = 0; int bnx2x_status = 0;
u8 port = params->port; u8 port = params->port;
...@@ -2185,10 +2279,14 @@ static int bnx2x_update_pfc_brb(struct link_params *params, ...@@ -2185,10 +2279,14 @@ static int bnx2x_update_pfc_brb(struct link_params *params,
if (0 != bnx2x_status) if (0 != bnx2x_status)
return bnx2x_status; return bnx2x_status;
if (set_pfc && pfc_params) if (pfc_enabled) {
/* First COS */ /* First COS */
if (!pfc_params->cos0_pauseable) if (pfc_params->cos0_pauseable)
reg_th_config = &config_val.pauseable_th;
else
reg_th_config = &config_val.non_pauseable_th; reg_th_config = &config_val.non_pauseable_th;
} else
reg_th_config = &config_val.default_class0;
/* /*
* The number of free blocks below which the pause signal to class 0 * The number of free blocks below which the pause signal to class 0
* of MAC #n is asserted. n=0,1 * of MAC #n is asserted. n=0,1
...@@ -2215,12 +2313,14 @@ static int bnx2x_update_pfc_brb(struct link_params *params, ...@@ -2215,12 +2313,14 @@ static int bnx2x_update_pfc_brb(struct link_params *params,
REG_WR(bp, (port) ? BRB1_REG_FULL_0_XON_THRESHOLD_1 : REG_WR(bp, (port) ? BRB1_REG_FULL_0_XON_THRESHOLD_1 :
BRB1_REG_FULL_0_XON_THRESHOLD_0 , reg_th_config->full_xon); BRB1_REG_FULL_0_XON_THRESHOLD_0 , reg_th_config->full_xon);
if (set_pfc && pfc_params) { if (pfc_enabled) {
/* Second COS */ /* Second COS */
if (pfc_params->cos1_pauseable) if (pfc_params->cos1_pauseable)
reg_th_config = &config_val.pauseable_th; reg_th_config = &config_val.pauseable_th;
else else
reg_th_config = &config_val.non_pauseable_th; reg_th_config = &config_val.non_pauseable_th;
} else
reg_th_config = &config_val.default_class1;
/* /*
* The number of free blocks below which the pause signal to * The number of free blocks below which the pause signal to
* class 1 of MAC #n is asserted. n=0,1 * class 1 of MAC #n is asserted. n=0,1
...@@ -2250,26 +2350,28 @@ static int bnx2x_update_pfc_brb(struct link_params *params, ...@@ -2250,26 +2350,28 @@ static int bnx2x_update_pfc_brb(struct link_params *params,
BRB1_REG_FULL_1_XON_THRESHOLD_0, BRB1_REG_FULL_1_XON_THRESHOLD_0,
reg_th_config->full_xon); reg_th_config->full_xon);
if (CHIP_IS_E3B0(bp)) { if (CHIP_IS_E3B0(bp)) {
bnx2x_pfc_brb_get_e3b0_config_params(
params,
&e3b0_val,
pfc_params,
pfc_enabled);
/*Should be done by init tool */ /*Should be done by init tool */
/* /*
* BRB_empty_for_dup = BRB1_REG_BRB_EMPTY_THRESHOLD * BRB_empty_for_dup = BRB1_REG_BRB_EMPTY_THRESHOLD
* reset value * reset value
* 944 * 944
*/ */
REG_WR(bp, BRB1_REG_PER_CLASS_GUARANTY_MODE,
e3b0_val.per_class_guaranty_mode);
/** /**
* The hysteresis on the guarantied buffer space for the Lb port * The hysteresis on the guarantied buffer space for the Lb port
* before signaling XON. * before signaling XON.
**/ **/
REG_WR(bp, BRB1_REG_LB_GUARANTIED_HYST, 80); REG_WR(bp, BRB1_REG_LB_GUARANTIED_HYST,
e3b0_val.lb_guarantied_hyst);
bnx2x_pfc_brb_get_e3b0_config_params(
params,
&e3b0_val,
pfc_params->cos0_pauseable,
pfc_params->cos1_pauseable);
/** /**
* The number of free blocks below which the full signal to the * The number of free blocks below which the full signal to the
* LB port is asserted. * LB port is asserted.
...@@ -2331,8 +2433,6 @@ static int bnx2x_update_pfc_brb(struct link_params *params, ...@@ -2331,8 +2433,6 @@ static int bnx2x_update_pfc_brb(struct link_params *params,
} }
}
return bnx2x_status; return bnx2x_status;
} }
......
drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
View file @ 866cedae
...@@ -160,8 +160,11 @@ ...@@ -160,8 +160,11 @@
#define BRB1_REG_PAUSE_HIGH_THRESHOLD_1 0x6007c #define BRB1_REG_PAUSE_HIGH_THRESHOLD_1 0x6007c
/* [RW 10] Write client 0: Assert pause threshold. */ /* [RW 10] Write client 0: Assert pause threshold. */
#define BRB1_REG_PAUSE_LOW_THRESHOLD_0 0x60068 #define BRB1_REG_PAUSE_LOW_THRESHOLD_0 0x60068
#define BRB1_REG_PAUSE_LOW_THRESHOLD_1 0x6006c /* [RW 1] Indicates if to use per-class guaranty mode (new mode) or per-MAC
/* [R 24] The number of full blocks occupied by port. */ * guaranty mode (backwards-compatible mode). 0=per-MAC guaranty mode (BC
* mode). 1=per-class guaranty mode (new mode). */
#define BRB1_REG_PER_CLASS_GUARANTY_MODE 0x60268
/* [R 24] The number of full blocks occpied by port. */
#define BRB1_REG_PORT_NUM_OCC_BLOCKS_0 0x60094 #define BRB1_REG_PORT_NUM_OCC_BLOCKS_0 0x60094
/* [RW 1] Reset the design by software. */ /* [RW 1] Reset the design by software. */
#define BRB1_REG_SOFT_RESET 0x600dc #define BRB1_REG_SOFT_RESET 0x600dc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7