From: Ben Warren <bwarren@qstreams.com>
Date: Thu, 26 Oct 2006 18:38:25 +0000 (-0400)
Subject: Fix TSEC driver (now for real): avoid crashes if PHY is not attached
X-Git-Tag: U-Boot-1_1_6~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4653f91c13ed51c21cc4c3855745d69a3fb1817f;p=oweals%2Fu-boot.git

Fix TSEC driver (now for real): avoid crashes if PHY is not attached
to a TSEC (e.g. a switch is connected via RMII) or
if the PHY is defective/incorrectly configured.

Signed-off-by: Ben Warren <bwarren@qstreams.com>
---

diff --git a/drivers/tsec.c b/drivers/tsec.c
index 770517b87e..400e593adf 100644
--- a/drivers/tsec.c
+++ b/drivers/tsec.c
@@ -313,7 +313,8 @@ static int init_phy(struct eth_device *dev)
 	 * 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_device *dev)
 	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 *dev)
 	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 = {