Skip to contentSkip to conversation

net: phy: continue searching for C45 MMDs even if first returned ffff:ffff

PATCH Applied Vladimir Oltean 4 participants 7 messages Jul 12, 2020 – Jul 17, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: phy: continue searching for C45 MMDs even if first returned ffff:ffff

From: Vladimir Oltean <[email protected]>

At the time of introduction, in commit bdeced75b13f ("net: dsa: felix:
Add PCS operations for PHYLINK"), support for the Lynx PCS inside Felix was relying, for USXGMII support, on the fact that get_phy_device() is able to parse the Lynx PCS "device-in-package" registers for this C45 MDIO device and identify it correctly.

However, this was actually working somewhat by mistake (in the sense that, even though it was detected, it was detected for the wrong reasons).

The get_phy_c45_ids() function works by iterating through all MMDs starting from 1 (MDIO_MMD_PMAPMD) and stops at the first one which returns a non-zero value in the "device-in-package" register pair, proceeding to see what that non-zero value is.

For the Felix PCS, the first MMD (1, for the PMA/PMD) returns a non-zero value of 0xffffffff in the "device-in-package" registers. There is a code branch which is supposed to treat this case and flag it as wrong, and normally, this would have caught my attention when adding initial support for this PCS:

	if ((devs_in_pkg & 0x1fffffff) == 0x1fffffff) {
		/* If mostly Fs, there is no device there, then let's probe
		 * MMD 0, as some 10G PHYs have zero Devices In package,
		 * e.g. Cortina CS4315/CS4340 PHY.
		 */

However, this code never actually kicked in, it seems, because this snippet from get_phy_c45_devs_in_pkg() was basically sabotaging itself, by returning 0xfffffffe instead of 0xffffffff:

	/* Bit 0 doesn't represent a device, it indicates c22 regs presence */
	*devices_in_package &= ~BIT(0);

Then the rest of the code just carried on thinking "ok, MMD 1 (PMA/PMD) says that there are 31 devices in that package, each having a device id of ffff:ffff, that's perfectly fine, let's go ahead and probe this PHY device".

But after cleanup commit 320ed3bf9000 ("net: phy: split devices_in_package"), this got "fixed", and now devs_in_pkg is no longer 0xfffffffe, but 0xffffffff. So now, get_phy_device is returning -ENODEV for the Lynx PCS, because the semantics have remained mostly unchanged:
the loop stops at the first MMD that returns a non-zero value, and that is MMD 1.

But the Lynx PCS is simply a clause 37 PCS which implements the required MAC-side functionality for USXGMII (when operated in C45 mode, which is where C45 devices-in-package detection is relevant to). Of course it will fail the PMD/PMA test (MMD 1), since it is not a PHY. But it does implement detection for MDIO_MMD_PCS (3):

- MDIO_DEVS1=0x008a, MDIO_DEVS2=0x0000,
- MDIO_DEVID1=0x0083, MDIO_DEVID2=0xe400

Let get_phy_c45_ids() continue searching for valid MMDs, and don't assume that every phy_device has a PMA/PMD MMD implemented.

---
 drivers/net/phy/phy_device.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/phy/phy_device.c +2 -1
index cf3505e2f587..15e5bb25103f 100644
@@ -734,7 +734,8 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr,
 	/* Find first non-zero Devices In package. Device zero is reserved
 	 * for 802.3 c45 complied PHYs, so don't probe it at first.
 	 */
-	for (i = 1; i < MDIO_MMD_NUM && devs_in_pkg == 0; i++) {
+	for (i = 1; i < MDIO_MMD_NUM && devs_in_pkg == 0 &&
+	     (devs_in_pkg & 0x1fffffff) == 0x1fffffff; i++) {
 		if (i == MDIO_MMD_VEND1 || i == MDIO_MMD_VEND2) {
 			/* Check that there is a device present at this
 			 * address before reading the devices-in-package
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 8 lines · On Sun, 12 Jul 2020 19:48:15 +0300 Vladimir Oltean wrote:

From: Vladimir Oltean <[email protected]>

At the time of introduction, in commit bdeced75b13f ("net: dsa: felix:
Add PCS operations for PHYLINK"), support for the Lynx PCS inside Felix was relying, for USXGMII support, on the fact that get_phy_device() is able to parse the Lynx PCS "device-in-package" registers for this C45 MDIO device and identify it correctly.
[...]

PHY folks, is this part of the larger PCS discussion or something you're happy to have applied in the current form?

maintainer
#2 lore raw
Quoted 10 lines · Jakub Kicinski
Quoted 8 lines · On Sun, 12 Jul 2020 19:48:15 +0300 Vladimir Oltean wrote:

From: Vladimir Oltean <[email protected]>

At the time of introduction, in commit bdeced75b13f ("net: dsa: felix:
Add PCS operations for PHYLINK"), support for the Lynx PCS inside Felix was relying, for USXGMII support, on the fact that get_phy_device() is able to parse the Lynx PCS "device-in-package" registers for this C45 MDIO device and identify it correctly.
[...]

Quoted 2 lines

PHY folks, is this part of the larger PCS discussion or something you're happy to have applied in the current form?

Hi Jakub

This seems fine, independent of the PCS discussions.

Andrew

maintainer Reviewed-by on v1 1/1
#3 lore raw
In reply to Vladimir Oltean
Quoted 4 lines

Then the rest of the code just carried on thinking "ok, MMD 1 (PMA/PMD) says that there are 31 devices in that package, each having a device id of ffff:ffff, that's perfectly fine, let's go ahead and probe this PHY device".

With a device ID of ffff:ffff, what PHY driver was getting loaded?

Quoted 2 lines

- MDIO_DEVS1=0x008a, MDIO_DEVS2=0x0000,
- MDIO_DEVID1=0x0083, MDIO_DEVID2=0xe400

Now that we have valid IDs, is the same driver getting loaded? Do this ID adding somewhere?

Quoted 1 line

Andrew

#4 lore raw
Quoted 7 lines · Andrew Lunn
Quoted 4 lines

Then the rest of the code just carried on thinking "ok, MMD 1 (PMA/PMD) says that there are 31 devices in that package, each having a device id of ffff:ffff, that's perfectly fine, let's go ahead and probe this PHY device".

With a device ID of ffff:ffff, what PHY driver was getting loaded?

You mean ffff:fffe.
No PHY driver. I am driving this PCS locally from within drivers/net/dsa/ocelot/felix_vsc9959.c. I call get_phy_device at the address where I know a PCS is present, for the simple reason that I like an extra validation that my internal MDIO reads/writes are going somewhere. I've had situations in the past where the PCS was working because the bootloader had initialized it, however the internal MDIO reads/writes from Linux were broken. So, the fact that get_phy_device can read the PHY ID correctly is giving me some assurance.

Quoted 6 lines
Quoted 2 lines

- MDIO_DEVS1=0x008a, MDIO_DEVS2=0x0000,
- MDIO_DEVID1=0x0083, MDIO_DEVID2=0xe400

Now that we have valid IDs, is the same driver getting loaded? Do this ID adding somewhere?

Not applicable, see above.

Quoted 5 lines
Quoted 1 line

Andrew

Thanks,
-Vladimir

#5 lore raw
Quoted 10 lines · Vladimir Oltean
Quoted 7 lines · Andrew Lunn
Quoted 4 lines

Then the rest of the code just carried on thinking "ok, MMD 1 (PMA/PMD) says that there are 31 devices in that package, each having a device id of ffff:ffff, that's perfectly fine, let's go ahead and probe this PHY device".

With a device ID of ffff:ffff, what PHY driver was getting loaded?

You mean ffff:fffe.

Sorry, I was wrong to correct you here. ffff:fffe was the devices-in-package register, the phy id was ffff:ffff. Doesn't change the rest of the answer though.

Quoted 26 lines

No PHY driver. I am driving this PCS locally from within drivers/net/dsa/ocelot/felix_vsc9959.c. I call get_phy_device at the address where I know a PCS is present, for the simple reason that I like an extra validation that my internal MDIO reads/writes are going somewhere. I've had situations in the past where the PCS was working because the bootloader had initialized it, however the internal MDIO reads/writes from Linux were broken. So, the fact that get_phy_device can read the PHY ID correctly is giving me some assurance.

Quoted 6 lines
Quoted 2 lines

- MDIO_DEVS1=0x008a, MDIO_DEVS2=0x0000,
- MDIO_DEVID1=0x0083, MDIO_DEVID2=0xe400

Now that we have valid IDs, is the same driver getting loaded? Do this ID adding somewhere?

Not applicable, see above.

Quoted 5 lines
Quoted 1 line

Andrew

Thanks,
-Vladimir

maintainer Applied
#6 lore raw
In reply to Vladimir Oltean

From: Vladimir Oltean <[email protected]>
Date: Sun, 12 Jul 2020 19:48:15 +0300

Quoted 7 lines

From: Vladimir Oltean <[email protected]>

At the time of introduction, in commit bdeced75b13f ("net: dsa: felix:
Add PCS operations for PHYLINK"), support for the Lynx PCS inside Felix was relying, for USXGMII support, on the fact that get_phy_device() is able to parse the Lynx PCS "device-in-package" registers for this C45 MDIO device and identify it correctly.

...

Quoted 1 line

Applied to net-next, thanks.