From 9810489ca80f22b548590b7926c211fed46ce457 Mon Sep 17 00:00:00 2001 From: Alex Marginean Date: Thu, 9 Jan 2020 10:50:05 +0200 Subject: [PATCH] net: phy: add XFI, USXGMII types to is_10g_interface() helper The helper is used to reset PHYs on connect and it determines the clause to use (C22/C45) based on interface type. This fixes 'PHY reset timed out' warnings in console for USXGMII/XFI PHYs. Signed-off-by: Alex Marginean Acked-by: Joe Hershberger --- include/phy.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/phy.h b/include/phy.h index edc702a1f7..b5de14cbfc 100644 --- a/include/phy.h +++ b/include/phy.h @@ -260,10 +260,15 @@ static inline int phy_write_mmd(struct phy_device *phydev, int devad, #ifdef CONFIG_PHYLIB_10G extern struct phy_driver gen10g_driver; -/* For now, XGMII is the only 10G interface */ +/* + * List all 10G interfaces here, the assumption being that PHYs on these + * interfaces are C45 + */ static inline int is_10g_interface(phy_interface_t interface) { - return interface == PHY_INTERFACE_MODE_XGMII; + return interface == PHY_INTERFACE_MODE_XGMII || + interface == PHY_INTERFACE_MODE_USXGMII || + interface == PHY_INTERFACE_MODE_XFI; } #endif -- 2.25.1