From: Richard Retanubun <RichardRetanubun@RuggedCom.com>
Date: Thu, 2 Jul 2009 17:21:22 +0000 (-0400)
Subject: MIIPHYBB: Return 0xFFFF if the PHY is not asserting TA.
X-Git-Tag: v2009.08-rc1~32^2~7
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3f6b18ffd94621625de961bc566022b0266790f5;p=oweals%2Fu-boot.git

MIIPHYBB: Return 0xFFFF if the PHY is not asserting TA.

This patch sets the returned value to 0xFFFF if the PHY does not exist
and does not assert Transfer Acknowledge. A NULL check for the value
pointer is also added for buffer overflow protection.

Without this patch 'mii info' will  show 'phantom' devices because the
value will be not be initialized and return with some random value.

Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
---

diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c
index e3c163a349..b77c917462 100644
--- a/drivers/net/phy/miiphybb.c
+++ b/drivers/net/phy/miiphybb.c
@@ -127,6 +127,11 @@ int bb_miiphy_read (char *devname, unsigned char addr,
 	volatile ioport_t *iop = ioport_addr ((immap_t *) CONFIG_SYS_IMMR, MDIO_PORT);
 #endif
 
+	if (value == NULL) {
+		puts("NULL value pointer\n");
+		return (-1);
+	}
+
 	miiphy_pre (1, addr, reg);
 
 	/* tri-state our MDIO I/O pin so we can read */
@@ -145,6 +150,8 @@ int bb_miiphy_read (char *devname, unsigned char addr,
 			MDC (1);
 			MIIDELAY;
 		}
+		/* There is no PHY, set value to 0xFFFF and return */
+		*value = 0xFFFF;
 		return (-1);
 	}