net: phy: nxp-c45-tja11xx: fix the PHY ID mismatch issue when using C45
Subsystems (5)
PATCH 1/1 net: phy: nxp-c45-tja11xx: fix the PHY ID mismatch issue when using C45
TJA1103/04/20/21 support both C22 and C45 accessing methods.
The TJA11xx driver has implemented the match_phy_device() API. However, it does not handle the C45 ID. If C45 was used to access TJA11xx, match_phy_device() would always return false due to phydev->phy_id only used by C22 being empty, resulting in the generic phy driver being used for TJA11xx PHYs.
Therefore, check phydev->c45_ids.device_ids[MDIO_MMD_PMAPMD] when using C45.
--- drivers/net/phy/nxp-c45-tja11xx.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/net/phy/nxp-c45-tja11xx.c +13 -10
@@ -1965,24 +1965,27 @@ static int nxp_c45_macsec_ability(struct phy_device *phydev)return macsec_ability; } +static bool tja11xx_phy_id_compare (struct phy_device *phydev, +const struct phy_driver *phydrv) +{ +u32 id = phydev->is_c45 ? phydev->c45_ids.device_ids[MDIO_MMD_PMAPMD ] : + phydev->phy_id; + +return phy_id_compare (id, phydrv->phy_id, phydrv->phy_id_mask); +} +static int tja11xx_no_macsec_match_phy_device (struct phy_device *phydev,const struct phy_driver *phydrv) { -if (!phy_id_compare (phydev->phy_id, phydrv->phy_id, - phydrv->phy_id_mask)) -return 0 ; - -return !nxp_c45_macsec_ability (phydev); +return tja11xx_phy_id_compare (phydev, phydrv) && + !nxp_c45_macsec_ability (phydev); }static int tja11xx_macsec_match_phy_device (struct phy_device *phydev,const struct phy_driver *phydrv) { -if (!phy_id_compare (phydev->phy_id, phydrv->phy_id, - phydrv->phy_id_mask)) -return 0 ; - -return nxp_c45_macsec_ability (phydev); +return tja11xx_phy_id_compare (phydev, phydrv) && +nxp_c45_macsec_ability (phydev); }static const struct nxp_c45_regmap tja1120_regmap = {
Signature · 1 line
2.34.1
This patch was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:
Quoted 9 lines · On Thu, 7 Aug 2025 12:08:32 +0800 you wrote:
TJA1103/04/20/21 support both C22 and C45 accessing methods.
The TJA11xx driver has implemented the
match_phy_device()API. However, it does not handle the C45 ID. If C45 was used to access TJA11xx,match_phy_device()would always return false due tophydev->phy_idonly used by C22 being empty, resulting in the generic phy driver being used for TJA11xx PHYs.[...]
Here is the summary with links:
- [net] net: phy: nxp-c45-tja11xx: fix the PHY ID mismatch issue when using C45
https://git.kernel.org/netdev/net/c/8ee90742cf29
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html