[PATCH 1/2] net: phy: Make phy_interface_is_sgmii a switch statement

Nishanth Menon nm at ti.com
Thu Apr 13 20:07:12 CEST 2023


Recent commit 75d28899e3e9 ("net: phy: Synchronize PHY interface modes
with Linux") reordered the enum definitions. This caused the range of
enums that this api was checking to go bad.

While it is possible for the phy drivers to practically use the enum's
directly, drivers such as dp83867 use this helper to manage the
configuration of the phy correctly.

Reported-by: Tom Rini <trini at konsulko.com>
Signed-off-by: Nishanth Menon <nm at ti.com>
---
 include/phy.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/include/phy.h b/include/phy.h
index a837fed72352..1c4dc23bc5ba 100644
--- a/include/phy.h
+++ b/include/phy.h
@@ -373,8 +373,16 @@ static inline bool phy_interface_is_rgmii(struct phy_device *phydev)
  */
 static inline bool phy_interface_is_sgmii(struct phy_device *phydev)
 {
-	return phydev->interface >= PHY_INTERFACE_MODE_SGMII &&
-		phydev->interface <= PHY_INTERFACE_MODE_QSGMII;
+	switch (phydev->interface) {
+	case PHY_INTERFACE_MODE_SGMII:
+	case PHY_INTERFACE_MODE_QUSGMII:
+	case PHY_INTERFACE_MODE_USXGMII:
+	case PHY_INTERFACE_MODE_QSGMII:
+		return 1;
+	default:
+		fallthrough;
+	}
+	return 0;
 }
 
 bool phy_interface_is_ncsi(void);
-- 
2.40.0



More information about the U-Boot mailing list