MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-10-22 23:13:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: phy: pass PHY driver to .match_phy_device OP

Browse Source 
Pass PHY driver pointer to .match_phy_device OP in addition to phydev.
Having access to the PHY driver struct might be useful to check the
PHY ID of the driver is being matched for in case the PHY ID scanned in
the phydev is not consistent.

A scenario for this is a PHY that change PHY ID after a firmware is
loaded, in such case, the PHY ID stored in PHY device struct is not
valid anymore and PHY will manually scan the ID in the match_phy_device
function.

Having the PHY driver info is also useful for those PHY driver that
implement multiple simple .match_phy_device OP to match specific MMD PHY
ID. With this extra info if the parsing logic is the same, the matching
function can be generalized by using the phy_id in the PHY driver
instead of hardcoding.

Rust wrapper callback is updated to align to the new match_phy_device
arguments.

Suggested-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Reviewed-by: Benno Lossin <lossin@kernel.org> # for Rust
Reviewed-by: FUJITA Tomonori <fujita.tomonori@gmail.com>
Link: https://patch.msgid.link/20250517201353.5137-2-ansuelsmth@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Christian Marangi 2025-05-17 22:13:45 +02:00 committed by Jakub Kicinski
parent d42d440746
commit 31afd6bc55
11 changed files with 56 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/phy/bcm87xx.c
View File

@ -185,12 +185,14 @@ static irqreturn_t bcm87xx_handle_interrupt(struct phy_device *phydev)
return IRQ_HANDLED;
}
static int bcm8706_match_phy_device(struct phy_device *phydev)
static int bcm8706_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return phydev->c45_ids.device_ids[4] == PHY_ID_BCM8706;
}
static int bcm8727_match_phy_device(struct phy_device *phydev)
static int bcm8727_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return phydev->c45_ids.device_ids[4] == PHY_ID_BCM8727;
}

6
drivers/net/phy/icplus.c
View File

@ -520,12 +520,14 @@ static int ip101a_g_match_phy_device(struct phy_device *phydev, bool ip101a)
return ip101a == !ret;
}
static int ip101a_match_phy_device(struct phy_device *phydev)
static int ip101a_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return ip101a_g_match_phy_device(phydev, true);
}
static int ip101g_match_phy_device(struct phy_device *phydev)
static int ip101g_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return ip101a_g_match_phy_device(phydev, false);
}

12
drivers/net/phy/marvell10g.c
View File

@ -1264,7 +1264,8 @@ static int mv3310_get_number_of_ports(struct phy_device *phydev)
return ret + 1;
}
static int mv3310_match_phy_device(struct phy_device *phydev)
static int mv3310_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
if ((phydev->c45_ids.device_ids[MDIO_MMD_PMAPMD] &
MARVELL_PHY_ID_MASK) != MARVELL_PHY_ID_88X3310)
@ -1273,7 +1274,8 @@ static int mv3310_match_phy_device(struct phy_device *phydev)
return mv3310_get_number_of_ports(phydev) == 1;
}
static int mv3340_match_phy_device(struct phy_device *phydev)
static int mv3340_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
if ((phydev->c45_ids.device_ids[MDIO_MMD_PMAPMD] &
MARVELL_PHY_ID_MASK) != MARVELL_PHY_ID_88X3310)
@ -1297,12 +1299,14 @@ static int mv211x_match_phy_device(struct phy_device *phydev, bool has_5g)
return !!(val & MDIO_PCS_SPEED_5G) == has_5g;
}
static int mv2110_match_phy_device(struct phy_device *phydev)
static int mv2110_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return mv211x_match_phy_device(phydev, true);
}
static int mv2111_match_phy_device(struct phy_device *phydev)
static int mv2111_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return mv211x_match_phy_device(phydev, false);
}

6
drivers/net/phy/micrel.c
View File

@ -768,7 +768,8 @@ static int ksz8051_ksz8795_match_phy_device(struct phy_device *phydev,
return !ret;
}
static int ksz8051_match_phy_device(struct phy_device *phydev)
static int ksz8051_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return ksz8051_ksz8795_match_phy_device(phydev, true);
}
@ -888,7 +889,8 @@ static int ksz8061_config_init(struct phy_device *phydev)
return kszphy_config_init(phydev);
}
static int ksz8795_match_phy_device(struct phy_device *phydev)
static int ksz8795_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return ksz8051_ksz8795_match_phy_device(phydev, false);
}

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

@ -1966,25 +1966,29 @@ static int nxp_c45_macsec_ability(struct phy_device *phydev)
return macsec_ability;
}
static int tja1103_match_phy_device(struct phy_device *phydev)
static int tja1103_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return phy_id_compare(phydev->phy_id, PHY_ID_TJA_1103, PHY_ID_MASK) &&
!nxp_c45_macsec_ability(phydev);
}
static int tja1104_match_phy_device(struct phy_device *phydev)
static int tja1104_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return phy_id_compare(phydev->phy_id, PHY_ID_TJA_1103, PHY_ID_MASK) &&
nxp_c45_macsec_ability(phydev);
}
static int tja1120_match_phy_device(struct phy_device *phydev)
static int tja1120_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return phy_id_compare(phydev->phy_id, PHY_ID_TJA_1120, PHY_ID_MASK) &&
!nxp_c45_macsec_ability(phydev);
}
static int tja1121_match_phy_device(struct phy_device *phydev)
static int tja1121_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return phy_id_compare(phydev->phy_id, PHY_ID_TJA_1120, PHY_ID_MASK) &&
nxp_c45_macsec_ability(phydev);

