openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: phy: Allow mdio buses to auto-probe c45 devices 

The mdiobus_scan logic is currently hardcoded to only
work with c22 devices. This works fairly well in most
cases, but its possible that a c45 device doesn't respond
despite being a standard phy. If the parent hardware
is capable, it makes sense to scan for c22 devices before
falling back to c45.

As we want this to reflect the capabilities of the STA,
lets add a field to the mii_bus structure to represent
the capability. That way devices can opt into the extended
scanning. Existing users should continue to default to c22
only scanning as long as they are zero'ing the structure
before use.

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jeremy Linton 2020-06-22 20:35:32 +05:30 committed by David S. Miller
parent 1c59bb6bcb
commit 0cc8fecf04
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/phy/mdio_bus.c
View File

@ -739,10 +739,24 @@ EXPORT_SYMBOL(mdiobus_free);
*/ */
struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr) struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
{ {
struct phy_device *phydev; struct phy_device *phydev = ERR_PTR(-ENODEV);
int err; int err;
phydev = get_phy_device(bus, addr, false); switch (bus->probe_capabilities) {
case MDIOBUS_NO_CAP:
case MDIOBUS_C22:
phydev = get_phy_device(bus, addr, false);
break;
case MDIOBUS_C45:
phydev = get_phy_device(bus, addr, true);
break;
case MDIOBUS_C22_C45:
phydev = get_phy_device(bus, addr, false);
if (IS_ERR(phydev))
phydev = get_phy_device(bus, addr, true);
break;
}
if (IS_ERR(phydev)) if (IS_ERR(phydev))
return phydev; return phydev;

8
include/linux/phy.h
View File

@ -298,6 +298,14 @@ struct mii_bus {
/* RESET GPIO descriptor pointer */ /* RESET GPIO descriptor pointer */
struct gpio_desc *reset_gpiod; struct gpio_desc *reset_gpiod;
/* bus capabilities, used for probing */
enum {
MDIOBUS_NO_CAP = 0,
MDIOBUS_C22,
MDIOBUS_C45,
MDIOBUS_C22_C45,
} probe_capabilities;
/* protect access to the shared element */ /* protect access to the shared element */
struct mutex shared_lock; struct mutex shared_lock;