From: Gabor Juhos <juhosg@openwrt.org>
Date: Sun, 10 Feb 2013 13:05:14 +0000 (+0000)
Subject: generic: ar8216: add sanity check to ar8216_probe
X-Git-Tag: reboot~11316
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=774da6c7a40320a320b28d71291c0e61fcf7bc8a;p=openwrt%2Fstaging%2Fnoltari.git

generic: ar8216: add sanity check to ar8216_probe

Verify that the mdio bus has PHY devices with
a supported PHY ID at address 0-4.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 35537
---

diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c
index 45b2bd7a65..f356eafe5d 100644
--- a/target/linux/generic/files/drivers/net/phy/ar8216.c
+++ b/target/linux/generic/files/drivers/net/phy/ar8216.c
@@ -1956,6 +1956,44 @@ ar8216_config_aneg(struct phy_device *phydev)
 	return genphy_config_aneg(phydev);
 }
 
+static const u32 ar8xxx_phy_ids[] = {
+	0x004dd033,
+	0x004dd041,
+	0x004dd042,
+};
+
+static bool
+ar8xxx_phy_match(u32 phy_id)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(ar8xxx_phy_ids); i++)
+		if (phy_id == ar8xxx_phy_ids[i])
+			return true;
+
+	return false;
+}
+
+static bool
+ar8xxx_is_possible(struct mii_bus *bus)
+{
+	unsigned i;
+
+	for (i = 0; i < 4; i++) {
+		u32 phy_id;
+
+		phy_id = mdiobus_read(bus, i, MII_PHYSID1) << 16;
+		phy_id |= mdiobus_read(bus, i, MII_PHYSID2);
+		if (!ar8xxx_phy_match(phy_id)) {
+			pr_debug("ar8xxx: unknown PHY at %s:%02x id:%08x\n",
+				 dev_name(&bus->dev), i, phy_id);
+			return false;
+		}
+	}
+
+	return true;
+}
+
 static int
 ar8216_probe(struct phy_device *pdev)
 {
@@ -1966,6 +2004,9 @@ ar8216_probe(struct phy_device *pdev)
 	if (pdev->addr != 0 && pdev->addr != 4)
 		return -ENODEV;
 
+	if (!ar8xxx_is_possible(pdev->bus))
+		return -ENODEV;
+
 	priv = kzalloc(sizeof(struct ar8216_priv), GFP_KERNEL);
 	if (priv == NULL)
 		return -ENOMEM;