@@ -281,11 +281,10 @@ static int gpy_probe(struct phy_device *phydev)
int fw_version;
int ret;
- if (!phy_has_c45_registers(phydev)) {
- ret = phy_get_c45_ids(phydev);
- if (ret < 0)
- return ret;
- }
+ /* This might have been probed as a C22 PHY, but this is a C45 PHY */
+ ret = phy_promote_to_c45(phydev);
+ if (ret)
+ return ret;
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
@@ -1057,18 +1057,42 @@ void phy_device_remove(struct phy_device *phydev)
EXPORT_SYMBOL(phy_device_remove);
/**
- * phy_get_c45_ids - Read 802.3-c45 IDs for phy device.
- * @phydev: phy_device structure to read 802.3-c45 IDs
+ * phy_promote_to_c45 - Promote to a C45 PHY
+ * @phydev: phy_device structure
+ *
+ * If a PHY supports both C22 and C45 register access and it isn't specifically
+ * asked to probe as a C45 PHY it might be probed as a C22 PHY. The driver can
+ * call this function to promote the PHY from C22 to C45.
+ *
+ * Can also be called if a PHY is already a C45 one. In that case it does
+ * nothing.
+ *
+ * If the bus isn't capable of doing C45 transfers, C45-over-C22 access will be
+ * used as a fallback.
*
* Returns zero on success, %-EIO on bus access error, or %-ENODEV if
* the "devices in package" is invalid.
*/
-int phy_get_c45_ids(struct phy_device *phydev)
+int phy_promote_to_c45(struct phy_device *phydev)
{
- return get_phy_c45_ids(phydev->mdio.bus, phydev->mdio.addr,
- PHY_ACCESS_C45, &phydev->c45_ids);
+ struct mii_bus *bus = phydev->mdio.bus;
+
+ if (phydev->access_mode != PHY_ACCESS_C22)
+ return 0;
+
+ if (dev_of_node(&phydev->mdio.dev))
+ phydev_info(phydev,
+ "Promoting PHY to a C45 one. Please consider using compatible=\"ethernet-phy-ieee802.3-c45\".");
+
+ if (mdiobus_supports_c45(bus))
+ phydev->access_mode = PHY_ACCESS_C45;
+ else
+ phydev->access_mode = PHY_ACCESS_C45_OVER_C22;
+
+ return get_phy_c45_ids(bus, phydev->mdio.addr, phydev->access_mode,
+ &phydev->c45_ids);
}
-EXPORT_SYMBOL(phy_get_c45_ids);
+EXPORT_SYMBOL(phy_promote_to_c45);
/**
* phy_find_first - finds the first PHY device on the bus
@@ -467,6 +467,11 @@ struct phy_device *mdiobus_scan_c22(struct mii_bus *bus, int addr);
void mdiobus_scan_for_broken_c45_access(struct mii_bus *bus);
+static inline bool mdiobus_supports_c45(struct mii_bus *bus)
+{
+ return bus->read_c45 && !bus->prevent_c45_access;
+}
+
#define PHY_INTERRUPT_DISABLED false
#define PHY_INTERRUPT_ENABLED true
@@ -1701,7 +1706,7 @@ static inline int phy_device_register(struct phy_device *phy)
static inline void phy_device_free(struct phy_device *phydev) { }
#endif /* CONFIG_PHYLIB */
void phy_device_remove(struct phy_device *phydev);
-int phy_get_c45_ids(struct phy_device *phydev);
+int phy_promote_to_c45(struct phy_device *phydev);
int phy_init_hw(struct phy_device *phydev);
int phy_suspend(struct phy_device *phydev);
int phy_resume(struct phy_device *phydev);
If not explitly asked to be probed as a C45 PHY, on a bus which is capable of doing both C22 and C45 transfers, C45 PHYs are first tried to be probed as C22 PHYs. To be able to promote the PHY to be a C45 one, the driver can call phy_promote_to_c45() in its probe function. This was already done in the mxl-gpy driver by the following snippet: if (!phy_is_c45(phydev)) { ret = phy_get_c45_ids(phydev); if (ret < 0) return ret; } Move that code into the core as it could be used by other drivers, too. If a PHY is promoted C45-over-C22 access is automatically used as a fallback if the bus doesn't support C45 transactions. Signed-off-by: Michael Walle <mwalle@kernel.org> --- drivers/net/phy/mxl-gpy.c | 9 ++++----- drivers/net/phy/phy_device.c | 36 ++++++++++++++++++++++++++++++------ include/linux/phy.h | 7 ++++++- 3 files changed, 40 insertions(+), 12 deletions(-)