Loading drivers/net/bnx2x.h +5 −5 Original line number Diff line number Diff line Loading @@ -155,7 +155,7 @@ struct sw_rx_page { #define NUM_RX_SGE_PAGES 2 #define RX_SGE_CNT (BCM_PAGE_SIZE / sizeof(struct eth_rx_sge)) #define MAX_RX_SGE_CNT (RX_SGE_CNT - 2) /* RX_SGE_CNT is promissed to be a power of 2 */ /* RX_SGE_CNT is promised to be a power of 2 */ #define RX_SGE_MASK (RX_SGE_CNT - 1) #define NUM_RX_SGE (RX_SGE_CNT * NUM_RX_SGE_PAGES) #define MAX_RX_SGE (NUM_RX_SGE - 1) Loading Loading @@ -317,7 +317,7 @@ struct bnx2x_fastpath { #define RCQ_BD(x) ((x) & MAX_RCQ_BD) /* This is needed for determening of last_max */ /* This is needed for determining of last_max */ #define SUB_S16(a, b) (s16)((s16)(a) - (s16)(b)) #define __SGE_MASK_SET_BIT(el, bit) \ Loading Loading @@ -784,7 +784,7 @@ struct bnx2x { u8 stats_pending; u8 set_mac_pending; /* End of fileds used in the performance code paths */ /* End of fields used in the performance code paths */ int panic; int msglevel; Loading Loading @@ -1024,10 +1024,10 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms, /* resolution of the rate shaping timer - 100 usec */ #define RS_PERIODIC_TIMEOUT_USEC 100 /* resolution of fairness algorithm in usecs - coefficient for clauclating the actuall t fair */ coefficient for calculating the actual t fair */ #define T_FAIR_COEF 10000000 /* number of bytes in single QM arbitration cycle - coeffiecnt for calculating the fairness timer */ coefficient for calculating the fairness timer */ #define QM_ARB_BYTES 40000 #define FAIR_MEM 2 Loading drivers/net/bnx2x_hsi.h +8 −8 Original line number Diff line number Diff line Loading @@ -1268,7 +1268,7 @@ struct doorbell { /* * IGU driver acknowlegement register * IGU driver acknowledgement register */ struct igu_ack_register { #if defined(__BIG_ENDIAN) Loading Loading @@ -1882,7 +1882,7 @@ struct timers_block_context { }; /* * structure for easy accessability to assembler * structure for easy accessibility to assembler */ struct eth_tx_bd_flags { u8 as_bitfield; Loading Loading @@ -2044,7 +2044,7 @@ struct eth_context { /* * ethernet doorbell * Ethernet doorbell */ struct eth_tx_doorbell { #if defined(__BIG_ENDIAN) Loading Loading @@ -2256,7 +2256,7 @@ struct ramrod_data { }; /* * union for ramrod data for ethernet protocol (CQE) (force size of 16 bits) * union for ramrod data for Ethernet protocol (CQE) (force size of 16 bits) */ union eth_ramrod_data { struct ramrod_data general; Loading Loading @@ -2330,7 +2330,7 @@ struct spe_hdr { }; /* * ethernet slow path element * Ethernet slow path element */ union eth_specific_data { u8 protocol_data[8]; Loading @@ -2343,7 +2343,7 @@ union eth_specific_data { }; /* * ethernet slow path element * Ethernet slow path element */ struct eth_spe { struct spe_hdr hdr; Loading Loading @@ -2615,7 +2615,7 @@ struct tstorm_eth_rx_producers { /* * common flag to indicate existance of TPA. * common flag to indicate existence of TPA. */ struct tstorm_eth_tpa_exist { #if defined(__BIG_ENDIAN) Loading Loading @@ -2765,7 +2765,7 @@ struct tstorm_common_stats { }; /* * Eth statistics query sturcture for the eth_stats_quesry ramrod * Eth statistics query structure for the eth_stats_query ramrod */ struct eth_stats_query { struct xstorm_common_stats xstorm_common; Loading drivers/net/bnx2x_init.h +3 −3 Original line number Diff line number Diff line Loading @@ -208,7 +208,7 @@ static void bnx2x_init_wr_64(struct bnx2x *bp, u32 addr, const u32 *data, /********************************************************* There are different blobs for each PRAM section. In addition, each blob write operation is divided into a few operations in order to decrease the amount of phys. contigious buffer needed. in order to decrease the amount of phys. contiguous buffer needed. Thus, when we select a blob the address may be with some offset from the beginning of PRAM section. The same holds for the INT_TABLE sections. Loading Loading @@ -336,7 +336,7 @@ static void bnx2x_init_block(struct bnx2x *bp, u32 op_start, u32 op_end) len = op->str_wr.data_len; data = data_base + op->str_wr.data_off; /* carefull! it must be in order */ /* careful! it must be in order */ if (unlikely(op_type > OP_WB)) { /* If E1 only */ Loading Loading @@ -740,7 +740,7 @@ static u8 calc_crc8(u32 data, u8 crc) return crc_res; } /* regiesers addresses are not in order /* registers addresses are not in order so these arrays help simplify the code */ static const int cm_start[E1H_FUNC_MAX][9] = { {MISC_FUNC0_START, TCM_FUNC0_START, UCM_FUNC0_START, CCM_FUNC0_START, Loading drivers/net/bnx2x_link.h +2 −2 Original line number Diff line number Diff line Loading @@ -143,7 +143,7 @@ u8 bnx2x_cl45_write(struct bnx2x *bp, u8 port, u32 ext_phy_type, u8 phy_addr, u8 devad, u16 reg, u16 val); /* Reads the link_status from the shmem, and update the link vars accordinaly */ and update the link vars accordingly */ void bnx2x_link_status_update(struct link_params *input, struct link_vars *output); /* returns string representing the fw_version of the external phy */ Loading @@ -152,7 +152,7 @@ u8 bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 driver_loaded, /* Set/Unset the led Basically, the CLC takes care of the led for the link, but in case one needs to set/unset the led unnatually, set the "mode" to LED_MODE_OPER to to set/unset the led unnaturally, set the "mode" to LED_MODE_OPER to blink the led, and LED_MODE_OFF to set the led off.*/ u8 bnx2x_set_led(struct bnx2x *bp, u8 port, u8 mode, u32 speed, u16 hw_led_mode, u32 chip_id); Loading drivers/net/bnx2x_main.c +12 −12 Original line number Diff line number Diff line Loading @@ -1151,8 +1151,8 @@ static inline void bnx2x_init_sge_ring_bit_mask(struct bnx2x_fastpath *fp) memset(fp->sge_mask, 0xff, (NUM_RX_SGE >> RX_SGE_MASK_ELEM_SHIFT)*sizeof(u64)); /* Clear the two last indeces in the page to 1: these are the indeces that correspond to the "next" element, /* Clear the two last indices in the page to 1: these are the indices that correspond to the "next" element, hence will never be indicated and should be removed from the calculations. */ bnx2x_clear_sge_mask_next_elems(fp); Loading Loading @@ -2011,7 +2011,7 @@ static u8 bnx2x_link_test(struct bnx2x *bp) sum of vn_min_rates or 0 - if all the min_rates are 0. In the later case fainess algorithm should be deactivated. In the later case fairness algorithm should be deactivated. If not all min_rates are zero then those that are zeroes will be set to 1. */ Loading Loading @@ -2134,7 +2134,7 @@ static void bnx2x_init_vn_minmax(struct bnx2x *bp, int func, FUNC_MF_CFG_MIN_BW_SHIFT) * 100; /* If FAIRNESS is enabled (not all min rates are zeroes) and if current min rate is zero - set it to 1. This is a requirment of the algorithm. */ This is a requirement of the algorithm. */ if ((vn_min_rate == 0) && wsum) vn_min_rate = DEF_MIN_RATE; vn_max_rate = ((vn_cfg & FUNC_MF_CFG_MAX_BW_MASK) >> Loading Loading @@ -6562,7 +6562,7 @@ static void bnx2x_reset_port(struct bnx2x *bp) val = REG_RD(bp, BRB1_REG_PORT_NUM_OCC_BLOCKS_0 + port*4); if (val) DP(NETIF_MSG_IFDOWN, "BRB1 is not empty %d blooks are occupied\n", val); "BRB1 is not empty %d blocks are occupied\n", val); /* TODO: Close Doorbell port? */ } Loading Loading @@ -6602,7 +6602,7 @@ static void bnx2x_reset_chip(struct bnx2x *bp, u32 reset_code) } } /* msut be called with rtnl_lock */ /* must be called with rtnl_lock */ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode) { int port = BP_PORT(bp); Loading Loading @@ -7455,7 +7455,7 @@ static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp) if (BP_NOMCP(bp)) { /* only supposed to happen on emulation/FPGA */ BNX2X_ERR("warning rendom MAC workaround active\n"); BNX2X_ERR("warning random MAC workaround active\n"); random_ether_addr(bp->dev->dev_addr); memcpy(bp->dev->perm_addr, bp->dev->dev_addr, ETH_ALEN); } Loading Loading @@ -8907,7 +8907,7 @@ static void bnx2x_self_test(struct net_device *dev, if (!netif_running(dev)) return; /* offline tests are not suppoerted in MF mode */ /* offline tests are not supported in MF mode */ if (IS_E1HMF(bp)) etest->flags &= ~ETH_TEST_FL_OFFLINE; Loading Loading @@ -9289,7 +9289,7 @@ poll_panic: /* we split the first BD into headers and data BDs * to ease the pain of our fellow micocode engineers * to ease the pain of our fellow microcode engineers * we use one mapping for both BDs * So far this has only been observed to happen * in Other Operating Systems(TM) Loading Loading @@ -9396,7 +9396,7 @@ static int bnx2x_pkt_req_lin(struct bnx2x *bp, struct sk_buff *skb, /* Check if LSO packet needs to be copied: 3 = 1 (for headers BD) + 2 (for PBD and last BD) */ int wnd_size = MAX_FETCH_BD - 3; /* Number of widnows to check */ /* Number of windows to check */ int num_wnds = skb_shinfo(skb)->nr_frags - wnd_size; int wnd_idx = 0; int frag_idx = 0; Loading Loading @@ -9498,7 +9498,7 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) skb->ip_summed, skb->protocol, ipv6_hdr(skb)->nexthdr, ip_hdr(skb)->protocol, skb_shinfo(skb)->gso_type, xmit_type); /* First, check if we need to linearaize the skb /* First, check if we need to linearize the skb (due to FW restrictions) */ if (bnx2x_pkt_req_lin(bp, skb, xmit_type)) { /* Statistics of linearization */ Loading Loading
drivers/net/bnx2x.h +5 −5 Original line number Diff line number Diff line Loading @@ -155,7 +155,7 @@ struct sw_rx_page { #define NUM_RX_SGE_PAGES 2 #define RX_SGE_CNT (BCM_PAGE_SIZE / sizeof(struct eth_rx_sge)) #define MAX_RX_SGE_CNT (RX_SGE_CNT - 2) /* RX_SGE_CNT is promissed to be a power of 2 */ /* RX_SGE_CNT is promised to be a power of 2 */ #define RX_SGE_MASK (RX_SGE_CNT - 1) #define NUM_RX_SGE (RX_SGE_CNT * NUM_RX_SGE_PAGES) #define MAX_RX_SGE (NUM_RX_SGE - 1) Loading Loading @@ -317,7 +317,7 @@ struct bnx2x_fastpath { #define RCQ_BD(x) ((x) & MAX_RCQ_BD) /* This is needed for determening of last_max */ /* This is needed for determining of last_max */ #define SUB_S16(a, b) (s16)((s16)(a) - (s16)(b)) #define __SGE_MASK_SET_BIT(el, bit) \ Loading Loading @@ -784,7 +784,7 @@ struct bnx2x { u8 stats_pending; u8 set_mac_pending; /* End of fileds used in the performance code paths */ /* End of fields used in the performance code paths */ int panic; int msglevel; Loading Loading @@ -1024,10 +1024,10 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms, /* resolution of the rate shaping timer - 100 usec */ #define RS_PERIODIC_TIMEOUT_USEC 100 /* resolution of fairness algorithm in usecs - coefficient for clauclating the actuall t fair */ coefficient for calculating the actual t fair */ #define T_FAIR_COEF 10000000 /* number of bytes in single QM arbitration cycle - coeffiecnt for calculating the fairness timer */ coefficient for calculating the fairness timer */ #define QM_ARB_BYTES 40000 #define FAIR_MEM 2 Loading
drivers/net/bnx2x_hsi.h +8 −8 Original line number Diff line number Diff line Loading @@ -1268,7 +1268,7 @@ struct doorbell { /* * IGU driver acknowlegement register * IGU driver acknowledgement register */ struct igu_ack_register { #if defined(__BIG_ENDIAN) Loading Loading @@ -1882,7 +1882,7 @@ struct timers_block_context { }; /* * structure for easy accessability to assembler * structure for easy accessibility to assembler */ struct eth_tx_bd_flags { u8 as_bitfield; Loading Loading @@ -2044,7 +2044,7 @@ struct eth_context { /* * ethernet doorbell * Ethernet doorbell */ struct eth_tx_doorbell { #if defined(__BIG_ENDIAN) Loading Loading @@ -2256,7 +2256,7 @@ struct ramrod_data { }; /* * union for ramrod data for ethernet protocol (CQE) (force size of 16 bits) * union for ramrod data for Ethernet protocol (CQE) (force size of 16 bits) */ union eth_ramrod_data { struct ramrod_data general; Loading Loading @@ -2330,7 +2330,7 @@ struct spe_hdr { }; /* * ethernet slow path element * Ethernet slow path element */ union eth_specific_data { u8 protocol_data[8]; Loading @@ -2343,7 +2343,7 @@ union eth_specific_data { }; /* * ethernet slow path element * Ethernet slow path element */ struct eth_spe { struct spe_hdr hdr; Loading Loading @@ -2615,7 +2615,7 @@ struct tstorm_eth_rx_producers { /* * common flag to indicate existance of TPA. * common flag to indicate existence of TPA. */ struct tstorm_eth_tpa_exist { #if defined(__BIG_ENDIAN) Loading Loading @@ -2765,7 +2765,7 @@ struct tstorm_common_stats { }; /* * Eth statistics query sturcture for the eth_stats_quesry ramrod * Eth statistics query structure for the eth_stats_query ramrod */ struct eth_stats_query { struct xstorm_common_stats xstorm_common; Loading
drivers/net/bnx2x_init.h +3 −3 Original line number Diff line number Diff line Loading @@ -208,7 +208,7 @@ static void bnx2x_init_wr_64(struct bnx2x *bp, u32 addr, const u32 *data, /********************************************************* There are different blobs for each PRAM section. In addition, each blob write operation is divided into a few operations in order to decrease the amount of phys. contigious buffer needed. in order to decrease the amount of phys. contiguous buffer needed. Thus, when we select a blob the address may be with some offset from the beginning of PRAM section. The same holds for the INT_TABLE sections. Loading Loading @@ -336,7 +336,7 @@ static void bnx2x_init_block(struct bnx2x *bp, u32 op_start, u32 op_end) len = op->str_wr.data_len; data = data_base + op->str_wr.data_off; /* carefull! it must be in order */ /* careful! it must be in order */ if (unlikely(op_type > OP_WB)) { /* If E1 only */ Loading Loading @@ -740,7 +740,7 @@ static u8 calc_crc8(u32 data, u8 crc) return crc_res; } /* regiesers addresses are not in order /* registers addresses are not in order so these arrays help simplify the code */ static const int cm_start[E1H_FUNC_MAX][9] = { {MISC_FUNC0_START, TCM_FUNC0_START, UCM_FUNC0_START, CCM_FUNC0_START, Loading
drivers/net/bnx2x_link.h +2 −2 Original line number Diff line number Diff line Loading @@ -143,7 +143,7 @@ u8 bnx2x_cl45_write(struct bnx2x *bp, u8 port, u32 ext_phy_type, u8 phy_addr, u8 devad, u16 reg, u16 val); /* Reads the link_status from the shmem, and update the link vars accordinaly */ and update the link vars accordingly */ void bnx2x_link_status_update(struct link_params *input, struct link_vars *output); /* returns string representing the fw_version of the external phy */ Loading @@ -152,7 +152,7 @@ u8 bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 driver_loaded, /* Set/Unset the led Basically, the CLC takes care of the led for the link, but in case one needs to set/unset the led unnatually, set the "mode" to LED_MODE_OPER to to set/unset the led unnaturally, set the "mode" to LED_MODE_OPER to blink the led, and LED_MODE_OFF to set the led off.*/ u8 bnx2x_set_led(struct bnx2x *bp, u8 port, u8 mode, u32 speed, u16 hw_led_mode, u32 chip_id); Loading
drivers/net/bnx2x_main.c +12 −12 Original line number Diff line number Diff line Loading @@ -1151,8 +1151,8 @@ static inline void bnx2x_init_sge_ring_bit_mask(struct bnx2x_fastpath *fp) memset(fp->sge_mask, 0xff, (NUM_RX_SGE >> RX_SGE_MASK_ELEM_SHIFT)*sizeof(u64)); /* Clear the two last indeces in the page to 1: these are the indeces that correspond to the "next" element, /* Clear the two last indices in the page to 1: these are the indices that correspond to the "next" element, hence will never be indicated and should be removed from the calculations. */ bnx2x_clear_sge_mask_next_elems(fp); Loading Loading @@ -2011,7 +2011,7 @@ static u8 bnx2x_link_test(struct bnx2x *bp) sum of vn_min_rates or 0 - if all the min_rates are 0. In the later case fainess algorithm should be deactivated. In the later case fairness algorithm should be deactivated. If not all min_rates are zero then those that are zeroes will be set to 1. */ Loading Loading @@ -2134,7 +2134,7 @@ static void bnx2x_init_vn_minmax(struct bnx2x *bp, int func, FUNC_MF_CFG_MIN_BW_SHIFT) * 100; /* If FAIRNESS is enabled (not all min rates are zeroes) and if current min rate is zero - set it to 1. This is a requirment of the algorithm. */ This is a requirement of the algorithm. */ if ((vn_min_rate == 0) && wsum) vn_min_rate = DEF_MIN_RATE; vn_max_rate = ((vn_cfg & FUNC_MF_CFG_MAX_BW_MASK) >> Loading Loading @@ -6562,7 +6562,7 @@ static void bnx2x_reset_port(struct bnx2x *bp) val = REG_RD(bp, BRB1_REG_PORT_NUM_OCC_BLOCKS_0 + port*4); if (val) DP(NETIF_MSG_IFDOWN, "BRB1 is not empty %d blooks are occupied\n", val); "BRB1 is not empty %d blocks are occupied\n", val); /* TODO: Close Doorbell port? */ } Loading Loading @@ -6602,7 +6602,7 @@ static void bnx2x_reset_chip(struct bnx2x *bp, u32 reset_code) } } /* msut be called with rtnl_lock */ /* must be called with rtnl_lock */ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode) { int port = BP_PORT(bp); Loading Loading @@ -7455,7 +7455,7 @@ static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp) if (BP_NOMCP(bp)) { /* only supposed to happen on emulation/FPGA */ BNX2X_ERR("warning rendom MAC workaround active\n"); BNX2X_ERR("warning random MAC workaround active\n"); random_ether_addr(bp->dev->dev_addr); memcpy(bp->dev->perm_addr, bp->dev->dev_addr, ETH_ALEN); } Loading Loading @@ -8907,7 +8907,7 @@ static void bnx2x_self_test(struct net_device *dev, if (!netif_running(dev)) return; /* offline tests are not suppoerted in MF mode */ /* offline tests are not supported in MF mode */ if (IS_E1HMF(bp)) etest->flags &= ~ETH_TEST_FL_OFFLINE; Loading Loading @@ -9289,7 +9289,7 @@ poll_panic: /* we split the first BD into headers and data BDs * to ease the pain of our fellow micocode engineers * to ease the pain of our fellow microcode engineers * we use one mapping for both BDs * So far this has only been observed to happen * in Other Operating Systems(TM) Loading Loading @@ -9396,7 +9396,7 @@ static int bnx2x_pkt_req_lin(struct bnx2x *bp, struct sk_buff *skb, /* Check if LSO packet needs to be copied: 3 = 1 (for headers BD) + 2 (for PBD and last BD) */ int wnd_size = MAX_FETCH_BD - 3; /* Number of widnows to check */ /* Number of windows to check */ int num_wnds = skb_shinfo(skb)->nr_frags - wnd_size; int wnd_idx = 0; int frag_idx = 0; Loading Loading @@ -9498,7 +9498,7 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) skb->ip_summed, skb->protocol, ipv6_hdr(skb)->nexthdr, ip_hdr(skb)->protocol, skb_shinfo(skb)->gso_type, xmit_type); /* First, check if we need to linearaize the skb /* First, check if we need to linearize the skb (due to FW restrictions) */ if (bnx2x_pkt_req_lin(bp, skb, xmit_type)) { /* Statistics of linearization */ Loading