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

Commit a6d3a5ba authored by Barak Witkowsky's avatar Barak Witkowsky Committed by David S. Miller
Browse files

bnx2x: fix PTE write access error 



PTE write access error  might occur in MF_ALLOWED mode when IOMMU
is active. The patch adds rmmod HSI indicating to MFW to stop
running queries which might trigger this failure.

Signed-off-by: default avatarBarak Witkowsky <barak@broadcom.com>
Signed-off-by: default avatarDmitry Kravkov <dmitry@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 8ece5165

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

+1 −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)

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

+9 −0
Original line number Diff line number Diff line
@@ -10368,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;
@@ -12824,6 +12828,11 @@ 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);