hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bnx2x: Semantic change of empty lines 

This patch removes unnecessary blank lines and adds a few where such are needed
(between variable declarations and code)

Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yuval Mintz 2013-06-02 00:06:17 +00:00 committed by David S. Miller
parent ada7c19e6d
commit d76a611187
14 changed files with 3 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
View File

@ -34,12 +34,10 @@
#define BCM_DCBNL #define BCM_DCBNL
#endif #endif
#include "bnx2x_hsi.h" #include "bnx2x_hsi.h"
#include "../cnic_if.h" #include "../cnic_if.h"
#define BNX2X_MIN_MSIX_VEC_CNT(bp) ((bp)->min_msix_vec_cnt) #define BNX2X_MIN_MSIX_VEC_CNT(bp) ((bp)->min_msix_vec_cnt)
#include <linux/mdio.h> #include <linux/mdio.h>
@ -114,7 +112,6 @@ do { \
#define BNX2X_ERROR(fmt, ...) \ #define BNX2X_ERROR(fmt, ...) \
pr_err("[%s:%d]" fmt, __func__, __LINE__, ##__VA_ARGS__) pr_err("[%s:%d]" fmt, __func__, __LINE__, ##__VA_ARGS__)
/* before we have a dev->name use dev_info() */ /* before we have a dev->name use dev_info() */
#define BNX2X_DEV_INFO(fmt, ...) \ #define BNX2X_DEV_INFO(fmt, ...) \
do { \ do { \
@ -147,7 +144,6 @@ do { \
#define U64_HI(x) ((u32)(((u64)(x)) >> 32)) #define U64_HI(x) ((u32)(((u64)(x)) >> 32))
#define HILO_U64(hi, lo) ((((u64)(hi)) << 32) + (lo)) #define HILO_U64(hi, lo) ((((u64)(hi)) << 32) + (lo))
#define REG_ADDR(bp, offset) ((bp->regview) + (offset)) #define REG_ADDR(bp, offset) ((bp->regview) + (offset))
#define REG_RD(bp, offset) readl(REG_ADDR(bp, offset)) #define REG_RD(bp, offset) readl(REG_ADDR(bp, offset))
@ -387,7 +383,6 @@ union db_prod {
#define BIT_VEC64_ELEM_SHIFT 6 #define BIT_VEC64_ELEM_SHIFT 6
#define BIT_VEC64_ELEM_MASK ((u64)BIT_VEC64_ELEM_SZ - 1) #define BIT_VEC64_ELEM_MASK ((u64)BIT_VEC64_ELEM_SZ - 1)
#define __BIT_VEC64_SET_BIT(el, bit) \ #define __BIT_VEC64_SET_BIT(el, bit) \
do { \ do { \
el = ((el) | ((u64)0x1 << (bit))); \ el = ((el) | ((u64)0x1 << (bit))); \
@ -398,7 +393,6 @@ union db_prod {
el = ((el) & (~((u64)0x1 << (bit)))); \ el = ((el) & (~((u64)0x1 << (bit)))); \
} while (0) } while (0)
#define BIT_VEC64_SET_BIT(vec64, idx) \ #define BIT_VEC64_SET_BIT(vec64, idx) \
__BIT_VEC64_SET_BIT((vec64)[(idx) >> BIT_VEC64_ELEM_SHIFT], \ __BIT_VEC64_SET_BIT((vec64)[(idx) >> BIT_VEC64_ELEM_SHIFT], \
(idx) & BIT_VEC64_ELEM_MASK) (idx) & BIT_VEC64_ELEM_MASK)
@ -419,8 +413,6 @@ union db_prod {
/*******************************************************/ /*******************************************************/
/* Number of u64 elements in SGE mask array */ /* Number of u64 elements in SGE mask array */
#define RX_SGE_MASK_LEN (NUM_RX_SGE / BIT_VEC64_ELEM_SZ) #define RX_SGE_MASK_LEN (NUM_RX_SGE / BIT_VEC64_ELEM_SZ)
#define RX_SGE_MASK_LEN_MASK (RX_SGE_MASK_LEN - 1) #define RX_SGE_MASK_LEN_MASK (RX_SGE_MASK_LEN - 1)
@ -580,12 +572,10 @@ struct bnx2x_fastpath {
txdata_ptr[FIRST_TX_COS_INDEX] \ txdata_ptr[FIRST_TX_COS_INDEX] \
->var) ->var)
#define IS_ETH_FP(fp) ((fp)->index < BNX2X_NUM_ETH_QUEUES((fp)->bp)) #define IS_ETH_FP(fp) ((fp)->index < BNX2X_NUM_ETH_QUEUES((fp)->bp))
#define IS_FCOE_FP(fp) ((fp)->index == FCOE_IDX((fp)->bp)) #define IS_FCOE_FP(fp) ((fp)->index == FCOE_IDX((fp)->bp))
#define IS_FCOE_IDX(idx) ((idx) == FCOE_IDX(bp)) #define IS_FCOE_IDX(idx) ((idx) == FCOE_IDX(bp))
/* MC hsi */ /* MC hsi */
#define MAX_FETCH_BD 13 /* HW max BDs per packet */ #define MAX_FETCH_BD 13 /* HW max BDs per packet */
#define RX_COPY_THRESH 92 #define RX_COPY_THRESH 92
@ -693,12 +683,10 @@ struct bnx2x_fastpath {
FW_DROP_LEVEL(bp)) FW_DROP_LEVEL(bp))
#define RCQ_TH_HI(bp) (RCQ_TH_LO(bp) + DROPLESS_FC_HEADROOM) #define RCQ_TH_HI(bp) (RCQ_TH_LO(bp) + DROPLESS_FC_HEADROOM)
/* This is needed for determining of last_max */ /* This is needed for determining of last_max */
#define SUB_S16(a, b) (s16)((s16)(a) - (s16)(b)) #define SUB_S16(a, b) (s16)((s16)(a) - (s16)(b))
#define SUB_S32(a, b) (s32)((s32)(a) - (s32)(b)) #define SUB_S32(a, b) (s32)((s32)(a) - (s32)(b))
#define BNX2X_SWCID_SHIFT 17 #define BNX2X_SWCID_SHIFT 17
#define BNX2X_SWCID_MASK ((0x1 << BNX2X_SWCID_SHIFT) - 1) #define BNX2X_SWCID_MASK ((0x1 << BNX2X_SWCID_SHIFT) - 1)
@ -723,7 +711,6 @@ struct bnx2x_fastpath {
DPM_TRIGER_TYPE); \ DPM_TRIGER_TYPE); \
} while (0) } while (0)
/* TX CSUM helpers */ /* TX CSUM helpers */
#define SKB_CS_OFF(skb) (offsetof(struct tcphdr, check) - \ #define SKB_CS_OFF(skb) (offsetof(struct tcphdr, check) - \
skb->csum_offset) skb->csum_offset)
@ -766,7 +753,6 @@ struct bnx2x_fastpath {
#define BNX2X_RX_SUM_FIX(cqe) \ #define BNX2X_RX_SUM_FIX(cqe) \
BNX2X_PRS_FLAG_OVERETH_IPV4(cqe->fast_path_cqe.pars_flags.flags) BNX2X_PRS_FLAG_OVERETH_IPV4(cqe->fast_path_cqe.pars_flags.flags)
#define FP_USB_FUNC_OFF \ #define FP_USB_FUNC_OFF \
offsetof(struct cstorm_status_block_u, func) offsetof(struct cstorm_status_block_u, func)
#define FP_CSB_FUNC_OFF \ #define FP_CSB_FUNC_OFF \
@ -1068,7 +1054,6 @@ struct bnx2x_slowpath {
struct eth_classify_rules_ramrod_data e2; struct eth_classify_rules_ramrod_data e2;
} mac_rdata; } mac_rdata;
union { union {
struct tstorm_eth_mac_filter_config e1x; struct tstorm_eth_mac_filter_config e1x;
struct eth_filter_rules_ramrod_data e2; struct eth_filter_rules_ramrod_data e2;
@ -1119,7 +1104,6 @@ struct bnx2x_slowpath {
#define bnx2x_sp_mapping(bp, var) \ #define bnx2x_sp_mapping(bp, var) \
(bp->slowpath_mapping + offsetof(struct bnx2x_slowpath, var)) (bp->slowpath_mapping + offsetof(struct bnx2x_slowpath, var))
/* attn group wiring */ /* attn group wiring */
#define MAX_DYNAMIC_ATTN_GRPS 8 #define MAX_DYNAMIC_ATTN_GRPS 8
@ -1225,7 +1209,6 @@ enum {
BNX2X_SP_RTNL_HYPERVISOR_VLAN, BNX2X_SP_RTNL_HYPERVISOR_VLAN,
}; };
struct bnx2x_prev_path_list { struct bnx2x_prev_path_list {
struct list_head list; struct list_head list;
u8 bus; u8 bus;
@ -1755,7 +1738,6 @@ extern int num_queues;
#define FUNC_FLG_SPQ 0x0010 #define FUNC_FLG_SPQ 0x0010
#define FUNC_FLG_LEADING 0x0020 /* PF only */ #define FUNC_FLG_LEADING 0x0020 /* PF only */
struct bnx2x_func_init_params { struct bnx2x_func_init_params {
/* dma */ /* dma */
dma_addr_t fw_stat_map; /* valid iff FUNC_FLG_STATS */ dma_addr_t fw_stat_map; /* valid iff FUNC_FLG_STATS */
@ -1853,9 +1835,6 @@ struct bnx2x_func_init_params {
#define skip_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx)) #define skip_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx))
/** /**
* bnx2x_set_mac_one - configure a single MAC address * bnx2x_set_mac_one - configure a single MAC address
* *
@ -2000,7 +1979,6 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id,
#define UNLOAD_CLOSE 1 #define UNLOAD_CLOSE 1
#define UNLOAD_RECOVERY 2 #define UNLOAD_RECOVERY 2
/* DMAE command defines */ /* DMAE command defines */
#define DMAE_TIMEOUT -1 #define DMAE_TIMEOUT -1
#define DMAE_PCI_ERROR -2 /* E2 and onward */ #define DMAE_PCI_ERROR -2 /* E2 and onward */
@ -2102,7 +2080,6 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id,
#define SP_DESC_CNT (BCM_PAGE_SIZE / sizeof(struct eth_spe)) #define SP_DESC_CNT (BCM_PAGE_SIZE / sizeof(struct eth_spe))
#define MAX_SP_DESC_CNT (SP_DESC_CNT - 1) #define MAX_SP_DESC_CNT (SP_DESC_CNT - 1)
#define BNX2X_BTR 4 #define BNX2X_BTR 4
#define MAX_SPQ_PENDING 8 #define MAX_SPQ_PENDING 8

12
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
View File

@ -165,7 +165,6 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata,
dma_unmap_single(&bp->pdev->dev, BD_UNMAP_ADDR(tx_start_bd), dma_unmap_single(&bp->pdev->dev, BD_UNMAP_ADDR(tx_start_bd),
BD_UNMAP_LEN(tx_start_bd), DMA_TO_DEVICE); BD_UNMAP_LEN(tx_start_bd), DMA_TO_DEVICE);
nbd = le16_to_cpu(tx_start_bd->nbd) - 1; nbd = le16_to_cpu(tx_start_bd->nbd) - 1;
#ifdef BNX2X_STOP_ON_ERROR #ifdef BNX2X_STOP_ON_ERROR
if ((nbd - 1) > (MAX_SKB_FRAGS + 2)) { if ((nbd - 1) > (MAX_SKB_FRAGS + 2)) {
@ -733,7 +732,6 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
} }
/* put new data in bin */ /* put new data in bin */
rx_buf->data = new_data; rx_buf->data = new_data;
@ -899,7 +897,6 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
cqe_fp); cqe_fp);
goto next_rx; goto next_rx;
} }
queue = cqe->end_agg_cqe.queue_index; queue = cqe->end_agg_cqe.queue_index;
tpa_info = &fp->tpa_info[queue]; tpa_info = &fp->tpa_info[queue];
@ -1004,7 +1001,6 @@ reuse_rx:
le16_to_cpu(cqe_fp->vlan_tag)); le16_to_cpu(cqe_fp->vlan_tag));
napi_gro_receive(&fp->napi, skb); napi_gro_receive(&fp->napi, skb);
next_rx: next_rx:
rx_buf->data = NULL; rx_buf->data = NULL;
@ -2322,10 +2318,10 @@ static void bnx2x_nic_load_afex_dcc(struct bnx2x *bp, int load_code)
static void bnx2x_bz_fp(struct bnx2x *bp, int index) static void bnx2x_bz_fp(struct bnx2x *bp, int index)
{ {
struct bnx2x_fastpath *fp = &bp->fp[index]; struct bnx2x_fastpath *fp = &bp->fp[index];
int cos; int cos;
struct napi_struct orig_napi = fp->napi; struct napi_struct orig_napi = fp->napi;
struct bnx2x_agg_info *orig_tpa_info = fp->tpa_info; struct bnx2x_agg_info *orig_tpa_info = fp->tpa_info;
/* bzero bnx2x_fastpath contents */ /* bzero bnx2x_fastpath contents */
if (fp->tpa_info) if (fp->tpa_info)
memset(fp->tpa_info, 0, ETH_MAX_AGGREGATION_QUEUES_E1H_E2 * memset(fp->tpa_info, 0, ETH_MAX_AGGREGATION_QUEUES_E1H_E2 *
@ -2435,7 +2431,6 @@ int bnx2x_load_cnic(struct bnx2x *bp)
if (bp->state == BNX2X_STATE_OPEN) if (bp->state == BNX2X_STATE_OPEN)
bnx2x_cnic_notify(bp, CNIC_CTL_START_CMD); bnx2x_cnic_notify(bp, CNIC_CTL_START_CMD);
DP(NETIF_MSG_IFUP, "Ending successfully CNIC-related load\n"); DP(NETIF_MSG_IFUP, "Ending successfully CNIC-related load\n");
return 0; return 0;
@ -2961,7 +2956,6 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link)
bnx2x_set_reset_global(bp); bnx2x_set_reset_global(bp);
} }
/* The last driver must disable a "close the gate" if there is no /* The last driver must disable a "close the gate" if there is no
* parity attention or "process kill" pending. * parity attention or "process kill" pending.
*/ */
@ -4480,7 +4474,6 @@ int bnx2x_alloc_mem_bp(struct bnx2x *bp)
alloc_err: alloc_err:
bnx2x_free_mem_bp(bp); bnx2x_free_mem_bp(bp);
return -ENOMEM; return -ENOMEM;
} }
int bnx2x_reload_if_running(struct net_device *dev) int bnx2x_reload_if_running(struct net_device *dev)
@ -4522,7 +4515,6 @@ int bnx2x_get_cur_phy_idx(struct bnx2x *bp)
} }
return sel_phy_idx; return sel_phy_idx;
} }
int bnx2x_get_link_cfg_idx(struct bnx2x *bp) int bnx2x_get_link_cfg_idx(struct bnx2x *bp)
{ {
@ -4739,7 +4731,6 @@ int bnx2x_resume(struct pci_dev *pdev)
return rc; return rc;
} }
void bnx2x_set_ctx_validation(struct bnx2x *bp, struct eth_context *cxt, void bnx2x_set_ctx_validation(struct bnx2x *bp, struct eth_context *cxt,
u32 cid) u32 cid)
{ {
@ -4757,7 +4748,6 @@ static void storm_memset_hc_timeout(struct bnx2x *bp, u8 port,
u8 fw_sb_id, u8 sb_index, u8 fw_sb_id, u8 sb_index,
u8 ticks) u8 ticks)
{ {
u32 addr = BAR_CSTRORM_INTMEM + u32 addr = BAR_CSTRORM_INTMEM +
CSTORM_STATUS_BLOCK_DATA_TIMEOUT_OFFSET(fw_sb_id, sb_index); CSTORM_STATUS_BLOCK_DATA_TIMEOUT_OFFSET(fw_sb_id, sb_index);
REG_WR8(bp, addr, ticks); REG_WR8(bp, addr, ticks);

3
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
View File

@ -22,7 +22,6 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include "bnx2x.h" #include "bnx2x.h"
#include "bnx2x_sriov.h" #include "bnx2x_sriov.h"
@ -1171,7 +1170,6 @@ static inline u8 bnx2x_cnic_eth_cl_id(struct bnx2x *bp, u8 cl_idx)
static inline u8 bnx2x_cnic_fw_sb_id(struct bnx2x *bp) static inline u8 bnx2x_cnic_fw_sb_id(struct bnx2x *bp)
{ {
/* the 'first' id is allocated for the cnic */ /* the 'first' id is allocated for the cnic */
return bp->base_fw_ndsb; return bp->base_fw_ndsb;
} }
@ -1181,7 +1179,6 @@ static inline u8 bnx2x_cnic_igu_sb_id(struct bnx2x *bp)
return bp->igu_base_sb; return bp->igu_base_sb;
} }
static inline void bnx2x_init_fcoe_fp(struct bnx2x *bp) static inline void bnx2x_init_fcoe_fp(struct bnx2x *bp)
{ {
struct bnx2x_fastpath *fp = bnx2x_fcoe_fp(bp); struct bnx2x_fastpath *fp = bnx2x_fcoe_fp(bp);

11
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
View File

@ -253,7 +253,6 @@ static void bnx2x_dcbx_get_ets_feature(struct bnx2x *bp,
memset(&pg_help_data, 0, sizeof(struct pg_help_data)); memset(&pg_help_data, 0, sizeof(struct pg_help_data));
if (GET_FLAGS(error, DCBX_LOCAL_ETS_ERROR)) if (GET_FLAGS(error, DCBX_LOCAL_ETS_ERROR))
DP(BNX2X_MSG_DCB, "DCBX_LOCAL_ETS_ERROR\n"); DP(BNX2X_MSG_DCB, "DCBX_LOCAL_ETS_ERROR\n");
@ -298,7 +297,6 @@ static void bnx2x_dcbx_get_ets_feature(struct bnx2x *bp,
static void bnx2x_dcbx_get_pfc_feature(struct bnx2x *bp, static void bnx2x_dcbx_get_pfc_feature(struct bnx2x *bp,
struct dcbx_pfc_feature *pfc, u32 error) struct dcbx_pfc_feature *pfc, u32 error)
{ {
if (GET_FLAGS(error, DCBX_LOCAL_PFC_ERROR)) if (GET_FLAGS(error, DCBX_LOCAL_PFC_ERROR))
DP(BNX2X_MSG_DCB, "DCBX_LOCAL_PFC_ERROR\n"); DP(BNX2X_MSG_DCB, "DCBX_LOCAL_PFC_ERROR\n");
@ -367,7 +365,6 @@ static int bnx2x_dcbx_read_mib(struct bnx2x *bp,
struct lldp_remote_mib *remote_mib ; struct lldp_remote_mib *remote_mib ;
struct lldp_local_mib *local_mib; struct lldp_local_mib *local_mib;
switch (read_mib_type) { switch (read_mib_type) {
case DCBX_READ_LOCAL_MIB: case DCBX_READ_LOCAL_MIB:
mib_size = sizeof(struct lldp_local_mib); mib_size = sizeof(struct lldp_local_mib);
@ -629,7 +626,6 @@ static int bnx2x_dcbx_read_shmem_neg_results(struct bnx2x *bp)
return 0; return 0;
} }
#ifdef BCM_DCBNL #ifdef BCM_DCBNL
static inline static inline
u8 bnx2x_dcbx_dcbnl_app_up(struct dcbx_app_priority_entry *ent) u8 bnx2x_dcbx_dcbnl_app_up(struct dcbx_app_priority_entry *ent)
@ -896,13 +892,11 @@ static void bnx2x_dcbx_admin_mib_updated_params(struct bnx2x *bp,
} }
af->app.default_pri = (u8)dp->admin_default_priority; af->app.default_pri = (u8)dp->admin_default_priority;
} }
/* Write the data. */ /* Write the data. */
bnx2x_write_data(bp, (u32 *)&admin_mib, offset, bnx2x_write_data(bp, (u32 *)&admin_mib, offset,
sizeof(struct lldp_admin_mib)); sizeof(struct lldp_admin_mib));
} }
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)
@ -1181,7 +1175,6 @@ static void bnx2x_dcbx_separate_pauseable_from_non(struct bnx2x *bp,
BNX2X_ERR("dcbx error: Both groups must have priorities\n"); BNX2X_ERR("dcbx error: Both groups must have priorities\n");
} }
#ifndef POWER_OF_2 #ifndef POWER_OF_2
#define POWER_OF_2(x) ((0 != x) && (0 == (x & (x-1)))) #define POWER_OF_2(x) ((0 != x) && (0 == (x & (x-1))))
#endif #endif
@ -1524,7 +1517,6 @@ static void bnx2x_dcbx_2cos_limit_cee_three_pg_to_cos_params(
} }
} }
static void bnx2x_dcbx_2cos_limit_cee_fill_cos_params(struct bnx2x *bp, static void bnx2x_dcbx_2cos_limit_cee_fill_cos_params(struct bnx2x *bp,
struct pg_help_data *help_data, struct pg_help_data *help_data,
struct dcbx_ets_feature *ets, struct dcbx_ets_feature *ets,
@ -1533,7 +1525,6 @@ static void bnx2x_dcbx_2cos_limit_cee_fill_cos_params(struct bnx2x *bp,
u32 pri_join_mask, u32 pri_join_mask,
u8 num_of_dif_pri) u8 num_of_dif_pri)
{ {
/* default E2 settings */ /* default E2 settings */
cos_data->num_of_cos = DCBX_COS_MAX_NUM_E2; cos_data->num_of_cos = DCBX_COS_MAX_NUM_E2;
@ -1629,7 +1620,6 @@ static u8 bnx2x_dcbx_cee_fill_strict_pri(struct bnx2x *bp,
u8 num_spread_of_entries, u8 num_spread_of_entries,
u8 strict_app_pris) u8 strict_app_pris)
{ {
if (bnx2x_dcbx_spread_strict_pri(bp, cos_data, entry, if (bnx2x_dcbx_spread_strict_pri(bp, cos_data, entry,
num_spread_of_entries, num_spread_of_entries,
strict_app_pris)) { strict_app_pris)) {
@ -1876,7 +1866,6 @@ void bnx2x_dcbx_pmf_update(struct bnx2x *bp)
* dcbx negotiation. * dcbx negotiation.
*/ */
bnx2x_dcbx_update_tc_mapping(bp); bnx2x_dcbx_update_tc_mapping(bp);
} }
} }

3
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h
View File

@ -134,8 +134,6 @@ enum {
#define PFC_BRB1_REG_HIGH_LLFC_LOW_THRESHOLD 130 #define PFC_BRB1_REG_HIGH_LLFC_LOW_THRESHOLD 130
#define PFC_BRB1_REG_HIGH_LLFC_HIGH_THRESHOLD 170 #define PFC_BRB1_REG_HIGH_LLFC_HIGH_THRESHOLD 170
struct cos_entry_help_data { struct cos_entry_help_data {
u32 pri_join_mask; u32 pri_join_mask;
u32 cos_bw; u32 cos_bw;
@ -170,7 +168,6 @@ struct cos_help_data {
(!(IS_DCBX_PFC_PRI_ONLY_NON_PAUSE((bp), (pg_pri)) || \ (!(IS_DCBX_PFC_PRI_ONLY_NON_PAUSE((bp), (pg_pri)) || \
IS_DCBX_PFC_PRI_ONLY_PAUSE((bp), (pg_pri)))) IS_DCBX_PFC_PRI_ONLY_PAUSE((bp), (pg_pri))))
struct pg_entry_help_data { struct pg_entry_help_data {
u8 num_of_dif_pri; u8 num_of_dif_pri;
u8 pg; u8 pg;

1
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h
View File

@ -28,7 +28,6 @@
#define DRV_DUMP_USTORM_WAITP_ADDRESS 0x338a80 #define DRV_DUMP_USTORM_WAITP_ADDRESS 0x338a80
#define DRV_DUMP_CSTORM_WAITP_ADDRESS 0x238a80 #define DRV_DUMP_CSTORM_WAITP_ADDRESS 0x238a80
/* Possible Chips */ /* Possible Chips */
#define DUMP_CHIP_E1 1 #define DUMP_CHIP_E1 1
#define DUMP_CHIP_E1H 2 #define DUMP_CHIP_E1H 2

4
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
View File

@ -733,7 +733,6 @@ static bool bnx2x_is_reg_in_chip(struct bnx2x *bp,
return false; return false;
} }
static bool bnx2x_is_wreg_in_chip(struct bnx2x *bp, static bool bnx2x_is_wreg_in_chip(struct bnx2x *bp,
const struct wreg_addr *wreg_info) const struct wreg_addr *wreg_info)
{ {
@ -3071,7 +3070,6 @@ static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
} }
} }
for (i = 0, j = 0; i < BNX2X_NUM_STATS; i++) { for (i = 0, j = 0; i < BNX2X_NUM_STATS; i++) {
if (IS_MF_MODE_STAT(bp) && IS_PORT_STAT(i)) if (IS_MF_MODE_STAT(bp) && IS_PORT_STAT(i))
continue; continue;
@ -3194,7 +3192,6 @@ static int bnx2x_set_phys_id(struct net_device *dev,
static int bnx2x_get_rss_flags(struct bnx2x *bp, struct ethtool_rxnfc *info) static int bnx2x_get_rss_flags(struct bnx2x *bp, struct ethtool_rxnfc *info)
{ {
switch (info->flow_type) { switch (info->flow_type) {
case TCP_V4_FLOW: case TCP_V4_FLOW:
case TCP_V6_FLOW: case TCP_V6_FLOW:
@ -3430,7 +3427,6 @@ static int bnx2x_set_channels(struct net_device *dev,
{ {
struct bnx2x *bp = netdev_priv(dev); struct bnx2x *bp = netdev_priv(dev);
DP(BNX2X_MSG_ETHTOOL, DP(BNX2X_MSG_ETHTOOL,
"set-channels command parameters: rx = %d, tx = %d, other = %d, combined = %d\n", "set-channels command parameters: rx = %d, tx = %d, other = %d, combined = %d\n",
channels->rx_count, channels->tx_count, channels->other_count, channels->rx_count, channels->tx_count, channels->other_count,

68
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
View File

@ -93,7 +93,6 @@ MODULE_FIRMWARE(FW_FILE_NAME_E1);
MODULE_FIRMWARE(FW_FILE_NAME_E1H); MODULE_FIRMWARE(FW_FILE_NAME_E1H);
MODULE_FIRMWARE(FW_FILE_NAME_E2); MODULE_FIRMWARE(FW_FILE_NAME_E2);
int num_queues; int num_queues;
module_param(num_queues, int, 0); module_param(num_queues, int, 0);
MODULE_PARM_DESC(num_queues, MODULE_PARM_DESC(num_queues,
@ -122,8 +121,6 @@ static int debug;
module_param(debug, int, 0); module_param(debug, int, 0);
MODULE_PARM_DESC(debug, " Default debug msglevel"); MODULE_PARM_DESC(debug, " Default debug msglevel");
struct workqueue_struct *bnx2x_wq; struct workqueue_struct *bnx2x_wq;
struct bnx2x_mac_vals { struct bnx2x_mac_vals {
@ -917,7 +914,6 @@ void bnx2x_panic_dump(struct bnx2x *bp, bool disable_int)
sp_sb_data.p_func.vf_valid, sp_sb_data.p_func.vf_valid,
sp_sb_data.state); sp_sb_data.state);
for_each_eth_queue(bp, i) { for_each_eth_queue(bp, i) {
struct bnx2x_fastpath *fp = &bp->fp[i]; struct bnx2x_fastpath *fp = &bp->fp[i];
int loop; int loop;
@ -1290,7 +1286,6 @@ void bnx2x_tx_hw_flushed(struct bnx2x *bp, u32 poll_count)
for (i = 0; i < ARRAY_SIZE(cmd_regs); i++) for (i = 0; i < ARRAY_SIZE(cmd_regs); i++)
bnx2x_pbf_pN_cmd_flushed(bp, &cmd_regs[i], poll_count); bnx2x_pbf_pN_cmd_flushed(bp, &cmd_regs[i], poll_count);
/* Verify the transmission buffers are flushed P0, P1, P4 */ /* Verify the transmission buffers are flushed P0, P1, P4 */
for (i = 0; i < ARRAY_SIZE(buf_regs); i++) for (i = 0; i < ARRAY_SIZE(buf_regs); i++)
bnx2x_pbf_pN_buf_flushed(bp, &buf_regs[i], poll_count); bnx2x_pbf_pN_buf_flushed(bp, &buf_regs[i], poll_count);
@ -1305,11 +1300,9 @@ void bnx2x_tx_hw_flushed(struct bnx2x *bp, u32 poll_count)
#define OP_GEN_AGG_VECT(index) \ #define OP_GEN_AGG_VECT(index) \
(((index) << SDM_OP_GEN_AGG_VECT_IDX_SHIFT) & SDM_OP_GEN_AGG_VECT_IDX) (((index) << SDM_OP_GEN_AGG_VECT_IDX_SHIFT) & SDM_OP_GEN_AGG_VECT_IDX)
int bnx2x_send_final_clnup(struct bnx2x *bp, u8 clnup_func, u32 poll_cnt) int bnx2x_send_final_clnup(struct bnx2x *bp, u8 clnup_func, u32 poll_cnt)
{ {
u32 op_gen_command = 0; u32 op_gen_command = 0;
u32 comp_addr = BAR_CSTRORM_INTMEM + u32 comp_addr = BAR_CSTRORM_INTMEM +
CSTORM_FINAL_CLEANUP_COMPLETE_OFFSET(clnup_func); CSTORM_FINAL_CLEANUP_COMPLETE_OFFSET(clnup_func);
int ret = 0; int ret = 0;
@ -1352,7 +1345,6 @@ u8 bnx2x_is_pcie_pending(struct pci_dev *dev)
*/ */
static int bnx2x_poll_hw_usage_counters(struct bnx2x *bp, u32 poll_cnt) static int bnx2x_poll_hw_usage_counters(struct bnx2x *bp, u32 poll_cnt)
{ {
/* wait for CFC PF usage-counter to zero (includes all the VFs) */ /* wait for CFC PF usage-counter to zero (includes all the VFs) */
if (bnx2x_flr_clnup_poll_hw_counter(bp, if (bnx2x_flr_clnup_poll_hw_counter(bp,
CFC_REG_NUM_LCIDS_INSIDE_PF, CFC_REG_NUM_LCIDS_INSIDE_PF,
@ -1360,7 +1352,6 @@ static int bnx2x_poll_hw_usage_counters(struct bnx2x *bp, u32 poll_cnt)
poll_cnt)) poll_cnt))
return 1; return 1;
/* Wait for DQ PF usage-counter to zero (until DQ cleanup) */ /* Wait for DQ PF usage-counter to zero (until DQ cleanup) */
if (bnx2x_flr_clnup_poll_hw_counter(bp, if (bnx2x_flr_clnup_poll_hw_counter(bp,
DORQ_REG_PF_USAGE_CNT, DORQ_REG_PF_USAGE_CNT,
@ -1991,7 +1982,6 @@ int bnx2x_release_hw_lock(struct bnx2x *bp, u32 resource)
return 0; return 0;
} }
int bnx2x_get_gpio(struct bnx2x *bp, int gpio_num, u8 port) int bnx2x_get_gpio(struct bnx2x *bp, int gpio_num, u8 port)
{ {
/* The GPIO should be swapped if swap register is set and active */ /* The GPIO should be swapped if swap register is set and active */
@ -2347,7 +2337,6 @@ u8 bnx2x_link_test(struct bnx2x *bp, u8 is_serdes)
return rc; return rc;
} }
/* Calculates the sum of vn_min_rates. /* Calculates the sum of vn_min_rates.
It's needed for further normalizing of the min_rates. It's needed for further normalizing of the min_rates.
Returns: Returns:
@ -2419,7 +2408,6 @@ static void bnx2x_calc_vn_max(struct bnx2x *bp, int vn,
input->vnic_max_rate[vn] = vn_max_rate; input->vnic_max_rate[vn] = vn_max_rate;
} }
static int bnx2x_get_cmng_fns_mode(struct bnx2x *bp) static int bnx2x_get_cmng_fns_mode(struct bnx2x *bp)
{ {
if (CHIP_REV_IS_SLOW(bp)) if (CHIP_REV_IS_SLOW(bp))
@ -2901,7 +2889,6 @@ u32 bnx2x_fw_command(struct bnx2x *bp, u32 command, u32 param)
return rc; return rc;
} }
static void storm_memset_func_cfg(struct bnx2x *bp, static void storm_memset_func_cfg(struct bnx2x *bp,
struct tstorm_eth_function_common_config *tcfg, struct tstorm_eth_function_common_config *tcfg,
u16 abs_fid) u16 abs_fid)
@ -3006,7 +2993,6 @@ static unsigned long bnx2x_get_q_flags(struct bnx2x *bp,
if (IS_MF_AFEX(bp)) if (IS_MF_AFEX(bp))
__set_bit(BNX2X_Q_FLG_SILENT_VLAN_REM, &flags); __set_bit(BNX2X_Q_FLG_SILENT_VLAN_REM, &flags);
return flags | bnx2x_get_common_flags(bp, fp, true); return flags | bnx2x_get_common_flags(bp, fp, true);
} }
@ -3196,7 +3182,6 @@ static void bnx2x_pf_init(struct bnx2x *bp)
storm_memset_eq_data(bp, &eq_data, BP_FUNC(bp)); storm_memset_eq_data(bp, &eq_data, BP_FUNC(bp));
} }
static void bnx2x_e1h_disable(struct bnx2x *bp) static void bnx2x_e1h_disable(struct bnx2x *bp)
{ {
int port = BP_PORT(bp); int port = BP_PORT(bp);
@ -3540,10 +3525,8 @@ static bool bnx2x_is_contextless_ramrod(int cmd, int cmd_type)
return true; return true;
else else
return false; return false;
} }
/** /**
* bnx2x_sp_post - place a single command on an SP ring * bnx2x_sp_post - place a single command on an SP ring
* *
@ -3615,7 +3598,6 @@ int bnx2x_sp_post(struct bnx2x *bp, int command, int cid,
else else
atomic_dec(&bp->cq_spq_left); atomic_dec(&bp->cq_spq_left);
DP(BNX2X_MSG_SP, DP(BNX2X_MSG_SP,
"SPQE[%x] (%x:%x) (cmd, common?) (%d,%d) hw_cid %x data (%x:%x) type(0x%x) left (CQ, EQ) (%x,%x)\n", "SPQE[%x] (%x:%x) (cmd, common?) (%d,%d) hw_cid %x data (%x:%x) type(0x%x) left (CQ, EQ) (%x,%x)\n",
bp->spq_prod_idx, (u32)U64_HI(bp->spq_mapping), bp->spq_prod_idx, (u32)U64_HI(bp->spq_mapping),
@ -3836,7 +3818,6 @@ static void bnx2x_fan_failure(struct bnx2x *bp)
set_bit(BNX2X_SP_RTNL_FAN_FAILURE, &bp->sp_rtnl_state); set_bit(BNX2X_SP_RTNL_FAN_FAILURE, &bp->sp_rtnl_state);
smp_mb__after_clear_bit(); smp_mb__after_clear_bit();
schedule_delayed_work(&bp->sp_rtnl_task, 0); schedule_delayed_work(&bp->sp_rtnl_task, 0);
} }
static void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn) static void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn)
@ -4591,7 +4572,6 @@ bool bnx2x_chk_parity_attn(struct bnx2x *bp, bool *global, bool print)
return bnx2x_parity_attn(bp, global, print, attn.sig); return bnx2x_parity_attn(bp, global, print, attn.sig);
} }
static void bnx2x_attn_int_deasserted4(struct bnx2x *bp, u32 attn) static void bnx2x_attn_int_deasserted4(struct bnx2x *bp, u32 attn)
{ {
u32 val; u32 val;
@ -4643,7 +4623,6 @@ static void bnx2x_attn_int_deasserted4(struct bnx2x *bp, u32 attn)
(u32)(attn & (AEU_INPUTS_ATTN_BITS_PGLUE_PARITY_ERROR | (u32)(attn & (AEU_INPUTS_ATTN_BITS_PGLUE_PARITY_ERROR |
AEU_INPUTS_ATTN_BITS_ATC_PARITY_ERROR))); AEU_INPUTS_ATTN_BITS_ATC_PARITY_ERROR)));
} }
} }
static void bnx2x_attn_int_deasserted(struct bnx2x *bp, u32 deasserted) static void bnx2x_attn_int_deasserted(struct bnx2x *bp, u32 deasserted)
@ -4878,7 +4857,6 @@ static void bnx2x_handle_classification_eqe(struct bnx2x *bp,
BNX2X_ERR("Failed to schedule new commands: %d\n", rc); BNX2X_ERR("Failed to schedule new commands: %d\n", rc);
else if (rc > 0) else if (rc > 0)
DP(BNX2X_MSG_SP, "Scheduled next pending commands...\n"); DP(BNX2X_MSG_SP, "Scheduled next pending commands...\n");
} }
static void bnx2x_set_iscsi_eth_rx_mode(struct bnx2x *bp, bool start); static void bnx2x_set_iscsi_eth_rx_mode(struct bnx2x *bp, bool start);
@ -5075,8 +5053,6 @@ static void bnx2x_eq_int(struct bnx2x *bp)
if (q_obj->complete_cmd(bp, q_obj, BNX2X_Q_CMD_CFC_DEL)) if (q_obj->complete_cmd(bp, q_obj, BNX2X_Q_CMD_CFC_DEL))
break; break;
goto next_spqe; goto next_spqe;
case EVENT_RING_OPCODE_STOP_TRAFFIC: case EVENT_RING_OPCODE_STOP_TRAFFIC:
@ -5265,7 +5241,6 @@ static void bnx2x_sp_task(struct work_struct *work)
/* ack status block only if something was actually handled */ /* ack status block only if something was actually handled */
bnx2x_ack_sb(bp, bp->igu_dsb_id, ATTENTION_ID, bnx2x_ack_sb(bp, bp->igu_dsb_id, ATTENTION_ID,
le16_to_cpu(bp->def_att_idx), IGU_INT_ENABLE, 1); le16_to_cpu(bp->def_att_idx), IGU_INT_ENABLE, 1);
} }
/* must be called after the EQ processing (since eq leads to sriov /* must be called after the EQ processing (since eq leads to sriov
@ -5316,7 +5291,6 @@ irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance)
/* end of slow path */ /* end of slow path */
void bnx2x_drv_pulse(struct bnx2x *bp) void bnx2x_drv_pulse(struct bnx2x *bp)
{ {
SHMEM_WR(bp, func_mb[BP_FW_MB_IDX(bp)].drv_pulse_mb, SHMEM_WR(bp, func_mb[BP_FW_MB_IDX(bp)].drv_pulse_mb,
@ -5382,7 +5356,6 @@ static void bnx2x_fill(struct bnx2x *bp, u32 addr, int fill, u32 len)
else else
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
REG_WR8(bp, addr + i, fill); REG_WR8(bp, addr + i, fill);
} }
/* helper: writes FP SP data to FW - data_size in dwords */ /* helper: writes FP SP data to FW - data_size in dwords */
@ -5461,10 +5434,8 @@ static void bnx2x_zero_sp_sb(struct bnx2x *bp)
bnx2x_fill(bp, BAR_CSTRORM_INTMEM + bnx2x_fill(bp, BAR_CSTRORM_INTMEM +
CSTORM_SP_SYNC_BLOCK_OFFSET(func), 0, CSTORM_SP_SYNC_BLOCK_OFFSET(func), 0,
CSTORM_SP_SYNC_BLOCK_SIZE); CSTORM_SP_SYNC_BLOCK_SIZE);
} }
static void bnx2x_setup_ndsb_state_machine(struct hc_status_block_sm *hc_sm, static void bnx2x_setup_ndsb_state_machine(struct hc_status_block_sm *hc_sm,
int igu_sb_id, int igu_seg_id) int igu_sb_id, int igu_seg_id)
{ {
@ -5474,7 +5445,6 @@ static void bnx2x_setup_ndsb_state_machine(struct hc_status_block_sm *hc_sm,
hc_sm->time_to_expire = 0xFFFFFFFF; hc_sm->time_to_expire = 0xFFFFFFFF;
} }
/* allocates state machine ids. */ /* allocates state machine ids. */
static void bnx2x_map_sb_state_machines(struct hc_index_data *index_data) static void bnx2x_map_sb_state_machines(struct hc_index_data *index_data)
{ {
@ -6001,6 +5971,7 @@ static void bnx2x_init_tx_rings_cnic(struct bnx2x *bp)
for_each_tx_queue_cnic(bp, i) for_each_tx_queue_cnic(bp, i)
bnx2x_init_tx_ring_one(bp->fp[i].txdata_ptr[0]); bnx2x_init_tx_ring_one(bp->fp[i].txdata_ptr[0]);
} }
static void bnx2x_init_tx_rings(struct bnx2x *bp) static void bnx2x_init_tx_rings(struct bnx2x *bp)
{ {
int i; int i;
@ -6772,7 +6743,6 @@ static int bnx2x_init_hw_common(struct bnx2x *bp)
bnx2x_init_block(bp, BLOCK_QM, PHASE_COMMON); bnx2x_init_block(bp, BLOCK_QM, PHASE_COMMON);
/* QM queues pointers table */ /* QM queues pointers table */
bnx2x_qm_init_ptr_table(bp, bp->qm_cid_count, INITOP_SET); bnx2x_qm_init_ptr_table(bp, bp->qm_cid_count, INITOP_SET);
@ -7013,7 +6983,6 @@ static int bnx2x_init_hw_port(struct bnx2x *bp)
u32 low, high; u32 low, high;
u32 val; u32 val;
DP(NETIF_MSG_HW, "starting port init port %d\n", port); DP(NETIF_MSG_HW, "starting port init port %d\n", port);
REG_WR(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4, 0); REG_WR(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4, 0);
@ -7078,7 +7047,6 @@ static int bnx2x_init_hw_port(struct bnx2x *bp)
BRB1_REG_MAC_GUARANTIED_1 : BRB1_REG_MAC_GUARANTIED_1 :
BRB1_REG_MAC_GUARANTIED_0), 40); BRB1_REG_MAC_GUARANTIED_0), 40);
bnx2x_init_block(bp, BLOCK_PRS, init_phase); bnx2x_init_block(bp, BLOCK_PRS, init_phase);
if (CHIP_IS_E3B0(bp)) { if (CHIP_IS_E3B0(bp)) {
if (IS_MF_AFEX(bp)) { if (IS_MF_AFEX(bp)) {
@ -7275,7 +7243,6 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id, bool is_pf)
while (!(REG_RD(bp, igu_addr_ack) & sb_bit) && --cnt) while (!(REG_RD(bp, igu_addr_ack) & sb_bit) && --cnt)
msleep(20); msleep(20);
if (!(REG_RD(bp, igu_addr_ack) & sb_bit)) { if (!(REG_RD(bp, igu_addr_ack) & sb_bit)) {
DP(NETIF_MSG_HW, DP(NETIF_MSG_HW,
"Unable to finish IGU cleanup: idu_sb_id %d offset %d bit %d (cnt %d)\n", "Unable to finish IGU cleanup: idu_sb_id %d offset %d bit %d (cnt %d)\n",
@ -7295,7 +7262,6 @@ static void bnx2x_clear_func_ilt(struct bnx2x *bp, u32 func)
bnx2x_ilt_wr(bp, i, 0); bnx2x_ilt_wr(bp, i, 0);
} }
static void bnx2x_init_searcher(struct bnx2x *bp) static void bnx2x_init_searcher(struct bnx2x *bp)
{ {
int port = BP_PORT(bp); int port = BP_PORT(bp);
@ -7331,7 +7297,6 @@ static int bnx2x_reset_nic_mode(struct bnx2x *bp)
int rc, i, port = BP_PORT(bp); int rc, i, port = BP_PORT(bp);
int vlan_en = 0, mac_en[NUM_MACS]; int vlan_en = 0, mac_en[NUM_MACS];
/* Close input from network */ /* Close input from network */
if (bp->mf_mode == SINGLE_FUNCTION) { if (bp->mf_mode == SINGLE_FUNCTION) {
bnx2x_set_rx_filter(&bp->link_params, 0); bnx2x_set_rx_filter(&bp->link_params, 0);
@ -7480,7 +7445,6 @@ static int bnx2x_init_hw_func(struct bnx2x *bp)
/* Set NIC mode */ /* Set NIC mode */
REG_WR(bp, PRS_REG_NIC_MODE, 1); REG_WR(bp, PRS_REG_NIC_MODE, 1);
DP(NETIF_MSG_IFUP, "NIC MODE configrued\n"); DP(NETIF_MSG_IFUP, "NIC MODE configrued\n");
} }
if (!CHIP_IS_E1x(bp)) { if (!CHIP_IS_E1x(bp)) {
@ -7734,7 +7698,6 @@ static int bnx2x_init_hw_func(struct bnx2x *bp)
return 0; return 0;
} }
void bnx2x_free_mem_cnic(struct bnx2x *bp) void bnx2x_free_mem_cnic(struct bnx2x *bp)
{ {
bnx2x_ilt_mem_op_cnic(bp, ILT_MEMOP_FREE); bnx2x_ilt_mem_op_cnic(bp, ILT_MEMOP_FREE);
@ -7779,7 +7742,6 @@ void bnx2x_free_mem(struct bnx2x *bp)
bnx2x_iov_free_mem(bp); bnx2x_iov_free_mem(bp);
} }
int bnx2x_alloc_mem_cnic(struct bnx2x *bp) int bnx2x_alloc_mem_cnic(struct bnx2x *bp)
{ {
if (!CHIP_IS_E1x(bp)) if (!CHIP_IS_E1x(bp))
@ -8068,7 +8030,6 @@ void bnx2x_ilt_set_info(struct bnx2x *bp)
ilt_client->page_size, ilt_client->page_size,
ilt_client->flags, ilt_client->flags,
ilog2(ilt_client->page_size >> 12)); ilog2(ilt_client->page_size >> 12));
} }
if (CNIC_SUPPORT(bp)) { if (CNIC_SUPPORT(bp)) {
@ -8124,7 +8085,6 @@ void bnx2x_ilt_set_info(struct bnx2x *bp)
static void bnx2x_pf_q_prep_init(struct bnx2x *bp, static void bnx2x_pf_q_prep_init(struct bnx2x *bp,
struct bnx2x_fastpath *fp, struct bnx2x_queue_init_params *init_params) struct bnx2x_fastpath *fp, struct bnx2x_queue_init_params *init_params)
{ {
u8 cos; u8 cos;
int cxt_index, cxt_offset; int cxt_index, cxt_offset;
@ -8205,7 +8165,6 @@ static int bnx2x_setup_tx_only(struct bnx2x *bp, struct bnx2x_fastpath *fp,
return bnx2x_queue_state_change(bp, q_params); return bnx2x_queue_state_change(bp, q_params);
} }
/** /**
* bnx2x_setup_queue - setup queue * bnx2x_setup_queue - setup queue
* *
@ -8254,7 +8213,6 @@ int bnx2x_setup_queue(struct bnx2x *bp, struct bnx2x_fastpath *fp,
DP(NETIF_MSG_IFUP, "init complete\n"); DP(NETIF_MSG_IFUP, "init complete\n");
/* Now move the Queue to the SETUP state... */ /* Now move the Queue to the SETUP state... */
memset(setup_params, 0, sizeof(*setup_params)); memset(setup_params, 0, sizeof(*setup_params));
@ -8315,7 +8273,6 @@ static int bnx2x_stop_queue(struct bnx2x *bp, int index)
/* We want to wait for completion in this context */ /* We want to wait for completion in this context */
__set_bit(RAMROD_COMP_WAIT, &q_params.ramrod_flags); __set_bit(RAMROD_COMP_WAIT, &q_params.ramrod_flags);
/* close tx-only connections */ /* close tx-only connections */
for (tx_index = FIRST_TX_ONLY_COS_INDEX; for (tx_index = FIRST_TX_ONLY_COS_INDEX;
tx_index < fp->max_cos; tx_index < fp->max_cos;
@ -8369,7 +8326,6 @@ static int bnx2x_stop_queue(struct bnx2x *bp, int index)
return bnx2x_queue_state_change(bp, &q_params); return bnx2x_queue_state_change(bp, &q_params);
} }
static void bnx2x_reset_func(struct bnx2x *bp) static void bnx2x_reset_func(struct bnx2x *bp)
{ {
int port = BP_PORT(bp); int port = BP_PORT(bp);
@ -8740,7 +8696,6 @@ void bnx2x_chip_cleanup(struct bnx2x *bp, int unload_mode, bool keep_link)
bnx2x_iov_chip_cleanup(bp); bnx2x_iov_chip_cleanup(bp);
/* /*
* Send the UNLOAD_REQUEST to the MCP. This will return if * Send the UNLOAD_REQUEST to the MCP. This will return if
* this function should perform FUNC, PORT or COMMON HW * this function should perform FUNC, PORT or COMMON HW
@ -8813,7 +8768,6 @@ unload_error:
if (rc) if (rc)
BNX2X_ERR("HW_RESET failed\n"); BNX2X_ERR("HW_RESET failed\n");
/* Report UNLOAD_DONE to MCP */ /* Report UNLOAD_DONE to MCP */
bnx2x_send_unload_done(bp, keep_link); bnx2x_send_unload_done(bp, keep_link);
} }
@ -9179,7 +9133,6 @@ static int bnx2x_process_kill(struct bnx2x *bp, bool global)
if (!CHIP_IS_E1x(bp) && bnx2x_er_poll_igu_vq(bp)) if (!CHIP_IS_E1x(bp) && bnx2x_er_poll_igu_vq(bp))
return -EAGAIN; return -EAGAIN;
/* TBD: Indicate that "process kill" is in progress to MCP */ /* TBD: Indicate that "process kill" is in progress to MCP */
/* Clear "unprepared" bit */ /* Clear "unprepared" bit */
@ -9647,7 +9600,6 @@ static void bnx2x_prev_unload_close_mac(struct bnx2x *bp,
wb_data[0] &= ~BMAC_CONTROL_RX_ENABLE; wb_data[0] &= ~BMAC_CONTROL_RX_ENABLE;
REG_WR(bp, vals->bmac_addr, wb_data[0]); REG_WR(bp, vals->bmac_addr, wb_data[0]);
REG_WR(bp, vals->bmac_addr + 0x4, wb_data[1]); REG_WR(bp, vals->bmac_addr + 0x4, wb_data[1]);
} }
BNX2X_DEV_INFO("Disable emac Rx\n"); BNX2X_DEV_INFO("Disable emac Rx\n");
vals->emac_addr = NIG_REG_NIG_EMAC0_EN + BP_PORT(bp)*4; vals->emac_addr = NIG_REG_NIG_EMAC0_EN + BP_PORT(bp)*4;
@ -9681,7 +9633,6 @@ static void bnx2x_prev_unload_close_mac(struct bnx2x *bp,
if (mac_stopped) if (mac_stopped)
msleep(20); msleep(20);
} }
#define BNX2X_PREV_UNDI_PROD_ADDR(p) (BAR_TSTRORM_INTMEM + 0x1508 + ((p) << 4)) #define BNX2X_PREV_UNDI_PROD_ADDR(p) (BAR_TSTRORM_INTMEM + 0x1508 + ((p) << 4))
@ -9854,7 +9805,6 @@ static int bnx2x_do_flr(struct bnx2x *bp)
u16 status; u16 status;
struct pci_dev *dev = bp->pdev; struct pci_dev *dev = bp->pdev;
if (CHIP_IS_E1x(bp)) { if (CHIP_IS_E1x(bp)) {
BNX2X_DEV_INFO("FLR not supported in E1/E1H\n"); BNX2X_DEV_INFO("FLR not supported in E1/E1H\n");
return -EINVAL; return -EINVAL;
@ -10001,7 +9951,6 @@ static int bnx2x_prev_unload_common(struct bnx2x *bp)
if (!timer_count) if (!timer_count)
BNX2X_ERR("Failed to empty BRB, hope for the best\n"); BNX2X_ERR("Failed to empty BRB, hope for the best\n");
} }
/* No packets are in the pipeline, path is ready for reset */ /* No packets are in the pipeline, path is ready for reset */
@ -10205,8 +10154,6 @@ static void bnx2x_get_common_hwinfo(struct bnx2x *bp)
bnx2x_init_shmem(bp); bnx2x_init_shmem(bp);
bp->common.shmem2_base = REG_RD(bp, (BP_PATH(bp) ? bp->common.shmem2_base = REG_RD(bp, (BP_PATH(bp) ?
MISC_REG_GENERIC_CR_1 : MISC_REG_GENERIC_CR_1 :
MISC_REG_GENERIC_CR_0)); MISC_REG_GENERIC_CR_0));
@ -10467,7 +10414,6 @@ static void bnx2x_link_settings_supported(struct bnx2x *bp, u32 switch_cfg)
if (!(bp->link_params.speed_cap_mask[idx] & if (!(bp->link_params.speed_cap_mask[idx] &
PORT_HW_CFG_SPEED_CAPABILITY_D0_10G)) PORT_HW_CFG_SPEED_CAPABILITY_D0_10G))
bp->port.supported[idx] &= ~SUPPORTED_10000baseT_Full; bp->port.supported[idx] &= ~SUPPORTED_10000baseT_Full;
} }
BNX2X_DEV_INFO("supported 0x%x 0x%x\n", bp->port.supported[0], BNX2X_DEV_INFO("supported 0x%x 0x%x\n", bp->port.supported[0],
@ -10778,7 +10724,6 @@ void bnx2x_get_iscsi_info(struct bnx2x *bp)
*/ */
if (!bp->cnic_eth_dev.max_iscsi_conn) if (!bp->cnic_eth_dev.max_iscsi_conn)
bp->flags |= no_flags; bp->flags |= no_flags;
} }
static void bnx2x_get_ext_wwn_info(struct bnx2x *bp, int func) static void bnx2x_get_ext_wwn_info(struct bnx2x *bp, int func)
@ -11442,7 +11387,6 @@ static int bnx2x_init_bp(struct bnx2x *bp)
mutex_init(&bp->fw_mb_mutex); mutex_init(&bp->fw_mb_mutex);
spin_lock_init(&bp->stats_lock); spin_lock_init(&bp->stats_lock);
INIT_DELAYED_WORK(&bp->sp_task, bnx2x_sp_task); INIT_DELAYED_WORK(&bp->sp_task, bnx2x_sp_task);
INIT_DELAYED_WORK(&bp->sp_rtnl_task, bnx2x_sp_rtnl_task); INIT_DELAYED_WORK(&bp->sp_rtnl_task, bnx2x_sp_rtnl_task);
INIT_DELAYED_WORK(&bp->period_task, bnx2x_period_task); INIT_DELAYED_WORK(&bp->period_task, bnx2x_period_task);
@ -11475,7 +11419,6 @@ static int bnx2x_init_bp(struct bnx2x *bp)
bnx2x_prev_unload(bp); bnx2x_prev_unload(bp);
} }
if (CHIP_REV_IS_FPGA(bp)) if (CHIP_REV_IS_FPGA(bp))
dev_err(&bp->pdev->dev, "FPGA detected\n"); dev_err(&bp->pdev->dev, "FPGA detected\n");
@ -11558,7 +11501,6 @@ static int bnx2x_init_bp(struct bnx2x *bp)
return rc; return rc;
} }
/**************************************************************************** /****************************************************************************
* General service functions * General service functions
****************************************************************************/ ****************************************************************************/
@ -12397,7 +12339,6 @@ static void bnx2x_release_firmware(struct bnx2x *bp)
bp->firmware = NULL; bp->firmware = NULL;
} }
static struct bnx2x_func_sp_drv_ops bnx2x_func_sp_drv = { static struct bnx2x_func_sp_drv_ops bnx2x_func_sp_drv = {
.init_hw_cmn_chip = bnx2x_init_hw_common_chip, .init_hw_cmn_chip = bnx2x_init_hw_common_chip,
.init_hw_cmn = bnx2x_init_hw_common, .init_hw_cmn = bnx2x_init_hw_common,
@ -12676,7 +12617,6 @@ static int bnx2x_init_one(struct pci_dev *pdev,
} }
BNX2X_DEV_INFO("device name after netdev register %s\n", dev->name); BNX2X_DEV_INFO("device name after netdev register %s\n", dev->name);
if (!NO_FCOE(bp)) { if (!NO_FCOE(bp)) {
/* Add storage MAC address */ /* Add storage MAC address */
rtnl_lock(); rtnl_lock();
@ -13048,6 +12988,7 @@ static int __init bnx2x_init(void)
static void __exit bnx2x_cleanup(void) static void __exit bnx2x_cleanup(void)
{ {
struct list_head *pos, *q; struct list_head *pos, *q;
pci_unregister_driver(&bnx2x_pci_driver); pci_unregister_driver(&bnx2x_pci_driver);
destroy_workqueue(bnx2x_wq); destroy_workqueue(bnx2x_wq);
@ -13103,7 +13044,6 @@ static void bnx2x_cnic_sp_post(struct bnx2x *bp, int count)
BUG_ON(bp->cnic_spq_pending < count); BUG_ON(bp->cnic_spq_pending < count);
bp->cnic_spq_pending -= count; bp->cnic_spq_pending -= count;
for (; bp->cnic_kwq_pending; bp->cnic_kwq_pending--) { for (; bp->cnic_kwq_pending; bp->cnic_kwq_pending--) {
u16 type = (le16_to_cpu(bp->cnic_kwq_cons->hdr.type) u16 type = (le16_to_cpu(bp->cnic_kwq_cons->hdr.type)
& SPE_HDR_CONN_TYPE) >> & SPE_HDR_CONN_TYPE) >>
@ -13276,7 +13216,6 @@ static void bnx2x_cnic_cfc_comp(struct bnx2x *bp, int cid, u8 err)
bnx2x_cnic_sp_post(bp, 0); bnx2x_cnic_sp_post(bp, 0);
} }
/* Called with netif_addr_lock_bh() taken. /* Called with netif_addr_lock_bh() taken.
* Sets an rx_mode config for an iSCSI ETH client. * Sets an rx_mode config for an iSCSI ETH client.
* Doesn't block. * Doesn't block.
@ -13317,7 +13256,6 @@ static void bnx2x_set_iscsi_eth_rx_mode(struct bnx2x *bp, bool start)
} }
} }
static int bnx2x_drv_ctl(struct net_device *dev, struct drv_ctl_info *ctl) static int bnx2x_drv_ctl(struct net_device *dev, struct drv_ctl_info *ctl)
{ {
struct bnx2x *bp = netdev_priv(dev); struct bnx2x *bp = netdev_priv(dev);
@ -13505,7 +13443,6 @@ void bnx2x_setup_cnic_info(struct bnx2x *bp)
{ {
struct cnic_eth_dev *cp = &bp->cnic_eth_dev; struct cnic_eth_dev *cp = &bp->cnic_eth_dev;
cp->ctx_tbl_offset = FUNC_ILT_BASE(BP_FUNC(bp)) + cp->ctx_tbl_offset = FUNC_ILT_BASE(BP_FUNC(bp)) +
bnx2x_cid_ilt_lines(bp); bnx2x_cid_ilt_lines(bp);
cp->starting_cid = bnx2x_cid_ilt_lines(bp) * ILT_PAGE_CIDS; cp->starting_cid = bnx2x_cid_ilt_lines(bp) * ILT_PAGE_CIDS;
@ -13541,7 +13478,6 @@ static int bnx2x_register_cnic(struct net_device *dev, struct cnic_ops *ops,
BNX2X_ERR("CNIC-related load failed\n"); BNX2X_ERR("CNIC-related load failed\n");
return rc; return rc;
} }
} }
bp->cnic_enabled = true; bp->cnic_enabled = true;

30
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
View File

@ -142,7 +142,6 @@ free_and_exit:
spin_unlock_bh(&o->lock); spin_unlock_bh(&o->lock);
return rc; return rc;
} }
static inline void __bnx2x_exe_queue_reset_pending( static inline void __bnx2x_exe_queue_reset_pending(
@ -163,13 +162,11 @@ static inline void __bnx2x_exe_queue_reset_pending(
static inline void bnx2x_exe_queue_reset_pending(struct bnx2x *bp, static inline void bnx2x_exe_queue_reset_pending(struct bnx2x *bp,
struct bnx2x_exe_queue_obj *o) struct bnx2x_exe_queue_obj *o)
{ {
spin_lock_bh(&o->lock); spin_lock_bh(&o->lock);
__bnx2x_exe_queue_reset_pending(bp, o); __bnx2x_exe_queue_reset_pending(bp, o);
spin_unlock_bh(&o->lock); spin_unlock_bh(&o->lock);
} }
/** /**
@ -308,7 +305,6 @@ static inline int bnx2x_state_wait(struct bnx2x *bp, int state,
/* can take a while if any port is running */ /* can take a while if any port is running */
int cnt = 5000; int cnt = 5000;
if (CHIP_REV_IS_EMUL(bp)) if (CHIP_REV_IS_EMUL(bp))
cnt *= 20; cnt *= 20;
@ -456,7 +452,6 @@ static int bnx2x_get_n_elements(struct bnx2x *bp, struct bnx2x_vlan_mac_obj *o,
DP(BNX2X_MSG_SP, "copied element number %d to address %p element was:\n", DP(BNX2X_MSG_SP, "copied element number %d to address %p element was:\n",
counter, next); counter, next);
next += stride + size; next += stride + size;
} }
} }
return counter * ETH_ALEN; return counter * ETH_ALEN;
@ -518,7 +513,6 @@ static int bnx2x_check_vlan_mac_add(struct bnx2x *bp,
return 0; return 0;
} }
/* check_del() callbacks */ /* check_del() callbacks */
static struct bnx2x_vlan_mac_registry_elem * static struct bnx2x_vlan_mac_registry_elem *
bnx2x_check_mac_del(struct bnx2x *bp, bnx2x_check_mac_del(struct bnx2x *bp,
@ -609,7 +603,6 @@ static bool bnx2x_check_move_always_err(
return false; return false;
} }
static inline u8 bnx2x_vlan_mac_get_rx_tx_flag(struct bnx2x_vlan_mac_obj *o) static inline u8 bnx2x_vlan_mac_get_rx_tx_flag(struct bnx2x_vlan_mac_obj *o)
{ {
struct bnx2x_raw_obj *raw = &o->raw; struct bnx2x_raw_obj *raw = &o->raw;
@ -626,7 +619,6 @@ static inline u8 bnx2x_vlan_mac_get_rx_tx_flag(struct bnx2x_vlan_mac_obj *o)
return rx_tx_flag; return rx_tx_flag;
} }
void bnx2x_set_mac_in_nig(struct bnx2x *bp, void bnx2x_set_mac_in_nig(struct bnx2x *bp,
bool add, unsigned char *dev_addr, int index) bool add, unsigned char *dev_addr, int index)
{ {
@ -707,7 +699,6 @@ static inline void bnx2x_vlan_mac_set_rdata_hdr_e2(u32 cid, int type,
hdr->rule_cnt = (u8)rule_cnt; hdr->rule_cnt = (u8)rule_cnt;
} }
/* hw_config() callbacks */ /* hw_config() callbacks */
static void bnx2x_set_one_mac_e2(struct bnx2x *bp, static void bnx2x_set_one_mac_e2(struct bnx2x *bp,
struct bnx2x_vlan_mac_obj *o, struct bnx2x_vlan_mac_obj *o,
@ -960,7 +951,6 @@ static void bnx2x_set_one_vlan_mac_e2(struct bnx2x *bp,
u16 vlan = elem->cmd_data.vlan_mac.u.vlan_mac.vlan; u16 vlan = elem->cmd_data.vlan_mac.u.vlan_mac.vlan;
u8 *mac = elem->cmd_data.vlan_mac.u.vlan_mac.mac; u8 *mac = elem->cmd_data.vlan_mac.u.vlan_mac.mac;
/* Reset the ramrod data buffer for the first rule */ /* Reset the ramrod data buffer for the first rule */
if (rule_idx == 0) if (rule_idx == 0)
memset(data, 0, sizeof(*data)); memset(data, 0, sizeof(*data));
@ -1818,8 +1808,6 @@ int bnx2x_config_vlan_mac(
return rc; return rc;
} }
/** /**
* bnx2x_vlan_mac_del_all - delete elements with given vlan_mac_flags spec * bnx2x_vlan_mac_del_all - delete elements with given vlan_mac_flags spec
* *
@ -1934,7 +1922,6 @@ static inline void bnx2x_init_vlan_mac_common(struct bnx2x_vlan_mac_obj *o,
state, pstate, type); state, pstate, type);
} }
void bnx2x_init_mac_obj(struct bnx2x *bp, void bnx2x_init_mac_obj(struct bnx2x *bp,
struct bnx2x_vlan_mac_obj *mac_obj, struct bnx2x_vlan_mac_obj *mac_obj,
u8 cl_id, u32 cid, u8 func_id, void *rdata, u8 cl_id, u32 cid, u8 func_id, void *rdata,
@ -2092,7 +2079,6 @@ void bnx2x_init_vlan_mac_obj(struct bnx2x *bp,
bnx2x_execute_vlan_mac, bnx2x_execute_vlan_mac,
bnx2x_exeq_get_vlan_mac); bnx2x_exeq_get_vlan_mac);
} }
} }
/* RX_MODE verbs: DROP_ALL/ACCEPT_ALL/ACCEPT_ALL_MULTI/ACCEPT_ALL_VLAN/NORMAL */ /* RX_MODE verbs: DROP_ALL/ACCEPT_ALL/ACCEPT_ALL_MULTI/ACCEPT_ALL_VLAN/NORMAL */
@ -2245,7 +2231,6 @@ static inline void bnx2x_rx_mode_set_cmd_state_e2(struct bnx2x *bp,
} }
cmd->state = cpu_to_le16(state); cmd->state = cpu_to_le16(state);
} }
static int bnx2x_set_rx_mode_e2(struct bnx2x *bp, static int bnx2x_set_rx_mode_e2(struct bnx2x *bp,
@ -2286,7 +2271,6 @@ static int bnx2x_set_rx_mode_e2(struct bnx2x *bp,
false); false);
} }
/* /*
* If FCoE Queue configuration has been requested configure the Rx and * If FCoE Queue configuration has been requested configure the Rx and
* internal switching modes for this queue in separate rules. * internal switching modes for this queue in separate rules.
@ -2909,7 +2893,6 @@ static int bnx2x_mcast_validate_e2(struct bnx2x *bp,
default: default:
BNX2X_ERR("Unknown command: %d\n", cmd); BNX2X_ERR("Unknown command: %d\n", cmd);
return -EINVAL; return -EINVAL;
} }
/* Increase the total number of MACs pending to be configured */ /* Increase the total number of MACs pending to be configured */
@ -3223,7 +3206,6 @@ static int bnx2x_mcast_validate_e1(struct bnx2x *bp,
default: default:
BNX2X_ERR("Unknown command: %d\n", cmd); BNX2X_ERR("Unknown command: %d\n", cmd);
return -EINVAL; return -EINVAL;
} }
/* We want to ensure that commands are executed one by one for 57710. /* We want to ensure that commands are executed one by one for 57710.
@ -3342,7 +3324,6 @@ static inline int bnx2x_mcast_handle_restore_cmd_e1(
return -1; return -1;
} }
static inline int bnx2x_mcast_handle_pending_cmds_e1( static inline int bnx2x_mcast_handle_pending_cmds_e1(
struct bnx2x *bp, struct bnx2x_mcast_ramrod_params *p) struct bnx2x *bp, struct bnx2x_mcast_ramrod_params *p)
{ {
@ -3352,7 +3333,6 @@ static inline int bnx2x_mcast_handle_pending_cmds_e1(
union bnx2x_mcast_config_data cfg_data = {NULL}; union bnx2x_mcast_config_data cfg_data = {NULL};
int cnt = 0; int cnt = 0;
/* If nothing to be done - return */ /* If nothing to be done - return */
if (list_empty(&o->pending_cmds_head)) if (list_empty(&o->pending_cmds_head))
return 0; return 0;
@ -3550,7 +3530,6 @@ static int bnx2x_mcast_setup_e1(struct bnx2x *bp,
/* Ramrod completion is pending */ /* Ramrod completion is pending */
return 1; return 1;
} }
} }
static int bnx2x_mcast_get_registry_size_exact(struct bnx2x_mcast_obj *o) static int bnx2x_mcast_get_registry_size_exact(struct bnx2x_mcast_obj *o)
@ -3848,7 +3827,6 @@ static bool bnx2x_credit_pool_always_true(struct bnx2x_credit_pool_obj *o,
return true; return true;
} }
static bool bnx2x_credit_pool_get_entry( static bool bnx2x_credit_pool_get_entry(
struct bnx2x_credit_pool_obj *o, struct bnx2x_credit_pool_obj *o,
int *offset) int *offset)
@ -4018,7 +3996,6 @@ void bnx2x_init_mac_credit_pool(struct bnx2x *bp,
/* this should never happen! Block MAC operations. */ /* this should never happen! Block MAC operations. */
bnx2x_init_credit_pool(p, 0, 0); bnx2x_init_credit_pool(p, 0, 0);
} }
} }
} }
@ -4215,7 +4192,6 @@ int bnx2x_config_rss(struct bnx2x *bp,
return rc; return rc;
} }
void bnx2x_init_rss_config_obj(struct bnx2x *bp, void bnx2x_init_rss_config_obj(struct bnx2x *bp,
struct bnx2x_rss_config_obj *rss_obj, struct bnx2x_rss_config_obj *rss_obj,
u8 cl_id, u32 cid, u8 func_id, u8 engine_id, u8 cl_id, u32 cid, u8 func_id, u8 engine_id,
@ -4288,7 +4264,6 @@ int bnx2x_queue_state_change(struct bnx2x *bp,
return !!test_bit(pending_bit, pending); return !!test_bit(pending_bit, pending);
} }
static int bnx2x_queue_set_pending(struct bnx2x_queue_sp_obj *obj, static int bnx2x_queue_set_pending(struct bnx2x_queue_sp_obj *obj,
struct bnx2x_queue_state_params *params) struct bnx2x_queue_state_params *params)
{ {
@ -4403,7 +4378,6 @@ static void bnx2x_q_fill_init_general_data(struct bnx2x *bp,
gen_data->mtu = cpu_to_le16(params->mtu); gen_data->mtu = cpu_to_le16(params->mtu);
gen_data->func_id = o->func_id; gen_data->func_id = o->func_id;
gen_data->cos = params->cos; gen_data->cos = params->cos;
gen_data->traffic_type = gen_data->traffic_type =
@ -4530,7 +4504,6 @@ static void bnx2x_q_fill_init_rx_data(struct bnx2x_queue_sp_obj *o,
cpu_to_le16(params->silent_removal_value); cpu_to_le16(params->silent_removal_value);
rx_data->silent_vlan_mask = rx_data->silent_vlan_mask =
cpu_to_le16(params->silent_removal_mask); cpu_to_le16(params->silent_removal_mask);
} }
/* initialize the general, tx and rx parts of a queue object */ /* initialize the general, tx and rx parts of a queue object */
@ -4706,7 +4679,6 @@ static inline int bnx2x_q_send_setup_tx_only(struct bnx2x *bp,
&params->params.tx_only; &params->params.tx_only;
u8 cid_index = tx_only_params->cid_index; u8 cid_index = tx_only_params->cid_index;
if (cid_index >= o->max_cos) { if (cid_index >= o->max_cos) {
BNX2X_ERR("queue[%d]: cid_index (%d) is out of range\n", BNX2X_ERR("queue[%d]: cid_index (%d) is out of range\n",
o->cl_id, cid_index); o->cl_id, cid_index);
@ -4816,7 +4788,6 @@ static inline int bnx2x_q_send_update(struct bnx2x *bp,
return -EINVAL; return -EINVAL;
} }
/* Clear the ramrod data */ /* Clear the ramrod data */
memset(rdata, 0, sizeof(*rdata)); memset(rdata, 0, sizeof(*rdata));
@ -5636,7 +5607,6 @@ static inline void bnx2x_func_reset_cmn(struct bnx2x *bp,
drv->reset_hw_cmn(bp); drv->reset_hw_cmn(bp);
} }
static inline int bnx2x_func_hw_reset(struct bnx2x *bp, static inline int bnx2x_func_hw_reset(struct bnx2x *bp,
struct bnx2x_func_state_params *params) struct bnx2x_func_state_params *params)
{ {

1
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
View File

@ -1377,7 +1377,6 @@ void bnx2x_init_vlan_credit_pool(struct bnx2x *bp,
struct bnx2x_credit_pool_obj *p, u8 func_id, struct bnx2x_credit_pool_obj *p, u8 func_id,
u8 func_num); u8 func_num);
/****************** RSS CONFIGURATION ****************/ /****************** RSS CONFIGURATION ****************/
void bnx2x_init_rss_config_obj(struct bnx2x *bp, void bnx2x_init_rss_config_obj(struct bnx2x *bp,
struct bnx2x_rss_config_obj *rss_obj, struct bnx2x_rss_config_obj *rss_obj,

1
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
View File

@ -3024,7 +3024,6 @@ void bnx2x_unlock_vf_pf_channel(struct bnx2x *bp, struct bnx2x_virtf *vf,
int bnx2x_sriov_configure(struct pci_dev *dev, int num_vfs_param) int bnx2x_sriov_configure(struct pci_dev *dev, int num_vfs_param)
{ {
struct bnx2x *bp = netdev_priv(pci_get_drvdata(dev)); struct bnx2x *bp = netdev_priv(pci_get_drvdata(dev));
DP(BNX2X_MSG_IOV, "bnx2x_sriov_configure called with %d, BNX2X_NR_VIRTFN(bp) was %d\n", DP(BNX2X_MSG_IOV, "bnx2x_sriov_configure called with %d, BNX2X_NR_VIRTFN(bp) was %d\n",

1
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
View File

@ -722,7 +722,6 @@ u32 bnx2x_crc_vf_bulletin(struct bnx2x *bp,
struct pf_vf_bulletin_content *bulletin); struct pf_vf_bulletin_content *bulletin);
int bnx2x_post_vf_bulletin(struct bnx2x *bp, int vf); int bnx2x_post_vf_bulletin(struct bnx2x *bp, int vf);
enum sample_bulletin_result bnx2x_sample_bulletin(struct bnx2x *bp); enum sample_bulletin_result bnx2x_sample_bulletin(struct bnx2x *bp);
/* VF side vfpf channel functions */ /* VF side vfpf channel functions */

1
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
View File

@ -1002,7 +1002,6 @@ static int bnx2x_storm_stats_update(struct bnx2x *bp)
qstats->valid_bytes_received_lo = qstats->valid_bytes_received_lo =
qstats->total_bytes_received_lo; qstats->total_bytes_received_lo;
UPDATE_EXTEND_TSTAT(rcv_ucast_pkts, UPDATE_EXTEND_TSTAT(rcv_ucast_pkts,
total_unicast_packets_received); total_unicast_packets_received);
UPDATE_EXTEND_TSTAT(rcv_mcast_pkts, UPDATE_EXTEND_TSTAT(rcv_mcast_pkts,

4
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
View File

@ -40,7 +40,6 @@ struct nig_stats {
u32 egress_mac_pkt1_hi; u32 egress_mac_pkt1_hi;
}; };
enum bnx2x_stats_event { enum bnx2x_stats_event {
STATS_EVENT_PMF = 0, STATS_EVENT_PMF = 0,
STATS_EVENT_LINK_UP, STATS_EVENT_LINK_UP,
@ -208,7 +207,6 @@ struct bnx2x_eth_stats {
u32 eee_tx_lpi; u32 eee_tx_lpi;
}; };
struct bnx2x_eth_q_stats { struct bnx2x_eth_q_stats {
u32 total_unicast_bytes_received_hi; u32 total_unicast_bytes_received_hi;
u32 total_unicast_bytes_received_lo; u32 total_unicast_bytes_received_lo;
@ -331,7 +329,6 @@ struct bnx2x_fw_port_stats_old {
u32 mac_discard; u32 mac_discard;
}; };
/**************************************************************************** /****************************************************************************
* Macros * Macros
****************************************************************************/ ****************************************************************************/
@ -536,7 +533,6 @@ struct bnx2x_fw_port_stats_old {
SUB_EXTEND_64(qstats->t##_hi, qstats->t##_lo, diff); \ SUB_EXTEND_64(qstats->t##_hi, qstats->t##_lo, diff); \
} while (0) } while (0)
/* forward */ /* forward */
struct bnx2x; struct bnx2x;