aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2010-02-12 14:47:08 +0000
committerDavid S. Miller <davem@davemloft.net>2010-02-12 17:05:53 -0800
commit6b10c1653e425e30cff7f41d0e6f9743bfa9810f (patch)
tree62fb40716bf0c80a2d808e3eee43a98e4d769dd0
parentf89f38b8ec3171664314669a1396ab70b43e8961 (diff)
downloadkernel_samsung_smdk4412-6b10c1653e425e30cff7f41d0e6f9743bfa9810f.zip
kernel_samsung_smdk4412-6b10c1653e425e30cff7f41d0e6f9743bfa9810f.tar.gz
kernel_samsung_smdk4412-6b10c1653e425e30cff7f41d0e6f9743bfa9810f.tar.bz2
tg3: Fix 57765 A0 bootcode race condition
On A0 revision of 57765 asic rev devices, the bootcode will perform some hardware operations, after the magic signature is presented, that will collide with setup operations performed by the driver. The best way to avoid the contention is to have the driver delay an additional 10 milliseconds. B0 revisions of the chip will make this workaround unnecessary. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Signed-off-by: Benjamin Li <benli@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/tg3.c7
-rw-r--r--drivers/net/tg3.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index c140e1b..2c5e1b7 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -6721,6 +6721,13 @@ static int tg3_poll_fw(struct tg3 *tp)
tp->dev->name);
}
+ if (tp->pci_chip_rev_id == CHIPREV_ID_57765_A0) {
+ /* The 57765 A0 needs a little more
+ * time to do some important work.
+ */
+ mdelay(10);
+ }
+
return 0;
}
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index cc8bf7d..46db4ad 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -110,6 +110,7 @@
#define CHIPREV_ID_57780_A0 0x57780000
#define CHIPREV_ID_57780_A1 0x57780001
#define CHIPREV_ID_5717_A0 0x05717000
+#define CHIPREV_ID_57765_A0 0x57785000
#define GET_ASIC_REV(CHIP_REV_ID) ((CHIP_REV_ID) >> 12)
#define ASIC_REV_5700 0x07
#define ASIC_REV_5701 0x00