From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 4 May 2009 20:30:01 +0000 (+0000)
Subject: r6040: check for absent PHY
X-Git-Tag: v2.6.31-rc1~330^2~480
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c8014fe1d4548da8b9ea54730852c48a7117b03f;p=~shefty%2Frdma-dev.git

r6040: check for absent PHY

Some devices have two R6040 MACs but the second one
is not wired to any PHY, therefore the interface is
just unusable. Warn the user about that and prevent
device from registering.

Tested-by: bifferos <bifferos@yahoo.co.uk>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 6f97b47d74a..65627253c98 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -742,6 +742,14 @@ static int r6040_up(struct net_device *dev)
 	struct r6040_private *lp = netdev_priv(dev);
 	void __iomem *ioaddr = lp->base;
 	int ret;
+	u16 val;
+
+	/* Check presence of a second PHY */
+	val = r6040_phy_read(ioaddr, lp->phy_addr, 2);
+	if (val == 0xFFFF) {
+		printk(KERN_ERR DRV_NAME " no second PHY attached\n");
+		return -EIO;
+	}
 
 	/* Initialise and alloc RX/TX buffers */
 	r6040_init_txbufs(dev);