Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57d8b880 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: 5717: Allow serdes link via parallel detect 



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: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2430b031

drivers/net/tg3.c

+5 −1
Original line number Diff line number Diff line
@@ -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;

	}