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

Commit e3835b99 authored by Dmitry Kravkov's avatar Dmitry Kravkov Committed by David S. Miller
Browse files

bnx2x: (NPAR) prevent HW access in D3 state 



Changing speed setting in NPAR requires HW access, this patch
delays the access to D0 state when performed in D3.

Signed-off-by: default avatarDmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9fdc3e95

drivers/net/bnx2x/bnx2x.h

+1 −0
Original line number Diff line number Diff line
@@ -1211,6 +1211,7 @@ struct bnx2x { 
	/* DCBX Negotation results */

	struct dcbx_features			dcbx_local_feat;

	u32					dcbx_error;

	u32					pending_max;

};



/**

drivers/net/bnx2x/bnx2x_cmn.c

+22 −0
Original line number Diff line number Diff line
@@ -996,6 +996,23 @@ void bnx2x_free_skbs(struct bnx2x *bp) 
	bnx2x_free_rx_skbs(bp);

}



void bnx2x_update_max_mf_config(struct bnx2x *bp, u32 value)

{

	/* load old values */

	u32 mf_cfg = bp->mf_config[BP_VN(bp)];



	if (value != bnx2x_extract_max_cfg(bp, mf_cfg)) {

		/* leave all but MAX value */

		mf_cfg &= ~FUNC_MF_CFG_MAX_BW_MASK;



		/* set new MAX value */

		mf_cfg |= (value << FUNC_MF_CFG_MAX_BW_SHIFT)

				& FUNC_MF_CFG_MAX_BW_MASK;



		bnx2x_fw_command(bp, DRV_MSG_CODE_SET_MF_BW, mf_cfg);

	}

}



static void bnx2x_free_msix_irqs(struct bnx2x *bp)

{

	int i, offset = 1;
@@ -1464,6 +1481,11 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode) 


	bnx2x_set_eth_mac(bp, 1);



	if (bp->pending_max) {

		bnx2x_update_max_mf_config(bp, bp->pending_max);

		bp->pending_max = 0;

	}



	if (bp->port.pmf)

		bnx2x_initial_phy_init(bp, load_mode);

drivers/net/bnx2x/bnx2x_cmn.h

+9 −0
Original line number Diff line number Diff line
@@ -341,6 +341,15 @@ void bnx2x_dcbx_init(struct bnx2x *bp); 
 */

int bnx2x_set_power_state(struct bnx2x *bp, pci_power_t state);



/**

 * Updates MAX part of MF configuration in HW

 * (if required)

 *

 * @param bp

 * @param value

 */

void bnx2x_update_max_mf_config(struct bnx2x *bp, u32 value);



/* dev_close main block */

int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode);

drivers/net/bnx2x/bnx2x_ethtool.c

+8 −10
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
	speed |= (cmd->speed_hi << 16);



	if (IS_MF_SI(bp)) {

		u32 param = 0, part;

		u32 part;

		u32 line_speed = bp->link_vars.line_speed;



		/* use 10G if no link detected */
@@ -251,24 +251,22 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
				       REQ_BC_VER_4_SET_MF_BW);

			return -EINVAL;

		}



		part = (speed * 100) / line_speed;



		if (line_speed < speed || !part) {

			BNX2X_DEV_INFO("Speed setting should be in a range "

				       "from 1%% to 100%% "

				       "of actual line speed\n");

			return -EINVAL;

		}

		/* load old values */

		param = bp->mf_config[BP_VN(bp)];



		/* leave only MIN value */

		param &= FUNC_MF_CFG_MIN_BW_MASK;



		/* set new MAX value */

		param |= (part << FUNC_MF_CFG_MAX_BW_SHIFT)

				  & FUNC_MF_CFG_MAX_BW_MASK;

		if (bp->state != BNX2X_STATE_OPEN)

			/* store value for following "load" */

			bp->pending_max = part;

		else

			bnx2x_update_max_mf_config(bp, part);



		bnx2x_fw_command(bp, DRV_MSG_CODE_SET_MF_BW, param);

		return 0;

	}