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

Commit 50f850fd authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bnx2x' 



Dmitry Kravkov says:

====================
Please consider applying the series of bnx2x fixes to net:
	* statistics may cause FW assert
	* missing fairness configuration in DCB flow
	* memory leak in sriov related part
	* Illegal PTE access
	* Pagefault crash in shutdown flow with cnic
v1->v2
	* fixed sparse error pointed by Joe Perches
	* added missing signed-off from Sergei Shtylyov
v2->v3
	* added missing signed-off from Sergei Shtylyov
	* fixed formatting from Sergei Shtylyov
v3->v4
	* patch 1/6: fixed declaration order
	* patch 2/6 replaced with: protect flows using set_bit constraints
v4->v5
	* patch 2/6: replace proprietary locking with semaphore
	* droped 1/6: since adds redundant code from Benjamin Poirier
The following patchset contains four netfilter fixes, they are:

* Fix possible invalid access and mangling of the TCPMSS option in
  xt_TCPMSS. This was spotted by Julian Anastasov.

* Fix possible off by one access and mangling of the TCP packet in
  xt_TCPOPTSTRIP, also spotted by Julian Anastasov.

* Fix possible information leak due to missing initialization of one
  padding field of several structures that are included in nfqueue and
  nflog netlink messages, from Dan Carpenter.

* Fix TCP window tracking with Fast Open, from Yuchung Cheng.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 205057ae 6ef5a92c

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

+5 −0
Original line number Diff line number Diff line
@@ -1502,6 +1502,7 @@ struct bnx2x { 
#define BC_SUPPORTS_DCBX_MSG_NON_PMF	(1 << 21)

#define IS_VF_FLAG			(1 << 22)

#define INTERRUPTS_ENABLED_FLAG		(1 << 23)

#define BC_SUPPORTS_RMMOD_CMD		(1 << 24)



#define BP_NOMCP(bp)			((bp)->flags & NO_MCP_FLAG)
@@ -1830,6 +1831,8 @@ struct bnx2x { 


	int fp_array_size;

	u32 dump_preset_idx;

	bool					stats_started;

	struct semaphore			stats_sema;

};



/* Tx queues may be less or equal to Rx queues */
@@ -2451,4 +2454,6 @@ enum bnx2x_pci_bus_speed { 
	BNX2X_PCI_LINK_SPEED_5000 = 5000,

	BNX2X_PCI_LINK_SPEED_8000 = 8000

};



void bnx2x_set_local_cmng(struct bnx2x *bp);

#endif /* bnx2x.h */

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

+4 −0
Original line number Diff line number Diff line
@@ -753,6 +753,10 @@ void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state) 
		bnx2x_pfc_set_pfc(bp);



		bnx2x_dcbx_update_ets_params(bp);



		/* ets may affect cmng configuration: reinit it in hw */

		bnx2x_set_local_cmng(bp);



		bnx2x_dcbx_resume_hw_tx(bp);



		return;

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

