aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2011-05-19 08:12:46 -0400
committerDavid S. Miller <davem@davemloft.net>2011-05-19 18:00:00 -0400
commit1ff30a59f6d0c754e99442501a5145bdbbcfa6ea (patch)
tree28c1fb69dea98daba406fc07c6df0edd04cbbba5
parent432aa7ed75b3adaef6040d2cbe745fdd1c899415 (diff)
tg3: Fix 57765 B0 data corruption
The PCIe max FTS limit is too aggressive on these chips. This patch loosens the limit a little to eliminate data corruption issues. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/tg3.c16
-rw-r--r--drivers/net/tg3.h4
2 files changed, 20 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index b2b1ba168c88..09f2c11db247 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -7990,6 +7990,22 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
7990 tw32(GRC_MODE, grc_mode); 7990 tw32(GRC_MODE, grc_mode);
7991 } 7991 }
7992 7992
7993 if (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_57765_AX) {
7994 u32 grc_mode = tr32(GRC_MODE);
7995
7996 /* Access the lower 1K of DL PCIE block registers. */
7997 val = grc_mode & ~GRC_MODE_PCIE_PORT_MASK;
7998 tw32(GRC_MODE, val | GRC_MODE_PCIE_DL_SEL);
7999
8000 val = tr32(TG3_PCIE_TLDLPL_PORT +
8001 TG3_PCIE_DL_LO_FTSMAX);
8002 val &= ~TG3_PCIE_DL_LO_FTSMAX_MSK;
8003 tw32(TG3_PCIE_TLDLPL_PORT + TG3_PCIE_DL_LO_FTSMAX,
8004 val | TG3_PCIE_DL_LO_FTSMAX_VAL);
8005
8006 tw32(GRC_MODE, grc_mode);
8007 }
8008
7993 val = tr32(TG3_CPMU_LSPD_10MB_CLK); 8009 val = tr32(TG3_CPMU_LSPD_10MB_CLK);
7994 val &= ~CPMU_LSPD_10MB_MACCLK_MASK; 8010 val &= ~CPMU_LSPD_10MB_MACCLK_MASK;
7995 val |= CPMU_LSPD_10MB_MACCLK_6_25; 8011 val |= CPMU_LSPD_10MB_MACCLK_6_25;
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index ce010cd33895..330959b9cfbc 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -180,6 +180,7 @@
180#define CHIPREV_5750_BX 0x41 180#define CHIPREV_5750_BX 0x41
181#define CHIPREV_5784_AX 0x57840 181#define CHIPREV_5784_AX 0x57840
182#define CHIPREV_5761_AX 0x57610 182#define CHIPREV_5761_AX 0x57610
183#define CHIPREV_57765_AX 0x577650
183#define GET_METAL_REV(CHIP_REV_ID) ((CHIP_REV_ID) & 0xff) 184#define GET_METAL_REV(CHIP_REV_ID) ((CHIP_REV_ID) & 0xff)
184#define METAL_REV_A0 0x00 185#define METAL_REV_A0 0x00
185#define METAL_REV_A1 0x01 186#define METAL_REV_A1 0x01
@@ -1951,6 +1952,9 @@
1951 1952
1952/* Alternate PCIE definitions */ 1953/* Alternate PCIE definitions */
1953#define TG3_PCIE_TLDLPL_PORT 0x00007c00 1954#define TG3_PCIE_TLDLPL_PORT 0x00007c00
1955#define TG3_PCIE_DL_LO_FTSMAX 0x0000000c
1956#define TG3_PCIE_DL_LO_FTSMAX_MSK 0x000000ff
1957#define TG3_PCIE_DL_LO_FTSMAX_VAL 0x0000002c
1954#define TG3_PCIE_PL_LO_PHYCTL1 0x00000004 1958#define TG3_PCIE_PL_LO_PHYCTL1 0x00000004
1955#define TG3_PCIE_PL_LO_PHYCTL1_L1PLLPD_EN 0x00001000 1959#define TG3_PCIE_PL_LO_PHYCTL1_L1PLLPD_EN 0x00001000
1956#define TG3_PCIE_PL_LO_PHYCTL5 0x00000014 1960#define TG3_PCIE_PL_LO_PHYCTL5 0x00000014