[U-Boot-Users] [PATCH] Fix crash scenario when TSEC has no PHY
Ben Warren
bwarren at qstreams.com
Thu Oct 26 20:38:25 CEST 2006
This fixes the case where either no PHY is attached to a TSEC (e.g. a
switch is connected via RMII) or if the PHY is defective/incorrectly
configured. Previous behavior was crash.
Signed-off-by: Ben Warren <bwarren at qstreams.com>
---
drivers/tsec.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/tsec.c b/drivers/tsec.c
index 770517b..400e593 100644
--- a/drivers/tsec.c
+++ b/drivers/tsec.c
@@ -313,7 +313,8 @@ static int init_phy(struct eth_device *d
* PHY */
curphy = get_phy_info(dev);
- if (NULL == curphy) {
+ if (curphy == NULL) {
+ priv->phyinfo = NULL;
printf("%s: No PHY found\n", dev->name);
return 0;
@@ -661,7 +662,8 @@ static void startup_tsec(struct eth_devi
rtx.txbd[TX_BUF_CNT - 1].status |= TXBD_WRAP;
/* Start up the PHY */
- phy_run_commands(priv, priv->phyinfo->startup);
+ if(priv->phyinfo)
+ phy_run_commands(priv, priv->phyinfo->startup);
adjust_link(dev);
/* Enable Transmit and Receive */
@@ -765,7 +767,8 @@ static void tsec_halt(struct eth_device
regs->maccfg1 &= ~(MACCFG1_TX_EN | MACCFG1_RX_EN);
/* Shut down the PHY, as needed */
- phy_run_commands(priv, priv->phyinfo->shutdown);
+ if(priv->phyinfo)
+ phy_run_commands(priv, priv->phyinfo->shutdown);
}
struct phy_info phy_info_M88E1011S = {
--
1.4.1
More information about the U-Boot
mailing list