6
drivers/net/phy/nxp-tja11xx.c
View File

@ -651,12 +651,14 @@ static int tja1102_match_phy_device(struct phy_device *phydev, bool port0)
return !ret;
}
static int tja1102_p0_match_phy_device(struct phy_device *phydev)
static int tja1102_p0_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return tja1102_match_phy_device(phydev, true);
}
static int tja1102_p1_match_phy_device(struct phy_device *phydev)
static int tja1102_p1_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return tja1102_match_phy_device(phydev, false);
}

2
drivers/net/phy/phy_device.c
View File

@ -554,7 +554,7 @@ static int phy_bus_match(struct device *dev, const struct device_driver *drv)
return 0;
if (phydrv->match_phy_device)
return phydrv->match_phy_device(phydev);
return phydrv->match_phy_device(phydev, phydrv);
if (phydev->is_c45) {
for (i = 1; i < num_ids; i++) {

27
drivers/net/phy/realtek/realtek_main.c
View File

@ -1315,13 +1315,15 @@ static bool rtlgen_supports_mmd(struct phy_device *phydev)
return val > 0;
}
static int rtlgen_match_phy_device(struct phy_device *phydev)
static int rtlgen_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return phydev->phy_id == RTL_GENERIC_PHYID &&
!rtlgen_supports_2_5gbps(phydev);
}
static int rtl8226_match_phy_device(struct phy_device *phydev)
static int rtl8226_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return phydev->phy_id == RTL_GENERIC_PHYID &&
rtlgen_supports_2_5gbps(phydev) &&
@ -1337,32 +1339,38 @@ static int rtlgen_is_c45_match(struct phy_device *phydev, unsigned int id,
return !is_c45 && (id == phydev->phy_id);
}
static int rtl8221b_match_phy_device(struct phy_device *phydev)
static int rtl8221b_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return phydev->phy_id == RTL_8221B && rtlgen_supports_mmd(phydev);
}
static int rtl8221b_vb_cg_c22_match_phy_device(struct phy_device *phydev)
static int rtl8221b_vb_cg_c22_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return rtlgen_is_c45_match(phydev, RTL_8221B_VB_CG, false);
}
static int rtl8221b_vb_cg_c45_match_phy_device(struct phy_device *phydev)
static int rtl8221b_vb_cg_c45_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return rtlgen_is_c45_match(phydev, RTL_8221B_VB_CG, true);
}
static int rtl8221b_vn_cg_c22_match_phy_device(struct phy_device *phydev)
static int rtl8221b_vn_cg_c22_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return rtlgen_is_c45_match(phydev, RTL_8221B_VN_CG, false);
}
static int rtl8221b_vn_cg_c45_match_phy_device(struct phy_device *phydev)
static int rtl8221b_vn_cg_c45_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return rtlgen_is_c45_match(phydev, RTL_8221B_VN_CG, true);
}
static int rtl_internal_nbaset_match_phy_device(struct phy_device *phydev)
static int rtl_internal_nbaset_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
if (phydev->is_c45)
return false;
@ -1381,7 +1389,8 @@ static int rtl_internal_nbaset_match_phy_device(struct phy_device *phydev)
return rtlgen_supports_2_5gbps(phydev) && !rtlgen_supports_mmd(phydev);
}
static int rtl8251b_c45_match_phy_device(struct phy_device *phydev)
static int rtl8251b_c45_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return rtlgen_is_c45_match(phydev, RTL_8251B, true);
}

3
drivers/net/phy/teranetics.c
View File

@ -67,7 +67,8 @@ static int teranetics_read_status(struct phy_device *phydev)
return 0;
}
static int teranetics_match_phy_device(struct phy_device *phydev)
static int teranetics_match_phy_device(struct phy_device *phydev,
const struct phy_driver *phydrv)
{
return phydev->c45_ids.device_ids[3] == PHY_ID_TN2020;
}

3
include/linux/phy.h
View File

@ -990,7 +990,8 @@ struct phy_driver {
* driver for the given phydev. If NULL, matching is based on
* phy_id and phy_id_mask.
*/
int (*match_phy_device)(struct phy_device *phydev);
int (*match_phy_device)(struct phy_device *phydev,
const struct phy_driver *phydrv);
/**
* @set_wol: Some devices (e.g. qnap TS-119P II) require PHY

1
rust/kernel/net/phy.rs
View File

@ -421,6 +421,7 @@ impl<T: Driver> Adapter<T> {
/// `phydev` must be passed by the corresponding callback in `phy_driver`.
unsafe extern "C" fn match_phy_device_callback(
phydev: *mut bindings::phy_device,
_phydrv: *const bindings::phy_driver,
) -> crate::ffi::c_int {
// SAFETY: This callback is called only in contexts
// where we hold `phy_device->lock`, so the accessors on