UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ixgbe: DCB, abstract out dcb_config from DCB hardware configuration 

Currently the routines that configure the HW for DCB require a
ixgbe_dcb_config structure. This structure was designed to support
the CEE standard and does not match the IEEE standard well.

This patch changes the HW routines in ixgbe_dcb_8259x.{ch} to use
raw pfc and bandwidth values. This requires some parsing of the DCB
configuration but makes the HW routines independent of the data
structure that contains the DCB configuration.

The primary advantage to doing this is we can do HW setup directly
from the 802.1Qaz ops without having to arbitrarily encapsulate this
data into the CEE structure.

Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
John Fastabend 2011-01-05 04:47:43 +00:00 committed by Jeff Kirsher
parent 39a7e587ec
commit 55320cb58b
7 changed files with 230 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
drivers/net/ixgbe/ixgbe_dcb.c
View File

@ -141,6 +141,59 @@ out:
return ret_val; return ret_val;
} }
void ixgbe_dcb_unpack_pfc(struct ixgbe_dcb_config *cfg, u8 *pfc_en)
{
int i;
*pfc_en = 0;
for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
*pfc_en |= (cfg->tc_config[i].dcb_pfc & 0xF) << i;
}
void ixgbe_dcb_unpack_refill(struct ixgbe_dcb_config *cfg, int direction,
u16 *refill)
{
struct tc_bw_alloc *p;
int i;
for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
p = &cfg->tc_config[i].path[direction];
refill[i] = p->data_credits_refill;
}
}
void ixgbe_dcb_unpack_max(struct ixgbe_dcb_config *cfg, u16 *max)
{
int i;
for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
max[i] = cfg->tc_config[i].desc_credits_max;
}
void ixgbe_dcb_unpack_bwgid(struct ixgbe_dcb_config *cfg, int direction,
u8 *bwgid)
{
struct tc_bw_alloc *p;
int i;
for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
p = &cfg->tc_config[i].path[direction];
bwgid[i] = p->bwg_id;
}
}
void ixgbe_dcb_unpack_prio(struct ixgbe_dcb_config *cfg, int direction,
u8 *ptype)
{
struct tc_bw_alloc *p;
int i;
for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
p = &cfg->tc_config[i].path[direction];
ptype[i] = p->prio_type;
}
}
/** /**
* ixgbe_dcb_hw_config - Config and enable DCB * ixgbe_dcb_hw_config - Config and enable DCB
* @hw: pointer to hardware structure * @hw: pointer to hardware structure
@ -152,13 +205,30 @@ s32 ixgbe_dcb_hw_config(struct ixgbe_hw *hw,
struct ixgbe_dcb_config *dcb_config) struct ixgbe_dcb_config *dcb_config)
{ {
s32 ret = 0; s32 ret = 0;
u8 pfc_en;
u8 ptype[MAX_TRAFFIC_CLASS];
u8 bwgid[MAX_TRAFFIC_CLASS];
u16 refill[MAX_TRAFFIC_CLASS];
u16 max[MAX_TRAFFIC_CLASS];
/* Unpack CEE standard containers */
ixgbe_dcb_unpack_pfc(dcb_config, &pfc_en);
ixgbe_dcb_unpack_refill(dcb_config, DCB_TX_CONFIG, refill);
ixgbe_dcb_unpack_max(dcb_config, max);
ixgbe_dcb_unpack_bwgid(dcb_config, DCB_TX_CONFIG, bwgid);
ixgbe_dcb_unpack_prio(dcb_config, DCB_TX_CONFIG, ptype);
switch (hw->mac.type) { switch (hw->mac.type) {
case ixgbe_mac_82598EB: case ixgbe_mac_82598EB:
ret = ixgbe_dcb_hw_config_82598(hw, dcb_config); ret = ixgbe_dcb_hw_config_82598(hw, dcb_config->rx_pba_cfg,
pfc_en, refill, max, bwgid,
ptype);
break; break;
case ixgbe_mac_82599EB: case ixgbe_mac_82599EB:
case ixgbe_mac_X540: case ixgbe_mac_X540:
ret = ixgbe_dcb_hw_config_82599(hw, dcb_config); ret = ixgbe_dcb_hw_config_82599(hw, dcb_config->rx_pba_cfg,
pfc_en, refill, max, bwgid,
ptype);
break; break;
default: default:
break; break;

1
drivers/net/ixgbe/ixgbe_dcb.h
View File

@ -147,6 +147,7 @@ struct ixgbe_dcb_config {
}; };
/* DCB driver APIs */ /* DCB driver APIs */
void ixgbe_dcb_unpack_pfc(struct ixgbe_dcb_config *cfg, u8 *pfc_en);
/* DCB credits calculation */ /* DCB credits calculation */
s32 ixgbe_dcb_calculate_tc_credits(struct ixgbe_hw *, s32 ixgbe_dcb_calculate_tc_credits(struct ixgbe_hw *,

86
drivers/net/ixgbe/ixgbe_dcb_82598.c
View File

@ -38,15 +38,14 @@
* *
* Configure packet buffers for DCB mode. * Configure packet buffers for DCB mode.
*/ */
static s32 ixgbe_dcb_config_packet_buffers_82598(struct ixgbe_hw *hw, static s32 ixgbe_dcb_config_packet_buffers_82598(struct ixgbe_hw *hw, u8 rx_pba)
struct ixgbe_dcb_config *dcb_config)
{ {
s32 ret_val = 0; s32 ret_val = 0;
u32 value = IXGBE_RXPBSIZE_64KB; u32 value = IXGBE_RXPBSIZE_64KB;
u8 i = 0; u8 i = 0;
/* Setup Rx packet buffer sizes */ /* Setup Rx packet buffer sizes */
switch (dcb_config->rx_pba_cfg) { switch (rx_pba) {
case pba_80_48: case pba_80_48:
/* Setup the first four at 80KB */ /* Setup the first four at 80KB */
value = IXGBE_RXPBSIZE_80KB; value = IXGBE_RXPBSIZE_80KB;
@ -78,10 +77,11 @@ static s32 ixgbe_dcb_config_packet_buffers_82598(struct ixgbe_hw *hw,
* *
* Configure Rx Data Arbiter and credits for each traffic class. * Configure Rx Data Arbiter and credits for each traffic class.
*/ */
static s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw, s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
struct ixgbe_dcb_config *dcb_config) u16 *refill,
u16 *max,
u8 *prio_type)
{ {
struct tc_bw_alloc *p;
u32 reg = 0; u32 reg = 0;
u32 credit_refill = 0; u32 credit_refill = 0;
u32 credit_max = 0; u32 credit_max = 0;
@ -102,13 +102,12 @@ static s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
/* Configure traffic class credits and priority */ /* Configure traffic class credits and priority */
for (i = 0; i < MAX_TRAFFIC_CLASS; i++) { for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
p = &dcb_config->tc_config[i].path[DCB_RX_CONFIG]; credit_refill = refill[i];
credit_refill = p->data_credits_refill; credit_max = max[i];
credit_max = p->data_credits_max;
reg = credit_refill | (credit_max << IXGBE_RT2CR_MCL_SHIFT); reg = credit_refill | (credit_max << IXGBE_RT2CR_MCL_SHIFT);
if (p->prio_type == prio_link) if (prio_type[i] == prio_link)
reg |= IXGBE_RT2CR_LSP; reg |= IXGBE_RT2CR_LSP;
IXGBE_WRITE_REG(hw, IXGBE_RT2CR(i), reg); IXGBE_WRITE_REG(hw, IXGBE_RT2CR(i), reg);
@ -135,10 +134,12 @@ static s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
* *
* Configure Tx Descriptor Arbiter and credits for each traffic class. * Configure Tx Descriptor Arbiter and credits for each traffic class.
*/ */
static s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw, s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
struct ixgbe_dcb_config *dcb_config) u16 *refill,
u16 *max,
u8 *bwg_id,
u8 *prio_type)
{ {
struct tc_bw_alloc *p;
u32 reg, max_credits; u32 reg, max_credits;
u8 i; u8 i;
@ -156,16 +157,15 @@ static s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
/* Configure traffic class credits and priority */ /* Configure traffic class credits and priority */
for (i = 0; i < MAX_TRAFFIC_CLASS; i++) { for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
p = &dcb_config->tc_config[i].path[DCB_TX_CONFIG]; max_credits = max[i];
max_credits = dcb_config->tc_config[i].desc_credits_max;
reg = max_credits << IXGBE_TDTQ2TCCR_MCL_SHIFT; reg = max_credits << IXGBE_TDTQ2TCCR_MCL_SHIFT;
reg |= p->data_credits_refill; reg |= refill[i];
reg |= (u32)(p->bwg_id) << IXGBE_TDTQ2TCCR_BWG_SHIFT; reg |= (u32)(bwg_id[i]) << IXGBE_TDTQ2TCCR_BWG_SHIFT;
if (p->prio_type == prio_group) if (prio_type[i] == prio_group)
reg |= IXGBE_TDTQ2TCCR_GSP; reg |= IXGBE_TDTQ2TCCR_GSP;
if (p->prio_type == prio_link) if (prio_type[i] == prio_link)
reg |= IXGBE_TDTQ2TCCR_LSP; reg |= IXGBE_TDTQ2TCCR_LSP;
IXGBE_WRITE_REG(hw, IXGBE_TDTQ2TCCR(i), reg); IXGBE_WRITE_REG(hw, IXGBE_TDTQ2TCCR(i), reg);
@ -181,10 +181,12 @@ static s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
* *
* Configure Tx Data Arbiter and credits for each traffic class. * Configure Tx Data Arbiter and credits for each traffic class.
*/ */
static s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw, s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
struct ixgbe_dcb_config *dcb_config) u16 *refill,
u16 *max,
u8 *bwg_id,
u8 *prio_type)
{ {
struct tc_bw_alloc *p;
u32 reg; u32 reg;
u8 i; u8 i;
@ -198,15 +200,14 @@ static s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
/* Configure traffic class credits and priority */ /* Configure traffic class credits and priority */
for (i = 0; i < MAX_TRAFFIC_CLASS; i++) { for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
p = &dcb_config->tc_config[i].path[DCB_TX_CONFIG]; reg = refill[i];
reg = p->data_credits_refill; reg |= (u32)(max[i]) << IXGBE_TDPT2TCCR_MCL_SHIFT;
reg |= (u32)(p->data_credits_max) << IXGBE_TDPT2TCCR_MCL_SHIFT; reg |= (u32)(bwg_id[i]) << IXGBE_TDPT2TCCR_BWG_SHIFT;
reg |= (u32)(p->bwg_id) << IXGBE_TDPT2TCCR_BWG_SHIFT;
if (p->prio_type == prio_group) if (prio_type[i] == prio_group)
reg |= IXGBE_TDPT2TCCR_GSP; reg |= IXGBE_TDPT2TCCR_GSP;
if (p->prio_type == prio_link) if (prio_type[i] == prio_link)
reg |= IXGBE_TDPT2TCCR_LSP; reg |= IXGBE_TDPT2TCCR_LSP;
IXGBE_WRITE_REG(hw, IXGBE_TDPT2TCCR(i), reg); IXGBE_WRITE_REG(hw, IXGBE_TDPT2TCCR(i), reg);
@ -227,13 +228,12 @@ static s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
* *
* Configure Priority Flow Control for each traffic class. * Configure Priority Flow Control for each traffic class.
*/ */
s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *hw, s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *hw, u8 pfc_en)
struct ixgbe_dcb_config *dcb_config)
{ {
u32 reg, rx_pba_size; u32 reg, rx_pba_size;
u8 i; u8 i;
if (!dcb_config->pfc_mode_enable) if (!pfc_en)
goto out; goto out;
/* Enable Transmit Priority Flow Control */ /* Enable Transmit Priority Flow Control */
@ -254,19 +254,20 @@ s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *hw,
* for each traffic class. * for each traffic class.
*/ */
for (i = 0; i < MAX_TRAFFIC_CLASS; i++) { for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
int enabled = pfc_en & (1 << i);
rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i)); rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i));
rx_pba_size >>= IXGBE_RXPBSIZE_SHIFT; rx_pba_size >>= IXGBE_RXPBSIZE_SHIFT;
reg = (rx_pba_size - hw->fc.low_water) << 10; reg = (rx_pba_size - hw->fc.low_water) << 10;
if (dcb_config->tc_config[i].dcb_pfc == pfc_enabled_tx || if (enabled == pfc_enabled_tx ||
dcb_config->tc_config[i].dcb_pfc == pfc_enabled_full) enabled == pfc_enabled_full)
reg |= IXGBE_FCRTL_XONE; reg |= IXGBE_FCRTL_XONE;
IXGBE_WRITE_REG(hw, IXGBE_FCRTL(i), reg); IXGBE_WRITE_REG(hw, IXGBE_FCRTL(i), reg);
reg = (rx_pba_size - hw->fc.high_water) << 10; reg = (rx_pba_size - hw->fc.high_water) << 10;
if (dcb_config->tc_config[i].dcb_pfc == pfc_enabled_tx || if (enabled == pfc_enabled_tx ||
dcb_config->tc_config[i].dcb_pfc == pfc_enabled_full) enabled == pfc_enabled_full)
reg |= IXGBE_FCRTH_FCEN; reg |= IXGBE_FCRTH_FCEN;
IXGBE_WRITE_REG(hw, IXGBE_FCRTH(i), reg); IXGBE_WRITE_REG(hw, IXGBE_FCRTH(i), reg);
@ -323,13 +324,16 @@ static s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *hw)
* Configure dcb settings and enable dcb mode. * Configure dcb settings and enable dcb mode.
*/ */
s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *hw, s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *hw,
struct ixgbe_dcb_config *dcb_config) u8 rx_pba, u8 pfc_en, u16 *refill,
u16 *max, u8 *bwg_id, u8 *prio_type)
{ {
ixgbe_dcb_config_packet_buffers_82598(hw, dcb_config); ixgbe_dcb_config_packet_buffers_82598(hw, rx_pba);
ixgbe_dcb_config_rx_arbiter_82598(hw, dcb_config); ixgbe_dcb_config_rx_arbiter_82598(hw, refill, max, prio_type);
ixgbe_dcb_config_tx_desc_arbiter_82598(hw, dcb_config); ixgbe_dcb_config_tx_desc_arbiter_82598(hw, refill, max,
ixgbe_dcb_config_tx_data_arbiter_82598(hw, dcb_config); bwg_id, prio_type);
ixgbe_dcb_config_pfc_82598(hw, dcb_config); ixgbe_dcb_config_tx_data_arbiter_82598(hw, refill, max,
bwg_id, prio_type);
ixgbe_dcb_config_pfc_82598(hw, pfc_en);
ixgbe_dcb_config_tc_stats_82598(hw); ixgbe_dcb_config_tc_stats_82598(hw);
return 0; return 0;

23
drivers/net/ixgbe/ixgbe_dcb_82598.h
View File

@ -71,9 +71,28 @@
/* DCB hardware-specific driver APIs */ /* DCB hardware-specific driver APIs */
/* DCB PFC functions */ /* DCB PFC functions */
s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *, struct ixgbe_dcb_config *); s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *, u8 pfc_en);
/* DCB hw initialization */ /* DCB hw initialization */
s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *, struct ixgbe_dcb_config *); s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
u16 *refill,
u16 *max,
u8 *prio_type);
s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
u16 *refill,
u16 *max,
u8 *bwg_id,
u8 *prio_type);
s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
u16 *refill,
u16 *max,
u8 *bwg_id,
u8 *prio_type);
s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *hw,
u8 rx_pba, u8 pfc_en, u16 *refill,
u16 *max, u8 *bwg_id, u8 *prio_type);
#endif /* _DCB_82598_CONFIG_H */ #endif /* _DCB_82598_CONFIG_H */

