diff options
| author | Michael Chan <mchan@broadcom.com> | 2012-07-29 19:15:42 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-09 08:31:38 -0700 |
| commit | 4593e510277fec9fbe8708b1276301ead59470f0 (patch) | |
| tree | 3eea1d4ba7d5f4c75d5daf4020ab4a3ad4ffbec7 | |
| parent | e49e6d039117405be1c4de6ac9cce196f9aea22e (diff) | |
| download | linux-3.10-4593e510277fec9fbe8708b1276301ead59470f0.tar.gz linux-3.10-4593e510277fec9fbe8708b1276301ead59470f0.tar.bz2 linux-3.10-4593e510277fec9fbe8708b1276301ead59470f0.zip | |
tg3: Fix Read DMA workaround for 5719 A0.
commit 10ce95d6ef36c65df7dcd3b8fcf86913f8b298bd upstream.
The workaround was mis-applied to all 5719 and 5720 chips.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 00d52acb73e..8506c54ee16 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -8949,8 +8949,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780 || tg3_flag(tp, 57765_PLUS)) { val = tr32(TG3_RDMA_RSRVCTRL_REG); - if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 || - GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5720) { + if (tp->pci_chip_rev_id == CHIPREV_ID_5719_A0) { val &= ~(TG3_RDMA_RSRVCTRL_TXMRGN_MASK | TG3_RDMA_RSRVCTRL_FIFO_LWM_MASK | TG3_RDMA_RSRVCTRL_FIFO_HWM_MASK); |