+5 −0
Original line number Diff line number Diff line
@@ -1300,6 +1300,9 @@ struct drv_func_mb { 


	#define DRV_MSG_CODE_EEE_RESULTS_ACK            0xda000000



	#define DRV_MSG_CODE_RMMOD                      0xdb000000

	#define REQ_BC_VER_4_RMMOD_CMD                  0x0007080f



	#define DRV_MSG_CODE_SET_MF_BW                  0xe0000000

	#define REQ_BC_VER_4_SET_MF_BW                  0x00060202

	#define DRV_MSG_CODE_SET_MF_BW_ACK              0xe1000000
@@ -1372,6 +1375,8 @@ struct drv_func_mb { 


	#define FW_MSG_CODE_EEE_RESULS_ACK              0xda100000



	#define FW_MSG_CODE_RMMOD_ACK                   0xdb100000



	#define FW_MSG_CODE_SET_MF_BW_SENT              0xe0000000

	#define FW_MSG_CODE_SET_MF_BW_DONE              0xe1000000

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

+29 −14
Original line number Diff line number Diff line
@@ -2476,7 +2476,7 @@ static void bnx2x_cmng_fns_init(struct bnx2x *bp, u8 read_cfg, u8 cmng_type) 


	input.port_rate = bp->link_vars.line_speed;



	if (cmng_type == CMNG_FNS_MINMAX) {

	if (cmng_type == CMNG_FNS_MINMAX && input.port_rate) {

		int vn;



		/* read mf conf from shmem */
@@ -2533,6 +2533,21 @@ static void storm_memset_cmng(struct bnx2x *bp, 
	}

}



/* init cmng mode in HW according to local configuration */

void bnx2x_set_local_cmng(struct bnx2x *bp)

{

	int cmng_fns = bnx2x_get_cmng_fns_mode(bp);



	if (cmng_fns != CMNG_FNS_NONE) {

		bnx2x_cmng_fns_init(bp, false, cmng_fns);

		storm_memset_cmng(bp, &bp->cmng, BP_PORT(bp));

	} else {

		/* rate shaping and fairness are disabled */

		DP(NETIF_MSG_IFUP,

		   "single function mode without fairness\n");

	}

}



/* This function is called upon link interrupt */

static void bnx2x_link_attn(struct bnx2x *bp)

{
@@ -2568,17 +2583,8 @@ static void bnx2x_link_attn(struct bnx2x *bp) 
			bnx2x_stats_handle(bp, STATS_EVENT_LINK_UP);

	}



	if (bp->link_vars.link_up && bp->link_vars.line_speed) {

		int cmng_fns = bnx2x_get_cmng_fns_mode(bp);



		if (cmng_fns != CMNG_FNS_NONE) {

			bnx2x_cmng_fns_init(bp, false, cmng_fns);

			storm_memset_cmng(bp, &bp->cmng, BP_PORT(bp));

		} else

			/* rate shaping and fairness are disabled */

			DP(NETIF_MSG_IFUP,

			   "single function mode without fairness\n");

	}

	if (bp->link_vars.link_up && bp->link_vars.line_speed)

		bnx2x_set_local_cmng(bp);



	__bnx2x_link_report(bp);
@@ -10362,6 +10368,10 @@ static void bnx2x_get_common_hwinfo(struct bnx2x *bp) 


	bp->flags |= (val >= REQ_BC_VER_4_DCBX_ADMIN_MSG_NON_PMF) ?

			BC_SUPPORTS_DCBX_MSG_NON_PMF : 0;



	bp->flags |= (val >= REQ_BC_VER_4_RMMOD_CMD) ?

			BC_SUPPORTS_RMMOD_CMD : 0;



	boot_mode = SHMEM_RD(bp,

			dev_info.port_feature_config[BP_PORT(bp)].mba_config) &

			PORT_FEATURE_MBA_BOOT_AGENT_TYPE_MASK;
@@ -11524,6 +11534,7 @@ static int bnx2x_init_bp(struct bnx2x *bp) 
	mutex_init(&bp->port.phy_mutex);

	mutex_init(&bp->fw_mb_mutex);

	spin_lock_init(&bp->stats_lock);

	sema_init(&bp->stats_sema, 1);



	INIT_DELAYED_WORK(&bp->sp_task, bnx2x_sp_task);

	INIT_DELAYED_WORK(&bp->sp_rtnl_task, bnx2x_sp_rtnl_task);
@@ -12817,13 +12828,17 @@ static void __bnx2x_remove(struct pci_dev *pdev, 
	bnx2x_dcbnl_update_applist(bp, true);

#endif



	if (IS_PF(bp) &&

	    !BP_NOMCP(bp) &&

	    (bp->flags & BC_SUPPORTS_RMMOD_CMD))

		bnx2x_fw_command(bp, DRV_MSG_CODE_RMMOD, 0);



	/* Close the interface - either directly or implicitly */

	if (remove_netdev) {

		unregister_netdev(dev);

	} else {

		rtnl_lock();

		if (netif_running(dev))

			bnx2x_close(dev);

		dev_close(dev);

		rtnl_unlock();

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -3463,7 +3463,7 @@ int bnx2x_vf_pci_alloc(struct bnx2x *bp) 
alloc_mem_err:

	BNX2X_PCI_FREE(bp->vf2pf_mbox, bp->vf2pf_mbox_mapping,

		       sizeof(struct bnx2x_vf_mbx_msg));

	BNX2X_PCI_FREE(bp->vf2pf_mbox, bp->vf2pf_mbox_mapping,

	BNX2X_PCI_FREE(bp->vf2pf_mbox, bp->pf2vf_bulletin_mapping,

		       sizeof(union pf_vf_bulletin));

	return -ENOMEM;

}