Commit 8ee90742 authored by Clark Wang's avatar Clark Wang Committed by Paolo Abeni
Browse files

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.

Fixes: 1b76b249 ("net: phy: nxp-c45-tja11xx: simplify .match_phy_device OP")
Signed-off-by: default avatarClark Wang <xiaoning.wang@nxp.com>
Link: https://patch.msgid.link/20250807040832.2455306-1-xiaoning.wang@nxp.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 89886abd

drivers/net/phy/nxp-c45-tja11xx.c

+13 −10
Original line number Diff line number Diff line
@@ -1965,24 +1965,27 @@ static int nxp_c45_macsec_ability(struct phy_device *phydev) 
	return macsec_ability;

}



static int tja11xx_no_macsec_match_phy_device(struct phy_device *phydev,

static bool tja11xx_phy_id_compare(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;

	u32 id = phydev->is_c45 ? phydev->c45_ids.device_ids[MDIO_MMD_PMAPMD] :

				  phydev->phy_id;



	return !nxp_c45_macsec_ability(phydev);

	return phy_id_compare(id, phydrv->phy_id, phydrv->phy_id_mask);

}



static int tja11xx_macsec_match_phy_device(struct phy_device *phydev,

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 tja11xx_phy_id_compare(phydev, phydrv) &&

	       !nxp_c45_macsec_ability(phydev);

}



	return nxp_c45_macsec_ability(phydev);

static int tja11xx_macsec_match_phy_device(struct phy_device *phydev,

					   const struct phy_driver *phydrv)

{

	return tja11xx_phy_id_compare(phydev, phydrv) &&

	       nxp_c45_macsec_ability(phydev);

}



static const struct nxp_c45_regmap tja1120_regmap = {