aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2010-01-12 10:11:39 +0000
committerDavid S. Miller <davem@davemloft.net>2010-01-13 17:18:54 -0800
commit55dffe79b34e2af98bd1315f1e00c2fc6a7a7078 (patch)
tree96ecbf679f582be592f8bd68d20b5bb99521f8df
parenttg3: Add reliable serdes detection for 5717 A0 (diff)
downloadlinux-dev-55dffe79b34e2af98bd1315f1e00c2fc6a7a7078.tar.xz
linux-dev-55dffe79b34e2af98bd1315f1e00c2fc6a7a7078.zip
tg3: Disable 5717 serdes and B0 support
The B0 revision of the 5717 will not get enough testing by the time 2.6.33 ships. Since the kernel is already at RC3, serdes support will require too many patches to fix. For these reasons, this patch disables 5717 serdes support and will refuse to attach to all 5717 devices that are later than an A0 revision. 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.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 0a632f96d16b..2d1a7404057b 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -13390,6 +13390,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
if (err)
return err;
+ if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 &&
+ (tp->pci_chip_rev_id != CHIPREV_ID_5717_A0 ||
+ (tp->tg3_flags2 & TG3_FLG2_MII_SERDES)))
+ return -ENOTSUPP;
+
/* Initialize data/descriptor byte/word swapping. */
val = tr32(GRC_MODE);
val &= GRC_MODE_HOST_STACKUP;