diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/tg3.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 0b5b8e7f55ac..2df343f48207 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -11314,6 +11314,7 @@ static int __devinit tg3_test_dma(struct tg3 *tp) | |||
11314 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 || | 11314 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 || |
11315 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) { | 11315 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) { |
11316 | u32 ccval = (tr32(TG3PCI_CLOCK_CTRL) & 0x1f); | 11316 | u32 ccval = (tr32(TG3PCI_CLOCK_CTRL) & 0x1f); |
11317 | u32 read_water = 0x7; | ||
11317 | 11318 | ||
11318 | /* If the 5704 is behind the EPB bridge, we can | 11319 | /* If the 5704 is behind the EPB bridge, we can |
11319 | * do the less restrictive ONE_DMA workaround for | 11320 | * do the less restrictive ONE_DMA workaround for |
@@ -11325,8 +11326,13 @@ static int __devinit tg3_test_dma(struct tg3 *tp) | |||
11325 | else if (ccval == 0x6 || ccval == 0x7) | 11326 | else if (ccval == 0x6 || ccval == 0x7) |
11326 | tp->dma_rwctrl |= DMA_RWCTRL_ONE_DMA; | 11327 | tp->dma_rwctrl |= DMA_RWCTRL_ONE_DMA; |
11327 | 11328 | ||
11329 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) | ||
11330 | read_water = 4; | ||
11328 | /* Set bit 23 to enable PCIX hw bug fix */ | 11331 | /* Set bit 23 to enable PCIX hw bug fix */ |
11329 | tp->dma_rwctrl |= 0x009f0000; | 11332 | tp->dma_rwctrl |= |
11333 | (read_water << DMA_RWCTRL_READ_WATER_SHIFT) | | ||
11334 | (0x3 << DMA_RWCTRL_WRITE_WATER_SHIFT) | | ||
11335 | (1 << 23); | ||
11330 | } else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5780) { | 11336 | } else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5780) { |
11331 | /* 5780 always in PCIX mode */ | 11337 | /* 5780 always in PCIX mode */ |
11332 | tp->dma_rwctrl |= 0x00144000; | 11338 | tp->dma_rwctrl |= 0x00144000; |