bnx2x: Revise comments and alignment (16a5fd92) · Commits · e / devices / android_kernel_oneplus_sm7250

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

+13 −12

Original line number	Diff line number	Diff line
		@@ -362,7 +362,7 @@ union db_prod {
		/*
		* Number of required SGEs is the sum of two:
		* 1. Number of possible opened aggregations (next packet for
		* these aggregations will probably consume SGE immidiatelly)
		* these aggregations will probably consume SGE immediately)
		* 2. Rest of BRB blocks divided by 2 (block will consume new SGE only
		* after placement on BD for new TPA aggregation)
		*
		@@ -486,10 +486,10 @@ struct bnx2x_fastpath {

		struct napi_struct napi;
		union host_hc_status_block status_blk;
		/* chip independed shortcuts into sb structure */
		/* chip independent shortcuts into sb structure */
		__le16 *sb_index_values;
		__le16 *sb_running_index;
		/* chip independed shortcut into rx_prods_offset memory */
		/* chip independent shortcut into rx_prods_offset memory */
		u32 ustorm_rx_prods_offset;

		u32 rx_buf_size;
		@@ -603,7 +603,7 @@ struct bnx2x_fastpath {
		* START_BD(splitted) - includes unpaged data segment for GSO
		* PARSING_BD - for TSO and CSUM data
		* PARSING_BD2 - for encapsulation data
		* Frag BDs - decribes pages for frags
		* Frag BDs - describes pages for frags
		*/
		#define BDS_PER_TX_PKT 4
		#define MAX_BDS_PER_TX_PKT (MAX_SKB_FRAGS + BDS_PER_TX_PKT)
		@@ -886,14 +886,14 @@ struct bnx2x_common {
		#define CHIP_IS_E3A0(bp) (CHIP_IS_E3(bp) && \
		(CHIP_REV(bp) == CHIP_REV_Ax))
		/* This define is used in two main places:
		* 1. In the early stages of nic_load, to know if to configrue Parser / Searcher
		* 1. In the early stages of nic_load, to know if to configure Parser / Searcher
		* to nic-only mode or to offload mode. Offload mode is configured if either the
		* chip is E1x (where MIC_MODE register is not applicable), or if cnic already
		* registered for this port (which means that the user wants storage services).
		* 2. During cnic-related load, to know if offload mode is already configured in
		* the HW or needs to be configrued.
		* the HW or needs to be configured.
		* Since the transition from nic-mode to offload-mode in HW causes traffic
		* coruption, nic-mode is configured only in ports on which storage services
		* corruption, nic-mode is configured only in ports on which storage services
		* where never requested.
		*/
		#define CONFIGURE_NIC_MODE(bp) (!CHIP_IS_E1x(bp) && !CNIC_ENABLED(bp))
		@@ -994,14 +994,14 @@ extern struct workqueue_struct *bnx2x_wq;
		* If the maximum number of FP-SB available is X then:
		* a. If CNIC is supported it consumes 1 FP-SB thus the max number of
		* regular L2 queues is Y=X-1
		* b. in MF mode the actual number of L2 queues is Y= (X-1/MF_factor)
		* b. In MF mode the actual number of L2 queues is Y= (X-1/MF_factor)
		* c. If the FCoE L2 queue is supported the actual number of L2 queues
		* is Y+1
		* d. The number of irqs (MSIX vectors) is either Y+1 (one extra for
		* slow-path interrupts) or Y+2 if CNIC is supported (one additional
		* FP interrupt context for the CNIC).
		* e. The number of HW context (CID count) is always X or X+1 if FCoE
		* L2 queue is supported. the cid for the FCoE L2 queue is always X.
		* L2 queue is supported. The cid for the FCoE L2 queue is always X.
		*/

		/* fast-path interrupt contexts E1x */
		@@ -1568,7 +1568,7 @@ struct bnx2x {
		struct mutex cnic_mutex;
		struct bnx2x_vlan_mac_obj iscsi_l2_mac_obj;

		/* Start index of the "special" (CNIC related) L2 cleints */
		/* Start index of the "special" (CNIC related) L2 clients */
		u8 cnic_base_cl_id;

		int dmae_ready;
		@@ -1682,7 +1682,7 @@ struct bnx2x {
		/* operation indication for the sp_rtnl task */
		unsigned long sp_rtnl_state;

		/* DCBX Negotation results */
		/* DCBX Negotiation results */
		struct dcbx_features dcbx_local_feat;
		u32 dcbx_error;

		@@ -2042,7 +2042,8 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id,
		#define DMAE_LEN32_WR_MAX(bp) (CHIP_IS_E1(bp) ? 0x400 : 0x2000)

		#define DMAE_COMP_VAL 0x60d0d0ae /* E2 and on - upper bit
		indicates eror */
		* indicates error
		*/

		#define MAX_DMAE_C_PER_PORT 8
		#define INIT_DMAE_C(bp) (BP_PORT(bp) * MAX_DMAE_C_PER_PORT + \

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

+23 −25

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ static void bnx2x_shrink_eth_fp(struct bnx2x *bp, int delta)
		int i, cos, old_eth_num = BNX2X_NUM_ETH_QUEUES(bp);

		/* Queue pointer cannot be re-set on an fp-basis, as moving pointer
		* backward along the array could cause memory to be overriden
		* backward along the array could cause memory to be overridden
		*/
		for (cos = 1; cos < bp->max_cos; cos++) {
		for (i = 0; i < old_eth_num - delta; i++) {
		@@ -258,7 +258,7 @@ int bnx2x_tx_int(struct bnx2x bp, struct bnx2x_fp_txdata txdata)
		smp_mb();

		if (unlikely(netif_tx_queue_stopped(txq))) {
		/* Taking tx_lock() is needed to prevent reenabling the queue
		/* Taking tx_lock() is needed to prevent re-enabling the queue
		* while it's empty. This could have happen if rx_action() gets
		* suspended in bnx2x_tx_int() after the condition before
		* netif_tx_wake_queue(), while tx_action (bnx2x_start_xmit()):
		@@ -571,7 +571,7 @@ static int bnx2x_fill_frag_skb(struct bnx2x bp, struct bnx2x_fastpath fp,
		return err;
		}

		/* Unmap the page as we r going to pass it to the stack */
		/* Unmap the page as we're going to pass it to the stack */
		dma_unmap_page(&bp->pdev->dev,
		dma_unmap_addr(&old_rx_pg, mapping),
		SGE_PAGES, DMA_FROM_DEVICE);
		@@ -1114,7 +1114,7 @@ static void bnx2x_fill_report_data(struct bnx2x *bp,

		memset(data, 0, sizeof(*data));

		/* Fill the report data: efective line speed */
		/* Fill the report data: effective line speed */
		data->line_speed = line_speed;

		/* Link is down */
		@@ -1157,7 +1157,7 @@ void bnx2x_link_report(struct bnx2x *bp)
		*
		* @bp: driver handle
		*
		* None atomic inmlementation.
		* None atomic implementation.
		* Should be called under the phy_lock.
		*/
		void __bnx2x_link_report(struct bnx2x *bp)
		@@ -1300,7 +1300,7 @@ void bnx2x_init_rx_rings(struct bnx2x *bp)
		"mtu %d rx_buf_size %d\n", bp->dev->mtu, fp->rx_buf_size);

		if (!fp->disable_tpa) {
		/* Fill the per-aggregtion pool */
		/* Fill the per-aggregation pool */
		for (i = 0; i < MAX_AGG_QS(bp); i++) {
		struct bnx2x_agg_info *tpa_info =
		&fp->tpa_info[i];
		@@ -1858,7 +1858,7 @@ void bnx2x_set_num_queues(struct bnx2x *bp)
		*
		* If the actual number of Tx queues (for each CoS) is less than 16 then there
		* will be the holes at the end of each group of 16 ETh L2 indices (0..15,
		* 16..31,...) with indicies that are not coupled with any real Tx queue.
		* 16..31,...) with indices that are not coupled with any real Tx queue.
		*
		* The proper configuration of skb->queue_mapping is handled by
		* bnx2x_select_queue() and __skb_tx_hash().
		@@ -1920,7 +1920,7 @@ static void bnx2x_set_rx_buf_size(struct bnx2x *bp)
		ETH_OVREHEAD +
		mtu +
		BNX2X_FW_RX_ALIGN_END;
		/* Note : rx_buf_size doesnt take into account NET_SKB_PAD */
		/* Note : rx_buf_size doesn't take into account NET_SKB_PAD */
		if (fp->rx_buf_size + NET_SKB_PAD <= PAGE_SIZE)
		fp->rx_frag_size = fp->rx_buf_size + NET_SKB_PAD;
		else
		@@ -1933,7 +1933,7 @@ static int bnx2x_init_rss_pf(struct bnx2x *bp)
		int i;
		u8 num_eth_queues = BNX2X_NUM_ETH_QUEUES(bp);

		/* Prepare the initial contents fo the indirection table if RSS is
		/* Prepare the initial contents for the indirection table if RSS is
		* enabled
		*/
		for (i = 0; i < sizeof(bp->rss_conf_obj.ind_table); i++)
		@@ -2011,7 +2011,7 @@ static int bnx2x_init_hw(struct bnx2x *bp, u32 load_code)

		/*
		* Cleans the object that have internal lists without sending
		* ramrods. Should be run when interrutps are disabled.
		* ramrods. Should be run when interrupts are disabled.
		*/
		void bnx2x_squeeze_objects(struct bnx2x *bp)
		{
		@@ -2347,8 +2347,7 @@ static void bnx2x_bz_fp(struct bnx2x *bp, int index)
		fp->txdata_ptr[cos] = &bp->bnx2x_txq[cos *
		BNX2X_NUM_ETH_QUEUES(bp) + index];

		/*
		* set the tpa flag for each queue. The tpa flag determines the queue
		/* set the tpa flag for each queue. The tpa flag determines the queue
		* minimal size so it must be set prior to queue memory allocation
		*/
		fp->disable_tpa = !(bp->flags & TPA_ENABLE_FLAG \|\|
		@@ -2473,6 +2472,7 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)

		bp->state = BNX2X_STATE_OPENING_WAIT4_LOAD;

		/* zero the structure w/o any lock, before SP handler is initialized */
		memset(&bp->last_reported_link, 0, sizeof(bp->last_reported_link));
		__set_bit(BNX2X_LINK_REPORT_LINK_DOWN,
		&bp->last_reported_link.link_report_flags);
		@@ -2537,8 +2537,8 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
		}

		/* configure multi cos mappings in kernel.
		* this configuration may be overriden by a multi class queue discipline
		* or by a dcbx negotiation result.
		* this configuration may be overridden by a multi class queue
		* discipline or by a dcbx negotiation result.
		*/
		bnx2x_setup_tc(bp->dev, bp->max_cos);

		@@ -2697,7 +2697,7 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
		/* Start the Tx */
		switch (load_mode) {
		case LOAD_NORMAL:
		/* Tx queue should be only reenabled */
		/* Tx queue should be only re-enabled */
		netif_tx_wake_all_queues(bp->dev);
		break;

		@@ -2842,7 +2842,7 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link)
		}

		/* Nothing to do during unload if previous bnx2x_nic_load()
		* have not completed succesfully - all resourses are released.
		* have not completed successfully - all resources are released.
		*
		* we can get here only after unsuccessful ndo_* callback, during which
		* dev->IFF_UP flag is still on.
		@@ -2891,10 +2891,9 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link)
		/* Send the UNLOAD_REQUEST to the MCP */
		bnx2x_send_unload_req(bp, unload_mode);

		/*
		* Prevent transactions to host from the functions on the
		/* Prevent transactions to host from the functions on the
		* engine that doesn't reset global blocks in case of global
		* attention once gloabl blocks are reset and gates are opened
		* attention once global blocks are reset and gates are opened
		* (the engine which leader will perform the recovery
		* last).
		*/
		@@ -2915,7 +2914,7 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link)
		}

		/*
		* At this stage no more interrupts will arrive so we may safly clean
		* At this stage no more interrupts will arrive so we may safely clean
		* the queueable objects here in case they failed to get cleaned so far.
		*/
		if (IS_PF(bp))
		@@ -3587,7 +3586,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff skb, struct net_device dev)
		DP(NETIF_MSG_TX_QUEUED, "indices: txq %d, fp %d, txdata %d\n",
		txq_index, fp_index, txdata_index); */

		/* enable this debug print to view the tranmission details
		/* enable this debug print to view the transmission details
		DP(NETIF_MSG_TX_QUEUED,
		"transmitting packet cid %d fp index %d txdata_index %d tx_data ptr %p fp pointer %p\n",
		txdata->cid, fp_index, txdata_index, txdata, fp); */
		@@ -3970,7 +3969,7 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc)
		/* setup tc must be called under rtnl lock */
		ASSERT_RTNL();

		/* no traffic classes requested. aborting */
		/* no traffic classes requested. Aborting */
		if (!num_tc) {
		netdev_reset_tc(dev);
		return 0;
		@@ -3997,8 +3996,7 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc)
		prio, bp->prio_to_cos[prio]);
		}


		/* Use this configuration to diffrentiate tc0 from other COSes
		/* Use this configuration to differentiate tc0 from other COSes
		This can be used for ets or pfc, and save the effort of setting
		up a multio class queue disc or negotiating DCBX with a switch
		netdev_set_prio_tc_map(dev, 0, 0);
		@@ -4629,7 +4627,7 @@ int bnx2x_set_features(struct net_device *dev, netdev_features_t features)

		changes = flags ^ bp->flags;

		/* if GRO is changed while LRO is enabled, dont force a reload */
		/* if GRO is changed while LRO is enabled, don't force a reload */
		if ((changes & GRO_ENABLE_FLAG) && (flags & TPA_ENABLE_FLAG))
		changes &= ~GRO_ENABLE_FLAG;

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1331,8 +1331,8 @@ static inline bool bnx2x_mtu_allows_gro(int mtu)
		int fpp = SGE_PAGE_SIZE / (mtu - ETH_MAX_TPA_HEADER_SIZE);

		/*
		* 1. number of frags should not grow above MAX_SKB_FRAGS
		* 2. frag must fit the page
		* 1. Number of frags should not grow above MAX_SKB_FRAGS
		* 2. Frag must fit the page
		*/
		return mtu <= SGE_PAGE_SIZE && (U_ETH_SGL_SIZE * fpp) <= MAX_SKB_FRAGS;
		}

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

