mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-22 23:52:03 +00:00
Wait for the link to come up on kirkwood network init
This patch makes the device wait for up to 5 seconds for the link to come up, similar to what many of the other network drivers do. This avoids confusing situations where, e.g., a tftp fails when initiated early after U-boot has started (before the link has come up). Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
parent
bb1ca3b27f
commit
cad713bf75
1 changed files with 14 additions and 6 deletions
|
@ -400,6 +400,7 @@ static int kwgbe_init(struct eth_device *dev)
|
||||||
{
|
{
|
||||||
struct kwgbe_device *dkwgbe = to_dkwgbe(dev);
|
struct kwgbe_device *dkwgbe = to_dkwgbe(dev);
|
||||||
struct kwgbe_registers *regs = dkwgbe->regs;
|
struct kwgbe_registers *regs = dkwgbe->regs;
|
||||||
|
int i;
|
||||||
|
|
||||||
/* setup RX rings */
|
/* setup RX rings */
|
||||||
kwgbe_init_rx_desc_ring(dkwgbe);
|
kwgbe_init_rx_desc_ring(dkwgbe);
|
||||||
|
@ -447,13 +448,20 @@ static int kwgbe_init(struct eth_device *dev)
|
||||||
|
|
||||||
#if (defined (CONFIG_MII) || defined (CONFIG_CMD_MII)) \
|
#if (defined (CONFIG_MII) || defined (CONFIG_CMD_MII)) \
|
||||||
&& defined (CONFIG_SYS_FAULT_ECHO_LINK_DOWN)
|
&& defined (CONFIG_SYS_FAULT_ECHO_LINK_DOWN)
|
||||||
u16 phyadr;
|
/* Wait up to 5s for the link status */
|
||||||
miiphy_read(dev->name, KIRKWOOD_PHY_ADR_REQUEST,
|
for (i = 0; i < 5; i++) {
|
||||||
KIRKWOOD_PHY_ADR_REQUEST, &phyadr);
|
u16 phyadr;
|
||||||
if (!miiphy_link(dev->name, phyadr)) {
|
|
||||||
printf("%s: No link on %s\n", __FUNCTION__, dev->name);
|
miiphy_read(dev->name, KIRKWOOD_PHY_ADR_REQUEST,
|
||||||
return -1;
|
KIRKWOOD_PHY_ADR_REQUEST, &phyadr);
|
||||||
|
/* Return if we get link up */
|
||||||
|
if (miiphy_link(dev->name, phyadr))
|
||||||
|
return 0;
|
||||||
|
udelay(1000000);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
printf("No link on %s\n", dev->name);
|
||||||
|
return -1;
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue