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

Commit 9ea4818d authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Discover phy address once 



The phy address will not change after it has been identified.  Move the
discovery code to a location that only gets executed once.

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 0d86df80

drivers/net/tg3.c

+11 −11
Original line number Diff line number Diff line
@@ -1035,6 +1035,17 @@ static void tg3_mdio_start(struct tg3 *tp) 
	tw32_f(MAC_MI_MODE, tp->mi_mode);

	udelay(80);



	if ((tp->tg3_flags3 & TG3_FLG3_MDIOBUS_INITED) &&

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5785)

		tg3_mdio_config_5785(tp);

}



static int tg3_mdio_init(struct tg3 *tp)

{

	int i;

	u32 reg;

	struct phy_device *phydev;



	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {

		u32 funcnum, is_serdes;
@@ -1054,17 +1065,6 @@ static void tg3_mdio_start(struct tg3 *tp) 
	} else

		tp->phy_addr = TG3_PHY_MII_ADDR;



	if ((tp->tg3_flags3 & TG3_FLG3_MDIOBUS_INITED) &&

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5785)

		tg3_mdio_config_5785(tp);

}



static int tg3_mdio_init(struct tg3 *tp)

{

	int i;

	u32 reg;

	struct phy_device *phydev;



	tg3_mdio_start(tp);



	if (!(tp->tg3_flags3 & TG3_FLG3_USE_PHYLIB) ||