+20 −17

Original line number	Diff line number	Diff line
		@@ -687,7 +687,7 @@ static inline void bnx2x_dcbx_update_tc_mapping(struct bnx2x *bp)
		}

		/* setup tc must be called under rtnl lock, but we can't take it here
		* as we are handling an attetntion on a work queue which must be
		* as we are handling an attention on a work queue which must be
		* flushed at some rtnl-locked contexts (e.g. if down)
		*/
		if (!test_and_set_bit(BNX2X_SP_RTNL_SETUP_TC, &bp->sp_rtnl_state))
		@@ -707,7 +707,7 @@ void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state)
		*/
		bnx2x_dcbnl_update_applist(bp, true);

		/* Read rmeote mib if dcbx is in the FW */
		/* Read remote mib if dcbx is in the FW */
		if (bnx2x_dcbx_read_shmem_remote_mib(bp))
		return;
		#endif
		@@ -738,7 +738,7 @@ void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state)
		bnx2x_dcbx_update_tc_mapping(bp);

		/*
		* allow other funtions to update their netdevices
		* allow other functions to update their netdevices
		* accordingly
		*/
		if (IS_MF(bp))
		@@ -860,7 +860,7 @@ static void bnx2x_dcbx_admin_mib_updated_params(struct bnx2x *bp,
		i, DCBX_PRI_PG_GET(af->ets.pri_pg_tbl, i));
		}

		/*For IEEE admin_recommendation_bw_precentage
		/*For IEEE admin_recommendation_bw_percentage
		For IEEE admin_recommendation_ets_pg /
		af->pfc.pri_en_bitmap = (u8)dp->admin_pfc_bitmap;
		for (i = 0; i < DCBX_CONFIG_MAX_APP_PROTOCOL; i++) {
		@@ -1070,7 +1070,7 @@ static void bnx2x_dcbx_get_num_pg_traf_type(struct bnx2x *bp,
		bool pg_found = false;
		u32 i, traf_type, add_traf_type, add_pg;
		u32 *ttp = bp->dcbx_port_params.app.traffic_type_priority;
		struct pg_entry_help_data data = help_data->data; /shotcut*/
		struct pg_entry_help_data data = help_data->data; /shortcut*/

		/* Set to invalid */
		for (i = 0; i < LLFC_DRIVER_TRAFFIC_TYPE_MAX; i++)
		@@ -1166,7 +1166,8 @@ static void bnx2x_dcbx_separate_pauseable_from_non(struct bnx2x *bp,
		DCBX_PG_BW_GET(ets->pg_bw_tbl, pg_entry));
		else
		/* If we join a group and one is strict
		* than the bw rulls */
		* than the bw rules
		*/
		cos_data->data[entry].strict =
		BNX2X_DCBX_STRICT_COS_HIGHEST;
		}
		@@ -1477,7 +1478,7 @@ static void bnx2x_dcbx_2cos_limit_cee_three_pg_to_cos_params(
		* queue and one priority goes to the second queue.
		*
		* We will join this two cases:
		* if one is BW limited it will go to the secoend queue
		* if one is BW limited it will go to the second queue
		* otherwise the last priority will get it
		*/

		@@ -1497,7 +1498,8 @@ static void bnx2x_dcbx_2cos_limit_cee_three_pg_to_cos_params(
		false == b_found_strict)
		/* last entry will be handled separately
		* If no priority is strict than last
		* enty goes to last queue.*/
		* entry goes to last queue.
		*/
		entry = 1;
		cos_data->data[entry].pri_join_mask \|=
		pri_tested;
		@@ -1509,7 +1511,8 @@ static void bnx2x_dcbx_2cos_limit_cee_three_pg_to_cos_params(
		b_found_strict = true;
		cos_data->data[1].pri_join_mask \|= pri_tested;
		/* If we join a group and one is strict
		* than the bw rulls */
		* than the bw rules
		*/
		cos_data->data[1].strict =
		BNX2X_DCBX_STRICT_COS_HIGHEST;
		}
		@@ -1838,7 +1841,7 @@ static void bnx2x_dcbx_fw_struct(struct bnx2x *bp,

		void bnx2x_dcbx_pmf_update(struct bnx2x *bp)
		{
		/* if we need to syncronize DCBX result from prev PMF
		/* if we need to synchronize DCBX result from prev PMF
		* read it from shmem and update bp and netdev accordingly
		*/
		if (SHMEM2_HAS(bp, drv_flags) &&
		@@ -1932,14 +1935,14 @@ static void bnx2x_dcbnl_set_pg_tccfg_tx(struct net_device *netdev, int prio,
		return;

		/**
		* bw_pct ingnored - band-width percentage devision between user
		* bw_pct ignored - band-width percentage devision between user
		* priorities within the same group is not
		* standard and hence not supported
		*
		* prio_type igonred - priority levels within the same group are not
		* prio_type ignored - priority levels within the same group are not
		* standard and hence are not supported. According
		* to the standard pgid 15 is dedicated to strict
		* prioirty traffic (on the port level).
		* priority traffic (on the port level).
		*
		* up_map ignored
		*/
		@@ -1984,14 +1987,14 @@ static void bnx2x_dcbnl_get_pg_tccfg_tx(struct net_device *netdev, int prio,
		DP(BNX2X_MSG_DCB, "prio = %d\n", prio);

		/**
		* bw_pct ingnored - band-width percentage devision between user
		* bw_pct ignored - band-width percentage devision between user
		* priorities within the same group is not
		* standard and hence not supported
		*
		* prio_type igonred - priority levels within the same group are not
		* prio_type ignored - priority levels within the same group are not
		* standard and hence are not supported. According
		* to the standard pgid 15 is dedicated to strict
		* prioirty traffic (on the port level).
		* priority traffic (on the port level).
		*
		* up_map ignored
		*/

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -13,12 +13,6 @@
		* consent.
		*/


		/* This struct holds a signature to ensure the dump returned from the driver
		* match the meta data file inserted to grc_dump.tcl
		* The signature is time stamp, diag version and grc_dump version
		*/

		#ifndef BNX2X_DUMP_H
		#define BNX2X_DUMP_H