dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

tg3: 5717: Allow serdes link via parallel detect

Browse source 
The 5717 serdes phy brings link up via parallel detection without any
additional help from the driver.  This patch changes the
tg3_setup_fiber_mii_phy() function to detect and allow the use of this
feature.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Matt Carlson 2010-06-05 17:24:35 +00:00 committed by David S. Miller
parent 2430b031be
commit 57d8b88030
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/tg3.c
View file

@ -4206,6 +4206,8 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, int force_reset)
current_duplex = DUPLEX_FULL;
else
current_duplex = DUPLEX_HALF;
} else if (!(tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) {
/* Link is up via parallel detect */
} else {
current_link_up = 0;
}
@ -8531,8 +8533,10 @@ static void tg3_timer(unsigned long __opaque)
}
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)) {
tg3_serdes_parallel_detect(tp);
}
tp->timer_counter = tp->timer_multiplier;
}