Commit 2138c002 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller

tg3: Relax 5717 serdes restriction

tg3 is coded to refuse to attach to 5717 serdes devices.  Now that the
hardware is better supported, we can relax this restriction.  This patch
also fixes a recently introduced bug which will cause serdes parallel
detection not to work with 5780 class devices.
Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 34195c3d
...@@ -8551,7 +8551,7 @@ static void tg3_timer(unsigned long __opaque) ...@@ -8551,7 +8551,7 @@ static void tg3_timer(unsigned long __opaque)
tg3_setup_phy(tp, 0); tg3_setup_phy(tp, 0);
} }
} else if ((tp->tg3_flags2 & TG3_FLG2_MII_SERDES) && } else if ((tp->tg3_flags2 & TG3_FLG2_MII_SERDES) &&
!(tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) { (tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) {
tg3_serdes_parallel_detect(tp); tg3_serdes_parallel_detect(tp);
} }
...@@ -13427,8 +13427,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) ...@@ -13427,8 +13427,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
return err; return err;
if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 && if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 &&
(tp->pci_chip_rev_id != CHIPREV_ID_5717_A0 || tp->pci_chip_rev_id != CHIPREV_ID_5717_A0)
(tp->tg3_flags2 & TG3_FLG2_MII_SERDES)))
return -ENOTSUPP; return -ENOTSUPP;
/* Initialize data/descriptor byte/word swapping. */ /* Initialize data/descriptor byte/word swapping. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment