diff options
author | Yuval Mintz <yuvalmin@broadcom.com> | 2012-09-10 01:51:05 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-10 16:40:29 -0400 |
commit | 34dab172f08e0456f3f8a8f6497567cf6744535e (patch) | |
tree | 3e6535800ba9161c2695c56394b3705a831b9154 /drivers/net/ethernet/broadcom | |
parent | 08e9acc25a60e845101840ce6db368dc6d77c3c1 (diff) |
bnx2x: add EEE support for 4-port devices
Prevent functions from disabling EEE to other functions using other ports.
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c index 14afa1759378..bf60c07b1ccd 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | |||
@@ -6540,7 +6540,6 @@ static int bnx2x_update_link_down(struct link_params *params, | |||
6540 | /* Prevent LPI Generation by chip */ | 6540 | /* Prevent LPI Generation by chip */ |
6541 | REG_WR(bp, MISC_REG_CPMU_LP_FW_ENABLE_P0 + (params->port << 2), | 6541 | REG_WR(bp, MISC_REG_CPMU_LP_FW_ENABLE_P0 + (params->port << 2), |
6542 | 0); | 6542 | 0); |
6543 | REG_WR(bp, MISC_REG_CPMU_LP_DR_ENABLE, 0); | ||
6544 | REG_WR(bp, MISC_REG_CPMU_LP_MASK_ENT_P0 + (params->port << 2), | 6543 | REG_WR(bp, MISC_REG_CPMU_LP_MASK_ENT_P0 + (params->port << 2), |
6545 | 0); | 6544 | 0); |
6546 | vars->eee_status &= ~(SHMEM_EEE_LP_ADV_STATUS_MASK | | 6545 | vars->eee_status &= ~(SHMEM_EEE_LP_ADV_STATUS_MASK | |
@@ -9932,7 +9931,6 @@ static int bnx2x_8483x_disable_eee(struct bnx2x_phy *phy, | |||
9932 | 9931 | ||
9933 | /* Make Certain LPI is disabled */ | 9932 | /* Make Certain LPI is disabled */ |
9934 | REG_WR(bp, MISC_REG_CPMU_LP_FW_ENABLE_P0 + (params->port << 2), 0); | 9933 | REG_WR(bp, MISC_REG_CPMU_LP_FW_ENABLE_P0 + (params->port << 2), 0); |
9935 | REG_WR(bp, MISC_REG_CPMU_LP_DR_ENABLE, 0); | ||
9936 | 9934 | ||
9937 | /* Prevent Phy from working in EEE and advertising it */ | 9935 | /* Prevent Phy from working in EEE and advertising it */ |
9938 | rc = bnx2x_84833_cmd_hdlr(phy, params, | 9936 | rc = bnx2x_84833_cmd_hdlr(phy, params, |