Commit 619c5cb6 authored by Vlad Zolotarov's avatar Vlad Zolotarov Committed by David S. Miller

New 7.0 FW: bnx2x, cnic, bnx2i, bnx2fc

New FW/HSI (7.0):
 - Added support to 578xx chips
 - Improved HSI - much less driver's direct access to the FW internal
   memory needed.

New implementation of the HSI handling layer in the bnx2x (bnx2x_sp.c):
 - Introduced chip dependent objects that have chip independent interfaces
   for configuration of MACs, multicast addresses, Rx mode, indirection table,
   fast path queues and function initialization/cleanup.
 - Objects functionality is based on the private function pointers, which
   allows not only a per-chip but also PF/VF differentiation while still
   preserving the same interface towards the driver.
 - Objects interface is not influenced by the HSI changes which do not require
   providing new parameters keeping the code outside the bnx2x_sp.c invariant
   with regard to such HSI chnages.

Changes in a CNIC, bnx2fc and bnx2i modules due to the new HSI.
Signed-off-by: default avatarVladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarBhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@conan.davemloft.net>
parent 042181f5
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -55,15 +55,14 @@ static void bnx2x_pfc_set(struct bnx2x *bp) ...@@ -55,15 +55,14 @@ static void bnx2x_pfc_set(struct bnx2x *bp)
struct bnx2x_nig_brb_pfc_port_params pfc_params = {0}; struct bnx2x_nig_brb_pfc_port_params pfc_params = {0};
u32 pri_bit, val = 0; u32 pri_bit, val = 0;
u8 pri; u8 pri;
int i;
/* Tx COS configuration */ /* Tx COS configuration */
if (bp->dcbx_port_params.ets.cos_params[0].pauseable) for (i = 0; i < bp->dcbx_port_params.ets.num_of_cos; i++)
pfc_params.rx_cos0_priority_mask = if (bp->dcbx_port_params.ets.cos_params[i].pauseable)
bp->dcbx_port_params.ets.cos_params[0].pri_bitmask; pfc_params.rx_cos_priority_mask[i] =
if (bp->dcbx_port_params.ets.cos_params[1].pauseable) bp->dcbx_port_params.ets.
pfc_params.rx_cos1_priority_mask = cos_params[i].pri_bitmask;
bp->dcbx_port_params.ets.cos_params[1].pri_bitmask;
/** /**
* Rx COS configuration * Rx COS configuration
...@@ -378,7 +377,7 @@ static int bnx2x_dcbx_read_mib(struct bnx2x *bp, ...@@ -378,7 +377,7 @@ static int bnx2x_dcbx_read_mib(struct bnx2x *bp,
static void bnx2x_pfc_set_pfc(struct bnx2x *bp) static void bnx2x_pfc_set_pfc(struct bnx2x *bp)
{ {
if (CHIP_IS_E2(bp)) { if (!CHIP_IS_E1x(bp)) {
if (BP_PORT(bp)) { if (BP_PORT(bp)) {
BNX2X_ERR("4 port mode is not supported"); BNX2X_ERR("4 port mode is not supported");
return; return;
...@@ -406,7 +405,7 @@ static void bnx2x_dcbx_stop_hw_tx(struct bnx2x *bp) ...@@ -406,7 +405,7 @@ static void bnx2x_dcbx_stop_hw_tx(struct bnx2x *bp)
0 /* connectionless */, 0 /* connectionless */,
0 /* dataHi is zero */, 0 /* dataHi is zero */,
0 /* dataLo is zero */, 0 /* dataLo is zero */,
1 /* common */); NONE_CONNECTION_TYPE);
} }
static void bnx2x_dcbx_resume_hw_tx(struct bnx2x *bp) static void bnx2x_dcbx_resume_hw_tx(struct bnx2x *bp)
...@@ -417,7 +416,7 @@ static void bnx2x_dcbx_resume_hw_tx(struct bnx2x *bp) ...@@ -417,7 +416,7 @@ static void bnx2x_dcbx_resume_hw_tx(struct bnx2x *bp)
0, /* connectionless */ 0, /* connectionless */
U64_HI(bnx2x_sp_mapping(bp, pfc_config)), U64_HI(bnx2x_sp_mapping(bp, pfc_config)),
U64_LO(bnx2x_sp_mapping(bp, pfc_config)), U64_LO(bnx2x_sp_mapping(bp, pfc_config)),
1 /* commmon */); NONE_CONNECTION_TYPE);
} }
static void bnx2x_dcbx_update_ets_params(struct bnx2x *bp) static void bnx2x_dcbx_update_ets_params(struct bnx2x *bp)
...@@ -425,7 +424,7 @@ static void bnx2x_dcbx_update_ets_params(struct bnx2x *bp) ...@@ -425,7 +424,7 @@ static void bnx2x_dcbx_update_ets_params(struct bnx2x *bp)
struct bnx2x_dcbx_pg_params *ets = &(bp->dcbx_port_params.ets); struct bnx2x_dcbx_pg_params *ets = &(bp->dcbx_port_params.ets);
u8 status = 0; u8 status = 0;
bnx2x_ets_disabled(&bp->link_params); bnx2x_ets_disabled(&bp->link_params/*, &bp->link_vars*/);
if (!ets->enabled) if (!ets->enabled)
return; return;
...@@ -527,6 +526,7 @@ static int bnx2x_dcbx_read_shmem_neg_results(struct bnx2x *bp) ...@@ -527,6 +526,7 @@ static int bnx2x_dcbx_read_shmem_neg_results(struct bnx2x *bp)
BNX2X_ERR("FW doesn't support dcbx_neg_res_offset\n"); BNX2X_ERR("FW doesn't support dcbx_neg_res_offset\n");
return -EINVAL; return -EINVAL;
} }
rc = bnx2x_dcbx_read_mib(bp, (u32 *)&local_mib, dcbx_neg_res_offset, rc = bnx2x_dcbx_read_mib(bp, (u32 *)&local_mib, dcbx_neg_res_offset,
DCBX_READ_LOCAL_MIB); DCBX_READ_LOCAL_MIB);
...@@ -563,15 +563,6 @@ u8 bnx2x_dcbx_dcbnl_app_idtype(struct dcbx_app_priority_entry *ent) ...@@ -563,15 +563,6 @@ u8 bnx2x_dcbx_dcbnl_app_idtype(struct dcbx_app_priority_entry *ent)
DCB_APP_IDTYPE_ETHTYPE; DCB_APP_IDTYPE_ETHTYPE;
} }
static inline
void bnx2x_dcbx_invalidate_local_apps(struct bnx2x *bp)
{
int i;
for (i = 0; i < DCBX_MAX_APP_PROTOCOL; i++)
bp->dcbx_local_feat.app.app_pri_tbl[i].appBitfield &=
~DCBX_APP_ENTRY_VALID;
}
int bnx2x_dcbnl_update_applist(struct bnx2x *bp, bool delall) int bnx2x_dcbnl_update_applist(struct bnx2x *bp, bool delall)
{ {
int i, err = 0; int i, err = 0;
...@@ -597,32 +588,28 @@ int bnx2x_dcbnl_update_applist(struct bnx2x *bp, bool delall) ...@@ -597,32 +588,28 @@ int bnx2x_dcbnl_update_applist(struct bnx2x *bp, bool delall)
} }
#endif #endif
static inline void bnx2x_update_drv_flags(struct bnx2x *bp, u32 flags, u32 set)
{
if (SHMEM2_HAS(bp, drv_flags)) {
u32 drv_flags;
bnx2x_acquire_hw_lock(bp, HW_LOCK_DRV_FLAGS);
drv_flags = SHMEM2_RD(bp, drv_flags);
if (set)
SET_FLAGS(drv_flags, flags);
else
RESET_FLAGS(drv_flags, flags);
SHMEM2_WR(bp, drv_flags, drv_flags);
DP(NETIF_MSG_HW, "drv_flags 0x%08x\n", drv_flags);
bnx2x_release_hw_lock(bp, HW_LOCK_DRV_FLAGS);
}
}
void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state) void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state)
{ {
switch (state) { switch (state) {
case BNX2X_DCBX_STATE_NEG_RECEIVED: case BNX2X_DCBX_STATE_NEG_RECEIVED:
#ifdef BCM_CNIC
if (bp->state != BNX2X_STATE_OPENING_WAIT4_LOAD) {
struct cnic_ops *c_ops;
struct cnic_eth_dev *cp = &bp->cnic_eth_dev;
bp->flags |= NO_ISCSI_OOO_FLAG | NO_ISCSI_FLAG;
cp->drv_state |= CNIC_DRV_STATE_NO_ISCSI_OOO;
cp->drv_state |= CNIC_DRV_STATE_NO_ISCSI;
rcu_read_lock();
c_ops = rcu_dereference(bp->cnic_ops);
if (c_ops) {
bnx2x_cnic_notify(bp, CNIC_CTL_STOP_ISCSI_CMD);
rcu_read_unlock();
return;
}
rcu_read_unlock();
}
/* fall through if no CNIC initialized */
case BNX2X_DCBX_STATE_ISCSI_STOPPED:
#endif
{ {
DP(NETIF_MSG_LINK, "BNX2X_DCBX_STATE_NEG_RECEIVED\n"); DP(NETIF_MSG_LINK, "BNX2X_DCBX_STATE_NEG_RECEIVED\n");
#ifdef BCM_DCBNL #ifdef BCM_DCBNL
...@@ -646,41 +633,28 @@ void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state) ...@@ -646,41 +633,28 @@ void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state)
bnx2x_get_dcbx_drv_param(bp, &bp->dcbx_local_feat, bnx2x_get_dcbx_drv_param(bp, &bp->dcbx_local_feat,
bp->dcbx_error); bp->dcbx_error);
if (bp->state != BNX2X_STATE_OPENING_WAIT4_LOAD) { /* mark DCBX result for PMF migration */
#ifdef BCM_DCBNL bnx2x_update_drv_flags(bp, DRV_FLAGS_DCB_CONFIGURED, 1);
/**
* Add new app tlvs to dcbnl
*/
bnx2x_dcbnl_update_applist(bp, false);
#endif
bnx2x_dcbx_stop_hw_tx(bp);
return;
}
/* fall through */
#ifdef BCM_DCBNL #ifdef BCM_DCBNL
/** /**
* Invalidate the local app tlvs if they are not added * Add new app tlvs to dcbnl
* to the dcbnl app list to avoid deleting them from
* the list later on
*/ */
bnx2x_dcbx_invalidate_local_apps(bp); bnx2x_dcbnl_update_applist(bp, false);
#endif #endif
bnx2x_dcbx_stop_hw_tx(bp);
return;
} }
case BNX2X_DCBX_STATE_TX_PAUSED: case BNX2X_DCBX_STATE_TX_PAUSED:
DP(NETIF_MSG_LINK, "BNX2X_DCBX_STATE_TX_PAUSED\n"); DP(NETIF_MSG_LINK, "BNX2X_DCBX_STATE_TX_PAUSED\n");
bnx2x_pfc_set_pfc(bp); bnx2x_pfc_set_pfc(bp);
bnx2x_dcbx_update_ets_params(bp); bnx2x_dcbx_update_ets_params(bp);
if (bp->state != BNX2X_STATE_OPENING_WAIT4_LOAD) { bnx2x_dcbx_resume_hw_tx(bp);
bnx2x_dcbx_resume_hw_tx(bp); return;
return;
}
/* fall through */
case BNX2X_DCBX_STATE_TX_RELEASED: case BNX2X_DCBX_STATE_TX_RELEASED:
DP(NETIF_MSG_LINK, "BNX2X_DCBX_STATE_TX_RELEASED\n"); DP(NETIF_MSG_LINK, "BNX2X_DCBX_STATE_TX_RELEASED\n");
if (bp->state != BNX2X_STATE_OPENING_WAIT4_LOAD) bnx2x_fw_command(bp, DRV_MSG_CODE_DCBX_PMF_DRV_OK, 0);
bnx2x_fw_command(bp, DRV_MSG_CODE_DCBX_PMF_DRV_OK, 0);
return; return;
default: default:
BNX2X_ERR("Unknown DCBX_STATE\n"); BNX2X_ERR("Unknown DCBX_STATE\n");
...@@ -868,7 +842,7 @@ static void bnx2x_dcbx_admin_mib_updated_params(struct bnx2x *bp, ...@@ -868,7 +842,7 @@ static void bnx2x_dcbx_admin_mib_updated_params(struct bnx2x *bp,
void bnx2x_dcbx_set_state(struct bnx2x *bp, bool dcb_on, u32 dcbx_enabled) void bnx2x_dcbx_set_state(struct bnx2x *bp, bool dcb_on, u32 dcbx_enabled)
{ {
if (CHIP_IS_E2(bp) && !CHIP_MODE_IS_4_PORT(bp)) { if (!CHIP_IS_E1x(bp) && !CHIP_MODE_IS_4_PORT(bp)) {
bp->dcb_state = dcb_on; bp->dcb_state = dcb_on;
bp->dcbx_enabled = dcbx_enabled; bp->dcbx_enabled = dcbx_enabled;
} else { } else {
...@@ -966,7 +940,7 @@ void bnx2x_dcbx_init(struct bnx2x *bp) ...@@ -966,7 +940,7 @@ void bnx2x_dcbx_init(struct bnx2x *bp)
DP(NETIF_MSG_LINK, "dcb_state %d bp->port.pmf %d\n", DP(NETIF_MSG_LINK, "dcb_state %d bp->port.pmf %d\n",
bp->dcb_state, bp->port.pmf); bp->dcb_state, bp->port.pmf);
if (bp->dcb_state == BNX2X_DCB_STATE_ON && bp->port.pmf && if (bp->dcb_state == BNX2X_DCB_STATE_ON && bp->port.pmf &&
SHMEM2_HAS(bp, dcbx_lldp_params_offset)) { SHMEM2_HAS(bp, dcbx_lldp_params_offset)) {
dcbx_lldp_params_offset = dcbx_lldp_params_offset =
SHMEM2_RD(bp, dcbx_lldp_params_offset); SHMEM2_RD(bp, dcbx_lldp_params_offset);
...@@ -974,6 +948,8 @@ void bnx2x_dcbx_init(struct bnx2x *bp) ...@@ -974,6 +948,8 @@ void bnx2x_dcbx_init(struct bnx2x *bp)
DP(NETIF_MSG_LINK, "dcbx_lldp_params_offset 0x%x\n", DP(NETIF_MSG_LINK, "dcbx_lldp_params_offset 0x%x\n",
dcbx_lldp_params_offset); dcbx_lldp_params_offset);
bnx2x_update_drv_flags(bp, DRV_FLAGS_DCB_CONFIGURED, 0);
if (SHMEM_LLDP_DCBX_PARAMS_NONE != dcbx_lldp_params_offset) { if (SHMEM_LLDP_DCBX_PARAMS_NONE != dcbx_lldp_params_offset) {
bnx2x_dcbx_lldp_updated_params(bp, bnx2x_dcbx_lldp_updated_params(bp,
dcbx_lldp_params_offset); dcbx_lldp_params_offset);
...@@ -981,46 +957,12 @@ void bnx2x_dcbx_init(struct bnx2x *bp) ...@@ -981,46 +957,12 @@ void bnx2x_dcbx_init(struct bnx2x *bp)
bnx2x_dcbx_admin_mib_updated_params(bp, bnx2x_dcbx_admin_mib_updated_params(bp,
dcbx_lldp_params_offset); dcbx_lldp_params_offset);
/* set default configuration BC has */ /* Let HW start negotiation */
bnx2x_dcbx_set_params(bp,
BNX2X_DCBX_STATE_NEG_RECEIVED);
bnx2x_fw_command(bp, bnx2x_fw_command(bp,
DRV_MSG_CODE_DCBX_ADMIN_PMF_MSG, 0); DRV_MSG_CODE_DCBX_ADMIN_PMF_MSG, 0);
} }
} }
} }
void bnx2x_dcb_init_intmem_pfc(struct bnx2x *bp)
{
struct priority_cos pricos[MAX_PFC_TRAFFIC_TYPES];
u32 i = 0, addr;
memset(pricos, 0, sizeof(pricos));
/* Default initialization */
for (i = 0; i < MAX_PFC_TRAFFIC_TYPES; i++)
pricos[i].priority = LLFC_TRAFFIC_TYPE_TO_PRIORITY_UNMAPPED;
/* Store per port struct to internal memory */
addr = BAR_XSTRORM_INTMEM +
XSTORM_CMNG_PER_PORT_VARS_OFFSET(BP_PORT(bp)) +
offsetof(struct cmng_struct_per_port,
traffic_type_to_priority_cos);
__storm_memset_struct(bp, addr, sizeof(pricos), (u32 *)pricos);
/* LLFC disabled.*/
REG_WR8(bp , BAR_XSTRORM_INTMEM +
XSTORM_CMNG_PER_PORT_VARS_OFFSET(BP_PORT(bp)) +
offsetof(struct cmng_struct_per_port, llfc_mode),
LLFC_MODE_NONE);
/* DCBX disabled.*/
REG_WR8(bp , BAR_XSTRORM_INTMEM +
XSTORM_CMNG_PER_PORT_VARS_OFFSET(BP_PORT(bp)) +
offsetof(struct cmng_struct_per_port, dcb_enabled),
DCB_DISABLED);
}
static void static void
bnx2x_dcbx_print_cos_params(struct bnx2x *bp, bnx2x_dcbx_print_cos_params(struct bnx2x *bp,
struct flow_control_configuration *pfc_fw_cfg) struct flow_control_configuration *pfc_fw_cfg)
...@@ -1591,13 +1533,7 @@ static void bnx2x_pfc_fw_struct_e2(struct bnx2x *bp) ...@@ -1591,13 +1533,7 @@ static void bnx2x_pfc_fw_struct_e2(struct bnx2x *bp)
/* Fw version should be incremented each update */ /* Fw version should be incremented each update */
pfc_fw_cfg->dcb_version = ++bp->dcb_version; pfc_fw_cfg->dcb_version = ++bp->dcb_version;
pfc_fw_cfg->dcb_enabled = DCB_ENABLED; pfc_fw_cfg->dcb_enabled = 1;
/* Default initialization */
for (pri = 0; pri < MAX_PFC_TRAFFIC_TYPES ; pri++) {
tt2cos[pri].priority = LLFC_TRAFFIC_TYPE_TO_PRIORITY_UNMAPPED;
tt2cos[pri].cos = 0;
}
/* Fill priority parameters */ /* Fill priority parameters */
for (pri = 0; pri < LLFC_DRIVER_TRAFFIC_TYPE_MAX; pri++) { for (pri = 0; pri < LLFC_DRIVER_TRAFFIC_TYPE_MAX; pri++) {
...@@ -1605,14 +1541,37 @@ static void bnx2x_pfc_fw_struct_e2(struct bnx2x *bp) ...@@ -1605,14 +1541,37 @@ static void bnx2x_pfc_fw_struct_e2(struct bnx2x *bp)
pri_bit = 1 << tt2cos[pri].priority; pri_bit = 1 << tt2cos[pri].priority;
/* Fill COS parameters based on COS calculated to /* Fill COS parameters based on COS calculated to
* make it more generally for future use */ * make it more general for future use */
for (cos = 0; cos < bp->dcbx_port_params.ets.num_of_cos; cos++) for (cos = 0; cos < bp->dcbx_port_params.ets.num_of_cos; cos++)
if (bp->dcbx_port_params.ets.cos_params[cos]. if (bp->dcbx_port_params.ets.cos_params[cos].
pri_bitmask & pri_bit) pri_bitmask & pri_bit)
tt2cos[pri].cos = cos; tt2cos[pri].cos = cos;
} }
/* we never want the FW to add a 0 vlan tag */
pfc_fw_cfg->dont_add_pri_0_en = 1;
bnx2x_dcbx_print_cos_params(bp, pfc_fw_cfg); bnx2x_dcbx_print_cos_params(bp, pfc_fw_cfg);
} }
void bnx2x_dcbx_pmf_update(struct bnx2x *bp)
{
/* if we need to syncronize DCBX result from prev PMF
* read it from shmem and update bp accordingly
*/
if (SHMEM2_HAS(bp, drv_flags) &&
GET_FLAGS(SHMEM2_RD(bp, drv_flags), DRV_FLAGS_DCB_CONFIGURED)) {
/* Read neg results if dcbx is in the FW */
if (bnx2x_dcbx_read_shmem_neg_results(bp))
return;
bnx2x_dump_dcbx_drv_param(bp, &bp->dcbx_local_feat,
bp->dcbx_error);
bnx2x_get_dcbx_drv_param(bp, &bp->dcbx_local_feat,
bp->dcbx_error);
}
}
/* DCB netlink */ /* DCB netlink */
#ifdef BCM_DCBNL #ifdef BCM_DCBNL
......
...@@ -179,9 +179,6 @@ void bnx2x_dcbx_set_state(struct bnx2x *bp, bool dcb_on, u32 dcbx_enabled); ...@@ -179,9 +179,6 @@ void bnx2x_dcbx_set_state(struct bnx2x *bp, bool dcb_on, u32 dcbx_enabled);
enum { enum {
BNX2X_DCBX_STATE_NEG_RECEIVED = 0x1, BNX2X_DCBX_STATE_NEG_RECEIVED = 0x1,
#ifdef BCM_CNIC
BNX2X_DCBX_STATE_ISCSI_STOPPED,
#endif
BNX2X_DCBX_STATE_TX_PAUSED, BNX2X_DCBX_STATE_TX_PAUSED,
BNX2X_DCBX_STATE_TX_RELEASED BNX2X_DCBX_STATE_TX_RELEASED
}; };
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
#define PFC_BRB_FULL_LB_XOFF_THRESHOLD 170 #define PFC_BRB_FULL_LB_XOFF_THRESHOLD 170
#define PFC_BRB_FULL_LB_XON_THRESHOLD 250 #define PFC_BRB_FULL_LB_XON_THRESHOLD 250
#define MAXVAL(a, b) (((a) > (b)) ? (a) : (b))
/***********************************************************/ /***********************************************************/
/* Structs */ /* Structs */
/***********************************************************/ /***********************************************************/
...@@ -262,6 +263,8 @@ struct link_vars { ...@@ -262,6 +263,8 @@ struct link_vars {
#define MAC_TYPE_NONE 0 #define MAC_TYPE_NONE 0
#define MAC_TYPE_EMAC 1 #define MAC_TYPE_EMAC 1
#define MAC_TYPE_BMAC 2 #define MAC_TYPE_BMAC 2
#define MAC_TYPE_UMAC 3
#define MAC_TYPE_XMAC 4
u8 phy_link_up; /* internal phy link indication */ u8 phy_link_up; /* internal phy link indication */
u8 link_up; u8 link_up;
...@@ -363,6 +366,20 @@ int bnx2x_phy_probe(struct link_params *params); ...@@ -363,6 +366,20 @@ int bnx2x_phy_probe(struct link_params *params);
u8 bnx2x_fan_failure_det_req(struct bnx2x *bp, u32 shmem_base, u8 bnx2x_fan_failure_det_req(struct bnx2x *bp, u32 shmem_base,
u32 shmem2_base, u8 port); u32 shmem2_base, u8 port);
/* DCBX structs */
/* Number of maximum COS per chip */
#define DCBX_E2E3_MAX_NUM_COS (2)
#define DCBX_E3B0_MAX_NUM_COS_PORT0 (6)
#define DCBX_E3B0_MAX_NUM_COS_PORT1 (3)
#define DCBX_E3B0_MAX_NUM_COS ( \
MAXVAL(DCBX_E3B0_MAX_NUM_COS_PORT0, \
DCBX_E3B0_MAX_NUM_COS_PORT1))
#define DCBX_MAX_NUM_COS ( \
MAXVAL(DCBX_E3B0_MAX_NUM_COS, \
DCBX_E2E3_MAX_NUM_COS))
/* PFC port configuration params */ /* PFC port configuration params */
struct bnx2x_nig_brb_pfc_port_params { struct bnx2x_nig_brb_pfc_port_params {
/* NIG */ /* NIG */
...@@ -370,8 +387,8 @@ struct bnx2x_nig_brb_pfc_port_params { ...@@ -370,8 +387,8 @@ struct bnx2x_nig_brb_pfc_port_params {
u32 llfc_out_en; u32 llfc_out_en;
u32 llfc_enable; u32 llfc_enable;
u32 pkt_priority_to_cos; u32 pkt_priority_to_cos;
u32 rx_cos0_priority_mask; u8 num_of_rx_cos_priority_mask;
u32 rx_cos1_priority_mask; u32 rx_cos_priority_mask[DCBX_MAX_NUM_COS];
u32 llfc_high_priority_classes; u32 llfc_high_priority_classes;
u32 llfc_low_priority_classes; u32 llfc_low_priority_classes;
/* BRB */ /* BRB */
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#ifndef CNIC_IF_H #ifndef CNIC_IF_H
#define CNIC_IF_H #define CNIC_IF_H
#define CNIC_MODULE_VERSION "2.2.14" #define CNIC_MODULE_VERSION "2.5.3"
#define CNIC_MODULE_RELDATE "Mar 30, 2011" #define CNIC_MODULE_RELDATE "June 6, 2011"
#define CNIC_ULP_RDMA 0 #define CNIC_ULP_RDMA 0
#define CNIC_ULP_ISCSI 1 #define CNIC_ULP_ISCSI 1
...@@ -99,6 +99,8 @@ struct kcqe { ...@@ -99,6 +99,8 @@ struct kcqe {
struct cnic_ctl_completion { struct cnic_ctl_completion {
u32 cid; u32 cid;
u8 opcode;
u8 error;
}; };
struct cnic_ctl_info { struct cnic_ctl_info {
...@@ -169,7 +171,7 @@ struct cnic_eth_dev { ...@@ -169,7 +171,7 @@ struct cnic_eth_dev {
struct pci_dev *pdev; struct pci_dev *pdev;
void __iomem *io_base; void __iomem *io_base;
void __iomem *io_base2; void __iomem *io_base2;
void *iro_arr; const void *iro_arr;
u32 ctx_tbl_offset; u32 ctx_tbl_offset;
u32 ctx_tbl_len; u32 ctx_tbl_len;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -21,7 +21,7 @@ DEFINE_PER_CPU(struct bnx2fc_percpu_s, bnx2fc_percpu); ...@@ -21,7 +21,7 @@ DEFINE_PER_CPU(struct bnx2fc_percpu_s, bnx2fc_percpu);
#define DRV_MODULE_NAME "bnx2fc" #define DRV_MODULE_NAME "bnx2fc"
#define DRV_MODULE_VERSION BNX2FC_VERSION #define DRV_MODULE_VERSION BNX2FC_VERSION
#define DRV_MODULE_RELDATE "Mar 17, 2011" #define DRV_MODULE_RELDATE "Jun 10, 2011"
static char version[] __devinitdata = static char version[] __devinitdata =
...@@ -612,7 +612,7 @@ static struct fc_host_statistics *bnx2fc_get_host_stats(struct Scsi_Host *shost) ...@@ -612,7 +612,7 @@ static struct fc_host_statistics *bnx2fc_get_host_stats(struct Scsi_Host *shost)
BNX2FC_HBA_DBG(lport, "FW stat req timed out\n"); BNX2FC_HBA_DBG(lport, "FW stat req timed out\n");
return bnx2fc_stats; return bnx2fc_stats;
} }
bnx2fc_stats->invalid_crc_count += fw_stats->rx_stat1.fc_crc_cnt; bnx2fc_stats->invalid_crc_count += fw_stats->rx_stat2.fc_crc_cnt;
bnx2fc_stats->tx_frames += fw_stats->tx_stat.fcoe_tx_pkt_cnt; bnx2fc_stats->tx_frames += fw_stats->tx_stat.fcoe_tx_pkt_cnt;
bnx2fc_stats->tx_words += (fw_stats->tx_stat.fcoe_tx_byte_cnt) / 4; bnx2fc_stats->tx_words += (fw_stats->tx_stat.fcoe_tx_byte_cnt) / 4;
bnx2fc_stats->rx_frames += fw_stats->rx_stat0.fcoe_rx_pkt_cnt; bnx2fc_stats->rx_frames += fw_stats->rx_stat0.fcoe_rx_pkt_cnt;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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