From d5ff13087a2e1401ab1096c5b36fd4cab33dfd0d Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Mon, 2 Nov 2009 14:26:03 +0000 Subject: [PATCH] --- yaml --- r: 171124 b: refs/heads/master c: 788a035e6061a66c6c77059c417fdc6234e140ff h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 3 +++ trunk/drivers/net/tg3.h | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 66737c726723..470e033608f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a21771dd189b340328c573da9e005068e8a74c53 +refs/heads/master: 788a035e6061a66c6c77059c417fdc6234e140ff diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 54dbe988f5f1..a43ef2b3a530 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -7633,6 +7633,9 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) if (tp->tg3_flags3 & TG3_FLG3_5755_PLUS) val |= WDMAC_MODE_STATUS_TAG_FIX; + if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5785) + val |= WDMAC_MODE_BURST_ALL_DATA; + tw32_f(WDMAC_MODE, val); udelay(40); diff --git a/trunk/drivers/net/tg3.h b/trunk/drivers/net/tg3.h index 530c36b23e80..68431da5aad3 100644 --- a/trunk/drivers/net/tg3.h +++ b/trunk/drivers/net/tg3.h @@ -1264,8 +1264,9 @@ #define WDMAC_MODE_FIFOURUN_ENAB 0x00000080 #define WDMAC_MODE_FIFOOREAD_ENAB 0x00000100 #define WDMAC_MODE_LNGREAD_ENAB 0x00000200 -#define WDMAC_MODE_RX_ACCEL 0x00000400 +#define WDMAC_MODE_RX_ACCEL 0x00000400 #define WDMAC_MODE_STATUS_TAG_FIX 0x20000000 +#define WDMAC_MODE_BURST_ALL_DATA 0xc0000000 #define WDMAC_STATUS 0x00004c04 #define WDMAC_STATUS_TGTABORT 0x00000004 #define WDMAC_STATUS_MSTABORT 0x00000008