Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2de67439 authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

bnx2x: Semantic renovation 



Mostly corrects white spaces, indentations, and comments.

Signed-off-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarAriel Elior <ariele@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f5ae6279

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+21 −29
Original line number Diff line number Diff line
@@ -141,8 +141,8 @@ do { \ 
#define bnx2x_mc_addr(ha)      ((ha)->addr)

#define bnx2x_uc_addr(ha)      ((ha)->addr)



#define U64_LO(x)			(u32)(((u64)(x)) & 0xffffffff)

#define U64_HI(x)			(u32)(((u64)(x)) >> 32)

#define U64_LO(x)			((u32)(((u64)(x)) & 0xffffffff))

#define U64_HI(x)			((u32)(((u64)(x)) >> 32))

#define HILO_U64(hi, lo)		((((u64)(hi)) << 32) + (lo))
@@ -1343,8 +1343,6 @@ struct bnx2x { 
	__le16			*eq_cons_sb;

	atomic_t		eq_spq_left; /* COMMON_XXX ramrods credit */







	/* Counter for marking that there is a STAT_QUERY ramrod pending */

	u16			stats_pending;

	/*  Counter for completed statistics ramrods */
@@ -2076,10 +2074,8 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id, 
#define BNX2X_LOOPBACK_FAILED		(BNX2X_MAC_LOOPBACK_FAILED | \

					 BNX2X_PHY_LOOPBACK_FAILED)





#define STROM_ASSERT_ARRAY_SIZE		50





/* must be used on a CID before placing it on a HW ring */

#define HW_CID(bp, x)			((BP_PORT(bp) << 23) | \

					 (BP_VN(bp) << BNX2X_SWCID_SHIFT) | \
@@ -2110,7 +2106,6 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id, 
/* Memory of fairness algorithm . 2 cycles */

#define FAIR_MEM					2





#define ATTN_NIG_FOR_FUNC		(1L << 8)

#define ATTN_SW_TIMER_4_FUNC		(1L << 9)

#define GPIO_2_FUNC			(1L << 10)
@@ -2215,7 +2210,6 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id, 


#define MULTI_MASK			0x7f





#define DEF_USB_FUNC_OFF	offsetof(struct cstorm_def_status_block_u, func)

#define DEF_CSB_FUNC_OFF	offsetof(struct cstorm_def_status_block_c, func)

#define DEF_XSB_FUNC_OFF	offsetof(struct xstorm_def_status_block, func)
@@ -2243,18 +2237,6 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id, 
		(&bp->def_status_blk->sp_sb.\

					index_values[HC_SP_INDEX_ETH_DEF_CONS])



#define SET_FLAG(value, mask, flag) \

	do {\

		(value) &= ~(mask);\

		(value) |= ((flag) << (mask##_SHIFT));\

	} while (0)



#define GET_FLAG(value, mask) \

	(((value) & (mask)) >> (mask##_SHIFT))



#define GET_FIELD(value, fname) \

	(((value) & (fname##_MASK)) >> (fname##_SHIFT))



#define CAM_IS_INVALID(x) \

	(GET_FLAG(x.flags, \

	MAC_CONFIGURATION_ENTRY_ACTION_TYPE) == \
@@ -2265,7 +2247,6 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id, 
#define MC_HASH_OFFSET(bp, i)		(BAR_TSTRORM_INTMEM + \

	TSTORM_APPROXIMATE_MATCH_MULTICAST_FILTERING_OFFSET(BP_FUNC(bp)) + i*4)





#ifndef PXP2_REG_PXP2_INT_STS

#define PXP2_REG_PXP2_INT_STS		PXP2_REG_PXP2_INT_STS_0

#endif
@@ -2302,7 +2283,6 @@ static const u32 dmae_reg_go_c[] = { 
void bnx2x_set_ethtool_ops(struct net_device *netdev);

void bnx2x_notify_link_changed(struct bnx2x *bp);





#define BNX2X_MF_SD_PROTOCOL(bp) \

	((bp)->mf_config[BP_VN(bp)] & FUNC_MF_CFG_PROTOCOL_MASK)
@@ -2323,6 +2303,18 @@ void bnx2x_notify_link_changed(struct bnx2x *bp); 
				(BNX2X_IS_MF_SD_PROTOCOL_ISCSI(bp) || \

				 BNX2X_IS_MF_SD_PROTOCOL_FCOE(bp)))



#define SET_FLAG(value, mask, flag) \

	do {\

		(value) &= ~(mask);\

		(value) |= ((flag) << (mask##_SHIFT));\

	} while (0)



#define GET_FLAG(value, mask) \

	(((value) & (mask)) >> (mask##_SHIFT))



#define GET_FIELD(value, fname) \

	(((value) & (fname##_MASK)) >> (fname##_SHIFT))



enum {

	SWITCH_UPDATE,

	AFEX_UPDATE,

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+12 −16
Original line number Diff line number Diff line
@@ -343,14 +343,14 @@ static inline void bnx2x_update_sge_prod(struct bnx2x_fastpath *fp, 
	   fp->last_max_sge, fp->rx_sge_prod);

}



/* Set Toeplitz hash value in the skb using the value from the

/* Get Toeplitz hash value in the skb using the value from the

 * CQE (calculated by HW).

 */

static u32 bnx2x_get_rxhash(const struct bnx2x *bp,

			    const struct eth_fast_path_rx_cqe *cqe,

			    bool *l4_rxhash)

{

	/* Set Toeplitz hash from CQE */

	/* Get Toeplitz hash from CQE */

	if ((bp->dev->features & NETIF_F_RXHASH) &&

	    (cqe->status_flags & ETH_FAST_PATH_RX_CQE_RSS_HASH_FLG)) {

		enum eth_rss_hash_type htype;
@@ -449,7 +449,7 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue, 
 *

 * Approximate value of the MSS for this aggregation calculated using

 * the first packet of it.

 * Compute number of aggregated segments, and gso_type

 * Compute number of aggregated segments, and gso_type.

 */

static void bnx2x_set_gro_params(struct sk_buff *skb, u16 parsing_flags,

				 u16 len_on_bd, unsigned int pkt_len)
@@ -619,7 +619,6 @@ static void *bnx2x_frag_alloc(const struct bnx2x_fastpath *fp) 
	return kmalloc(fp->rx_buf_size + NET_SKB_PAD, GFP_ATOMIC);

}





#ifdef CONFIG_INET

static void bnx2x_gro_ip_csum(struct bnx2x *bp, struct sk_buff *skb)

{
@@ -1827,7 +1826,6 @@ u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb) 
	return __skb_tx_hash(dev, skb, BNX2X_NUM_ETH_QUEUES(bp));

}





void bnx2x_set_num_queues(struct bnx2x *bp)

{

	/* RSS queues */
@@ -2483,7 +2481,6 @@ int bnx2x_load_cnic(struct bnx2x *bp) 
#endif /* ! BNX2X_STOP_ON_ERROR */

}





/* must be called with rtnl_lock */

int bnx2x_nic_load(struct bnx2x *bp, int load_mode)

{
@@ -3064,7 +3061,6 @@ int bnx2x_poll(struct napi_struct *napi, int budget) 
			if (bnx2x_tx_queue_has_work(fp->txdata_ptr[cos]))

				bnx2x_tx_int(bp, fp->txdata_ptr[cos]);





		if (bnx2x_has_rx_work(fp)) {

			work_done += bnx2x_rx_int(fp, budget - work_done);
@@ -4254,7 +4250,7 @@ int bnx2x_alloc_mem_bp(struct bnx2x *bp) 


	/*

	 * The biggest MSI-X table we might need is as a maximum number of fast

	 * path IGU SBs plus default SB (for PF).

	 * path IGU SBs plus default SB (for PF only).

	 */

	msix_table_size = bp->igu_sb_cnt;

	if (IS_PF(bp))
@@ -4364,7 +4360,7 @@ int bnx2x_get_link_cfg_idx(struct bnx2x *bp) 
{

	u32 sel_phy_idx = bnx2x_get_cur_phy_idx(bp);

	/*

	 * The selected actived PHY is always after swapping (in case PHY

	 * The selected activated PHY is always after swapping (in case PHY

	 * swapping is enabled). So when swapping is enabled, we need to reverse

	 * the configuration

	 */

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h

+1 −2
Original line number Diff line number Diff line
@@ -975,7 +975,6 @@ static inline int bnx2x_func_start(struct bnx2x *bp) 
	return bnx2x_func_state_change(bp, &func_params);

}





/**

 * bnx2x_set_fw_mac_addr - fill in a MAC address in FW format

 *
@@ -1391,7 +1390,7 @@ static inline bool bnx2x_is_valid_ether_addr(struct bnx2x *bp, u8 *addr) 
}



/**

 * bnx2x_fill_fw_str - Fill buffer with FW version string.

 * bnx2x_fill_fw_str - Fill buffer with FW version string

 *

 * @bp:        driver handle

 * @buf:       character buffer to fill with the fw name

drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c

+4 −1
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ static void bnx2x_pfc_set_pfc(struct bnx2x *bp) 
	int mfw_configured = SHMEM2_HAS(bp, drv_flags) &&

			     GET_FLAGS(SHMEM2_RD(bp, drv_flags),

				       1 << DRV_FLAGS_DCB_MFW_CONFIGURED);



	if (bp->dcbx_port_params.pfc.enabled &&

	    (!(bp->dcbx_error & DCBX_REMOTE_MIB_ERROR) || mfw_configured))

		/*
@@ -558,6 +559,7 @@ static void bnx2x_dcbx_update_ets_params(struct bnx2x *bp) 
	int mfw_configured = SHMEM2_HAS(bp, drv_flags) &&

			     GET_FLAGS(SHMEM2_RD(bp, drv_flags),

				       1 << DRV_FLAGS_DCB_MFW_CONFIGURED);



	bnx2x_ets_disabled(&bp->link_params, &bp->link_vars);



	if (!bp->dcbx_port_params.ets.enabled ||
@@ -1904,11 +1906,13 @@ static u8 bnx2x_dcbnl_set_state(struct net_device *netdev, u8 state) 
	struct bnx2x *bp = netdev_priv(netdev);

	DP(BNX2X_MSG_DCB, "state = %s\n", state ? "on" : "off");



	/* Fail to set state to "enabled" if dcbx is disabled in nvram */

	if (state && ((bp->dcbx_enabled == BNX2X_DCBX_ENABLED_OFF) ||

		      (bp->dcbx_enabled == BNX2X_DCBX_ENABLED_INVALID))) {

		DP(BNX2X_MSG_DCB, "Can not set dcbx to enabled while it is disabled in nvm\n");

		return 1;

	}



	bnx2x_dcbx_set_state(bp, (state ? true : false), bp->dcbx_enabled);

	return 0;

}
@@ -2052,7 +2056,6 @@ static void bnx2x_dcbnl_set_pfc_cfg(struct net_device *netdev, int prio, 
	if (!bnx2x_dcbnl_set_valid(bp) || prio >= MAX_PFC_PRIORITIES)

		return;





	if (setting) {

		bp->dcbx_config_params.admin_pfc_bitmap |= (1 << prio);

		bp->dcbx_config_params.admin_pfc_tx_enable = 1;

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+12 −14
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
		DP(BNX2X_MSG_ETHTOOL, "Unsupported port type\n");

		return -EINVAL;

	}

	/* Save new config in case command complete successully */

	/* Save new config in case command complete successfully */

	new_multi_phy_config = bp->link_params.multi_phy_config;

	/* Get the new cfg_idx */

	cfg_idx = bnx2x_get_link_cfg_idx(bp);
@@ -751,11 +751,10 @@ static bool bnx2x_is_wreg_in_chip(struct bnx2x *bp, 
 * @bp		device handle

 * @p		output buffer

 *

 * Reads "paged" memories: memories that may only be read by

 * first writing to a specific address ("write address") and

 * then reading from a specific address ("read address"). There

 * may be more than one write address per "page" and more than

 * one read address per write address.

 * Reads "paged" memories: memories that may only be read by first writing to a

 * specific address ("write address") and then reading from a specific address

 * ("read address"). There may be more than one write address per "page" and

 * more than one read address per write address.

 */

static void bnx2x_read_pages_regs(struct bnx2x *bp, u32 *p, u32 preset)

{
@@ -1082,13 +1081,13 @@ static int bnx2x_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) 
	struct bnx2x *bp = netdev_priv(dev);



	if (wol->wolopts & ~WAKE_MAGIC) {

		DP(BNX2X_MSG_ETHTOOL, "WOL not supproted\n");

		DP(BNX2X_MSG_ETHTOOL, "WOL not supported\n");

		return -EINVAL;

	}



	if (wol->wolopts & WAKE_MAGIC) {

		if (bp->flags & NO_WOL_FLAG) {

			DP(BNX2X_MSG_ETHTOOL, "WOL not supproted\n");

			DP(BNX2X_MSG_ETHTOOL, "WOL not supported\n");

			return -EINVAL;

		}

		bp->wol = 1;
@@ -1161,7 +1160,7 @@ static int bnx2x_get_eeprom_len(struct net_device *dev) 
 * Pf B takes the lock and proceeds to perform it's own access.

 * pf A unlocks the per port lock, while pf B is still working (!).

 * mcp takes the per port lock and corrupts pf B's access (and/or has it's own

 * acess corrupted by pf B).*

 * access corrupted by pf B)

 */

static int bnx2x_acquire_nvram_lock(struct bnx2x *bp)

{
@@ -1970,7 +1969,6 @@ static int bnx2x_set_eee(struct net_device *dev, struct ethtool_eee *edata) 
	return 0;

}





enum {

	BNX2X_CHIP_E1_OFST = 0,

	BNX2X_CHIP_E1H_OFST,
@@ -2621,6 +2619,7 @@ static void bnx2x_self_test(struct net_device *dev, 
		etest->flags |= ETH_TEST_FL_FAILED;

		return;

	}



	DP(BNX2X_MSG_ETHTOOL,

	   "Self-test command parameters: offline = %d, external_lb = %d\n",

	   (etest->flags & ETH_TEST_FL_OFFLINE),
@@ -2976,9 +2975,8 @@ static int bnx2x_set_rss_flags(struct bnx2x *bp, struct ethtool_rxnfc *info) 
			DP(BNX2X_MSG_ETHTOOL,

			   "Command parameters not supported\n");

			return -EINVAL;

		} else {

			return 0;

		}

		return 0;



	case UDP_V4_FLOW:

	case UDP_V6_FLOW: