diff options
| author | Dmitry Kravkov <dmitry@broadcom.com> | 2011-02-28 03:37:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-28 13:14:46 -0800 |
| commit | faa6fcbbba110c7c4bc299bc90f59d9f7b51ac6e (patch) | |
| tree | 7e4b38510a18b12df71e9b35269f4cfc4e7a94bf /drivers/net/bnx2x/bnx2x_ethtool.c | |
| parent | e3fa3aff0cb198e7c53d894f52146121d9592872 (diff) | |
| download | linux-faa6fcbbba110c7c4bc299bc90f59d9f7b51ac6e.tar.gz linux-faa6fcbbba110c7c4bc299bc90f59d9f7b51ac6e.tar.bz2 linux-faa6fcbbba110c7c4bc299bc90f59d9f7b51ac6e.zip | |
bnx2x: (NPAR mode) Fix FW initialization
Fix FW initialization according to max BW stored in percents
for NPAR mode. Protect HW from being configured to speed 0.
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x/bnx2x_ethtool.c')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_ethtool.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/bnx2x/bnx2x_ethtool.c index 5b44a8b48509..b3da295c453c 100644 --- a/drivers/net/bnx2x/bnx2x_ethtool.c +++ b/drivers/net/bnx2x/bnx2x_ethtool.c @@ -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; + u32 param = 0, part; u32 line_speed = bp->link_vars.line_speed; /* use 10G if no link detected */ @@ -251,9 +251,11 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) REQ_BC_VER_4_SET_MF_BW); return -EINVAL; } - if (line_speed < speed) { - BNX2X_DEV_INFO("New speed should be less or equal " - "to actual line speed\n"); + 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 */ @@ -263,8 +265,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) param &= FUNC_MF_CFG_MIN_BW_MASK; /* set new MAX value */ - param |= (((speed * 100) / line_speed) - << FUNC_MF_CFG_MAX_BW_SHIFT) + param |= (part << FUNC_MF_CFG_MAX_BW_SHIFT) & FUNC_MF_CFG_MAX_BW_MASK; bnx2x_fw_command(bp, DRV_MSG_CODE_SET_MF_BW, param); |