diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2012-02-13 15:20:10 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-13 20:45:05 -0500 |
| commit | 3198e07fd64aa8c3a38dda33bcc0f44265eb581e (patch) | |
| tree | 48a3748c8493639407b93f2ec2601184b48c036a | |
| parent | b546e46f5c9f19a921d6f62db80f2e9371bc0558 (diff) | |
| download | blackbird-op-linux-3198e07fd64aa8c3a38dda33bcc0f44265eb581e.tar.gz blackbird-op-linux-3198e07fd64aa8c3a38dda33bcc0f44265eb581e.zip | |
tg3: Fix copper autoneg adv checks
When checking the autoneg advertisements, the driver failed to include
the master and master enable bits for the bcm5701. This patch fixes the
problem.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 4a0b9af71238..cb17885cad47 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -4027,7 +4027,16 @@ static bool tg3_phy_copper_an_config_ok(struct tg3 *tp, u32 *lcladv) if (tg3_readphy(tp, MII_CTRL1000, &tg3_ctrl)) return false; - tg3_ctrl &= (ADVERTISE_1000HALF | ADVERTISE_1000FULL); + if (tgtadv && + (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0 || + tp->pci_chip_rev_id == CHIPREV_ID_5701_B0)) { + tgtadv |= CTL1000_AS_MASTER | CTL1000_ENABLE_MASTER; + tg3_ctrl &= (ADVERTISE_1000HALF | ADVERTISE_1000FULL | + CTL1000_AS_MASTER | CTL1000_ENABLE_MASTER); + } else { + tg3_ctrl &= (ADVERTISE_1000HALF | ADVERTISE_1000FULL); + } + if (tg3_ctrl != tgtadv) return false; } |
