github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-02 19:43:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: phy: nxp-c45-tja11xx: fix the PHY ID mismatch issue when using C45

Browse Source 
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.

Fixes: 1b76b2497a ("net: phy: nxp-c45-tja11xx: simplify .match_phy_device OP")
Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>
Link: https://patch.msgid.link/20250807040832.2455306-1-xiaoning.wang@nxp.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Clark Wang 2025-08-07 12:08:32 +08:00 committed by Paolo Abeni
parent 89886abd07
commit 8ee90742cf
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/phy/nxp-c45-tja11xx.c
View File

@ -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 = {