From: Matt Carlson Date: Mon, 13 Feb 2012 15:20:08 +0000 (+0000) Subject: tg3: Disable new DMA engine for 57766 X-Git-Tag: v2.6.39-400.9.0~338^2~173 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9ac4937c8ceb2122e26a3e6df132ed926c39a27d;p=users%2Fjedix%2Flinux-maple.git tg3: Disable new DMA engine for 57766 A bug was found in the new DMA engine for the 57766. This patch disables it, which causes the device to fallback to the old DMA engine. (cherry picked from commit 3906969189a409e590a51b18c86a92d0506c9372) Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller Signed-off-by: Joe Jin --- diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 18524f99a2fc..454b3c5aea0f 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -8902,9 +8902,6 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) if (tg3_flag(tp, PCI_EXPRESS)) rdmac_mode |= RDMAC_MODE_FIFO_LONG_BURST; - if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57766) - rdmac_mode |= RDMAC_MODE_JMB_2K_MMRR; - if (tg3_flag(tp, HW_TSO_1) || tg3_flag(tp, HW_TSO_2) || tg3_flag(tp, HW_TSO_3)) @@ -14195,8 +14192,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) tp->dma_limit = TG3_TX_BD_DMA_MAX_4K; - else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57766) - tp->dma_limit = TG3_TX_BD_DMA_MAX_2K; if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 || GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||