115
drivers/net/ixgbe/ixgbe_dcb_82599.c
View File

@ -33,19 +33,18 @@
/** /**
* ixgbe_dcb_config_packet_buffers_82599 - Configure DCB packet buffers * ixgbe_dcb_config_packet_buffers_82599 - Configure DCB packet buffers
* @hw: pointer to hardware structure * @hw: pointer to hardware structure
* @dcb_config: pointer to ixgbe_dcb_config structure * @rx_pba: method to distribute packet buffer
* *
* Configure packet buffers for DCB mode. * Configure packet buffers for DCB mode.
*/ */
static s32 ixgbe_dcb_config_packet_buffers_82599(struct ixgbe_hw *hw, static s32 ixgbe_dcb_config_packet_buffers_82599(struct ixgbe_hw *hw, u8 rx_pba)
struct ixgbe_dcb_config *dcb_config)
{ {
s32 ret_val = 0; s32 ret_val = 0;
u32 value = IXGBE_RXPBSIZE_64KB; u32 value = IXGBE_RXPBSIZE_64KB;
u8 i = 0; u8 i = 0;
/* Setup Rx packet buffer sizes */ /* Setup Rx packet buffer sizes */
switch (dcb_config->rx_pba_cfg) { switch (rx_pba) {
case pba_80_48: case pba_80_48:
/* Setup the first four at 80KB */ /* Setup the first four at 80KB */
value = IXGBE_RXPBSIZE_80KB; value = IXGBE_RXPBSIZE_80KB;
@ -75,14 +74,19 @@ static s32 ixgbe_dcb_config_packet_buffers_82599(struct ixgbe_hw *hw,
/** /**
* ixgbe_dcb_config_rx_arbiter_82599 - Config Rx Data arbiter * ixgbe_dcb_config_rx_arbiter_82599 - Config Rx Data arbiter
* @hw: pointer to hardware structure * @hw: pointer to hardware structure
* @dcb_config: pointer to ixgbe_dcb_config structure * @refill: refill credits index by traffic class
* @max: max credits index by traffic class
* @bwg_id: bandwidth grouping indexed by traffic class
* @prio_type: priority type indexed by traffic class
* *
* Configure Rx Packet Arbiter and credits for each traffic class. * Configure Rx Packet Arbiter and credits for each traffic class.
*/ */
static s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw, s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
struct ixgbe_dcb_config *dcb_config) u16 *refill,
u16 *max,
u8 *bwg_id,
u8 *prio_type)
{ {
struct tc_bw_alloc *p;
u32 reg = 0; u32 reg = 0;
u32 credit_refill = 0; u32 credit_refill = 0;
u32 credit_max = 0; u32 credit_max = 0;
@ -103,15 +107,13 @@ static s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
/* Configure traffic class credits and priority */ /* Configure traffic class credits and priority */
for (i = 0; i < MAX_TRAFFIC_CLASS; i++) { for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
p = &dcb_config->tc_config[i].path[DCB_RX_CONFIG]; credit_refill = refill[i];
credit_max = max[i];
credit_refill = p->data_credits_refill;
credit_max = p->data_credits_max;
reg = credit_refill | (credit_max << IXGBE_RTRPT4C_MCL_SHIFT); reg = credit_refill | (credit_max << IXGBE_RTRPT4C_MCL_SHIFT);
reg |= (u32)(p->bwg_id) << IXGBE_RTRPT4C_BWG_SHIFT; reg |= (u32)(bwg_id[i]) << IXGBE_RTRPT4C_BWG_SHIFT;
if (p->prio_type == prio_link) if (prio_type[i] == prio_link)
reg |= IXGBE_RTRPT4C_LSP; reg |= IXGBE_RTRPT4C_LSP;
IXGBE_WRITE_REG(hw, IXGBE_RTRPT4C(i), reg); IXGBE_WRITE_REG(hw, IXGBE_RTRPT4C(i), reg);
@ -130,14 +132,19 @@ static s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
/** /**
* ixgbe_dcb_config_tx_desc_arbiter_82599 - Config Tx Desc. arbiter * ixgbe_dcb_config_tx_desc_arbiter_82599 - Config Tx Desc. arbiter
* @hw: pointer to hardware structure * @hw: pointer to hardware structure
* @dcb_config: pointer to ixgbe_dcb_config structure * @refill: refill credits index by traffic class
* @max: max credits index by traffic class
* @bwg_id: bandwidth grouping indexed by traffic class
* @prio_type: priority type indexed by traffic class
* *
* Configure Tx Descriptor Arbiter and credits for each traffic class. * Configure Tx Descriptor Arbiter and credits for each traffic class.
*/ */
static s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw, s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
struct ixgbe_dcb_config *dcb_config) u16 *refill,
u16 *max,
u8 *bwg_id,
u8 *prio_type)
{ {
struct tc_bw_alloc *p;
u32 reg, max_credits; u32 reg, max_credits;
u8 i; u8 i;
@ -149,16 +156,15 @@ static s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
/* Configure traffic class credits and priority */ /* Configure traffic class credits and priority */
for (i = 0; i < MAX_TRAFFIC_CLASS; i++) { for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
p = &dcb_config->tc_config[i].path[DCB_TX_CONFIG]; max_credits = max[i];
max_credits = dcb_config->tc_config[i].desc_credits_max;
reg = max_credits << IXGBE_RTTDT2C_MCL_SHIFT; reg = max_credits << IXGBE_RTTDT2C_MCL_SHIFT;
reg |= p->data_credits_refill; reg |= refill[i];
reg |= (u32)(p->bwg_id) << IXGBE_RTTDT2C_BWG_SHIFT; reg |= (u32)(bwg_id[i]) << IXGBE_RTTDT2C_BWG_SHIFT;
if (p->prio_type == prio_group) if (prio_type[i] == prio_group)
reg |= IXGBE_RTTDT2C_GSP; reg |= IXGBE_RTTDT2C_GSP;
if (p->prio_type == prio_link) if (prio_type[i] == prio_link)
reg |= IXGBE_RTTDT2C_LSP; reg |= IXGBE_RTTDT2C_LSP;
IXGBE_WRITE_REG(hw, IXGBE_RTTDT2C(i), reg); IXGBE_WRITE_REG(hw, IXGBE_RTTDT2C(i), reg);
@ -177,14 +183,19 @@ static s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
/** /**
* ixgbe_dcb_config_tx_data_arbiter_82599 - Config Tx Data arbiter * ixgbe_dcb_config_tx_data_arbiter_82599 - Config Tx Data arbiter
* @hw: pointer to hardware structure * @hw: pointer to hardware structure
* @dcb_config: pointer to ixgbe_dcb_config structure * @refill: refill credits index by traffic class
* @max: max credits index by traffic class
* @bwg_id: bandwidth grouping indexed by traffic class
* @prio_type: priority type indexed by traffic class
* *
* Configure Tx Packet Arbiter and credits for each traffic class. * Configure Tx Packet Arbiter and credits for each traffic class.
*/ */
static s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw, s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
struct ixgbe_dcb_config *dcb_config) u16 *refill,
u16 *max,
u8 *bwg_id,
u8 *prio_type)
{ {
struct tc_bw_alloc *p;
u32 reg; u32 reg;
u8 i; u8 i;
@ -205,15 +216,14 @@ static s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
/* Configure traffic class credits and priority */ /* Configure traffic class credits and priority */
for (i = 0; i < MAX_TRAFFIC_CLASS; i++) { for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
p = &dcb_config->tc_config[i].path[DCB_TX_CONFIG]; reg = refill[i];
reg = p->data_credits_refill; reg |= (u32)(max[i]) << IXGBE_RTTPT2C_MCL_SHIFT;
reg |= (u32)(p->data_credits_max) << IXGBE_RTTPT2C_MCL_SHIFT; reg |= (u32)(bwg_id[i]) << IXGBE_RTTPT2C_BWG_SHIFT;
reg |= (u32)(p->bwg_id) << IXGBE_RTTPT2C_BWG_SHIFT;
if (p->prio_type == prio_group) if (prio_type[i] == prio_group)
reg |= IXGBE_RTTPT2C_GSP; reg |= IXGBE_RTTPT2C_GSP;
if (p->prio_type == prio_link) if (prio_type[i] == prio_link)
reg |= IXGBE_RTTPT2C_LSP; reg |= IXGBE_RTTPT2C_LSP;
IXGBE_WRITE_REG(hw, IXGBE_RTTPT2C(i), reg); IXGBE_WRITE_REG(hw, IXGBE_RTTPT2C(i), reg);
@ -233,17 +243,16 @@ static s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
/** /**
* ixgbe_dcb_config_pfc_82599 - Configure priority flow control * ixgbe_dcb_config_pfc_82599 - Configure priority flow control
* @hw: pointer to hardware structure * @hw: pointer to hardware structure
* @dcb_config: pointer to ixgbe_dcb_config structure * @pfc_en: enabled pfc bitmask
* *
* Configure Priority Flow Control (PFC) for each traffic class. * Configure Priority Flow Control (PFC) for each traffic class.
*/ */
s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, u8 pfc_en)
struct ixgbe_dcb_config *dcb_config)
{ {
u32 i, reg, rx_pba_size; u32 i, reg, rx_pba_size;
/* If PFC is disabled globally then fall back to LFC. */ /* If PFC is disabled globally then fall back to LFC. */
if (!dcb_config->pfc_mode_enable) { if (!pfc_en) {
for (i = 0; i < MAX_TRAFFIC_CLASS; i++) for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
hw->mac.ops.fc_enable(hw, i); hw->mac.ops.fc_enable(hw, i);
goto out; goto out;
@ -251,19 +260,18 @@ s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw,
/* Configure PFC Tx thresholds per TC */ /* Configure PFC Tx thresholds per TC */
for (i = 0; i < MAX_TRAFFIC_CLASS; i++) { for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
int enabled = pfc_en & (1 << i);
rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i)); rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i));
rx_pba_size >>= IXGBE_RXPBSIZE_SHIFT; rx_pba_size >>= IXGBE_RXPBSIZE_SHIFT;
reg = (rx_pba_size - hw->fc.low_water) << 10; reg = (rx_pba_size - hw->fc.low_water) << 10;
if (dcb_config->tc_config[i].dcb_pfc == pfc_enabled_full || if (enabled)
dcb_config->tc_config[i].dcb_pfc == pfc_enabled_tx)
reg |= IXGBE_FCRTL_XONE; reg |= IXGBE_FCRTL_XONE;
IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), reg); IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), reg);
reg = (rx_pba_size - hw->fc.high_water) << 10; reg = (rx_pba_size - hw->fc.high_water) << 10;
if (dcb_config->tc_config[i].dcb_pfc == pfc_enabled_full || if (enabled)
dcb_config->tc_config[i].dcb_pfc == pfc_enabled_tx)
reg |= IXGBE_FCRTH_FCEN; reg |= IXGBE_FCRTH_FCEN;
IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(i), reg); IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(i), reg);
} }
@ -349,7 +357,6 @@ static s32 ixgbe_dcb_config_tc_stats_82599(struct ixgbe_hw *hw)
/** /**
* ixgbe_dcb_config_82599 - Configure general DCB parameters * ixgbe_dcb_config_82599 - Configure general DCB parameters
* @hw: pointer to hardware structure * @hw: pointer to hardware structure
* @dcb_config: pointer to ixgbe_dcb_config structure
* *
* Configure general DCB parameters. * Configure general DCB parameters.
*/ */
@ -406,19 +413,27 @@ static s32 ixgbe_dcb_config_82599(struct ixgbe_hw *hw)
/** /**
* ixgbe_dcb_hw_config_82599 - Configure and enable DCB * ixgbe_dcb_hw_config_82599 - Configure and enable DCB
* @hw: pointer to hardware structure * @hw: pointer to hardware structure
* @dcb_config: pointer to ixgbe_dcb_config structure * @rx_pba: method to distribute packet buffer
* @refill: refill credits index by traffic class
* @max: max credits index by traffic class
* @bwg_id: bandwidth grouping indexed by traffic class
* @prio_type: priority type indexed by traffic class
* @pfc_en: enabled pfc bitmask
* *
* Configure dcb settings and enable dcb mode. * Configure dcb settings and enable dcb mode.
*/ */
s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw, s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw,
struct ixgbe_dcb_config *dcb_config) u8 rx_pba, u8 pfc_en, u16 *refill,
u16 *max, u8 *bwg_id, u8 *prio_type)
{ {
ixgbe_dcb_config_packet_buffers_82599(hw, dcb_config); ixgbe_dcb_config_packet_buffers_82599(hw, rx_pba);
ixgbe_dcb_config_82599(hw); ixgbe_dcb_config_82599(hw);
ixgbe_dcb_config_rx_arbiter_82599(hw, dcb_config); ixgbe_dcb_config_rx_arbiter_82599(hw, refill, max, bwg_id, prio_type);
ixgbe_dcb_config_tx_desc_arbiter_82599(hw, dcb_config); ixgbe_dcb_config_tx_desc_arbiter_82599(hw, refill, max,
ixgbe_dcb_config_tx_data_arbiter_82599(hw, dcb_config); bwg_id, prio_type);
ixgbe_dcb_config_pfc_82599(hw, dcb_config); ixgbe_dcb_config_tx_data_arbiter_82599(hw, refill, max,
bwg_id, prio_type);
ixgbe_dcb_config_pfc_82599(hw, pfc_en);
ixgbe_dcb_config_tc_stats_82599(hw); ixgbe_dcb_config_tc_stats_82599(hw);
return 0; return 0;

24
drivers/net/ixgbe/ixgbe_dcb_82599.h
View File

@ -102,11 +102,29 @@
/* DCB hardware-specific driver APIs */ /* DCB hardware-specific driver APIs */
/* DCB PFC functions */ /* DCB PFC functions */
s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, u8 pfc_en);
struct ixgbe_dcb_config *dcb_config);
/* DCB hw initialization */ /* DCB hw initialization */
s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
u16 *refill,
u16 *max,
u8 *bwg_id,
u8 *prio_type);
s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
u16 *refill,
u16 *max,
u8 *bwg_id,
u8 *prio_type);
s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
u16 *refill,
u16 *max,
u8 *bwg_id,
u8 *prio_type);
s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw, s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw,
struct ixgbe_dcb_config *config); u8 rx_pba, u8 pfc_en, u16 *refill,
u16 *max, u8 *bwg_id, u8 *prio_type);
#endif /* _DCB_82599_CONFIG_H */ #endif /* _DCB_82599_CONFIG_H */

