netdev - [PATCH v3] net/phy: tune get_phy_c45

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 28 May 2014 16:54:36 +0800
From:	Shengzhou Liu <Shengzhou.Liu@...escale.com>
To:	<netdev@...r.kernel.org>, <davem@...emloft.net>
CC:	Shengzhou Liu <Shengzhou.Liu@...escale.com>
Subject: [PATCH v3] net/phy: tune get_phy_c45_ids to support more c45 phy

Currently get_phy_c45_ids() driver assumes that device zero is reserved and
doesn't probe c45 device which has zero device address. The driver only
probes c45 phy with non-zero device address by code:
for(i = 1; i < num_ids && c45_ids->devices_in_package == 0; i++)

This patch updates the driver to support those c45 phy which has special zero
device address(e.g. the device address is zero on Cortina CS4315/CS4340 10G
PHY, 'i' must be zero to have it work).

We should first probe non-zero devices, if not found, then probe device zero.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@...escale.com>
---
v3: refined commit messages.
v2: refined to reuse code.

 drivers/net/phy/phy_device.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index cfb5110..88f1d38 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -226,13 +226,11 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
 	int i, reg_addr;
 	const int num_ids = ARRAY_SIZE(c45_ids->device_ids);
 
-	/* Find first non-zero Devices In package.  Device
-	 * zero is reserved, so don't probe it.
-	 */
+	/* Find first non-zero Devices In package */
 	for (i = 1;
 	     i < num_ids && c45_ids->devices_in_package == 0;
 	     i++) {
-		reg_addr = MII_ADDR_C45 | i << 16 | 6;
+retry:		reg_addr = MII_ADDR_C45 | i << 16 | 6;
 		phy_reg = mdiobus_read(bus, addr, reg_addr);
 		if (phy_reg < 0)
 			return -EIO;
@@ -244,12 +242,20 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
 			return -EIO;
 		c45_ids->devices_in_package |= (phy_reg & 0xffff);
 
-		/* If mostly Fs, there is no device there,
-		 * let's get out of here.
-		 */
 		if ((c45_ids->devices_in_package & 0x1fffffff) == 0x1fffffff) {
-			*phy_id = 0xffffffff;
-			return 0;
+			if (i) {
+				/*  If mostly Fs, there is no non-zero device
+				 *  found, then let's continue to probe more
+				 *  for special device which has zero device
+				 *  address, thus set i = 0 to try again.
+				 */
+				i = 0;
+				goto retry;
+			} else {
+				/* no device there, let's get out of here */
+				*phy_id = 0xffffffff;
+				return 0;
+			}
 		}
 	}
 
-- 
1.8.0

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html