]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
tg3: Fix Read DMA workaround for 5719 A0.
authorMichael Chan <mchan@broadcom.com>
Sun, 29 Jul 2012 19:15:42 +0000 (19:15 +0000)
committerJoe Jin <joe.jin@oracle.com>
Tue, 28 Aug 2012 07:23:09 +0000 (15:23 +0800)
The workaround was mis-applied to all 5719 and 5720 chips.

(cherry picked from commit 10ce95d6ef36c65df7dcd3b8fcf86913f8b298bd)
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/tg3.c

index b0d3c73811730775f0509e11b390e4ef56bc8170..742e4fa88ea91692aee37bd23631cf6c4ec28fa7 100644 (file)
@@ -9053,8 +9053,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);