9
drivers/net/ixgbe/ixgbe_dcb_nl.c
View File

@ -422,12 +422,13 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
} }
ret = DCB_HW_CHG_RST; ret = DCB_HW_CHG_RST;
} else if (adapter->dcb_set_bitmap & BIT_PFC) { } else if (adapter->dcb_set_bitmap & BIT_PFC) {
u8 pfc_en;
ixgbe_dcb_unpack_pfc(&adapter->dcb_cfg, &pfc_en);
if (adapter->hw.mac.type == ixgbe_mac_82598EB) if (adapter->hw.mac.type == ixgbe_mac_82598EB)
ixgbe_dcb_config_pfc_82598(&adapter->hw, ixgbe_dcb_config_pfc_82598(&adapter->hw, pfc_en);
&adapter->dcb_cfg);
else if (adapter->hw.mac.type == ixgbe_mac_82599EB) else if (adapter->hw.mac.type == ixgbe_mac_82599EB)
ixgbe_dcb_config_pfc_82599(&adapter->hw, ixgbe_dcb_config_pfc_82599(&adapter->hw, pfc_en);
&adapter->dcb_cfg);
ret = DCB_HW_CHG; ret = DCB_HW_CHG;
} }
if (adapter->dcb_cfg.pfc_mode_enable) if (adapter->dcb_cfg.pfc_mode_enable)