Skip to content

Commit 385e72b

Browse files
Russell King (Oracle)kuba-moo
authored andcommitted
net: phylink: pass PHY into phylink_validate_one()
Pass the phy (if any) into phylink_validate_one() so that we can validate each interface with its rate matching setting. Tested-by: Luo Jie <quic_luoj@quicinc.com> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Link: https://lore.kernel.org/r/E1r6VIG-00DDLx-Cb@rmk-PC.armlinux.org.uk Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 5f492a0 commit 385e72b

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/net/phy/phylink.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ static int phylink_validate_mac_and_pcs(struct phylink *pl,
689689
return phylink_is_empty_linkmode(supported) ? -EINVAL : 0;
690690
}
691691

692-
static void phylink_validate_one(struct phylink *pl,
692+
static void phylink_validate_one(struct phylink *pl, struct phy_device *phy,
693693
const unsigned long *supported,
694694
const struct phylink_link_state *state,
695695
phy_interface_t interface,
@@ -704,6 +704,9 @@ static void phylink_validate_one(struct phylink *pl,
704704
tmp_state = *state;
705705
tmp_state.interface = interface;
706706

707+
if (phy)
708+
tmp_state.rate_matching = phy_get_rate_matching(phy, interface);
709+
707710
if (!phylink_validate_mac_and_pcs(pl, tmp_supported, &tmp_state)) {
708711
phylink_dbg(pl, " interface %u (%s) rate match %s supports %*pbl\n",
709712
interface, phy_modes(interface),
@@ -725,7 +728,7 @@ static int phylink_validate_mask(struct phylink *pl, unsigned long *supported,
725728
int interface;
726729

727730
for_each_set_bit(interface, interfaces, PHY_INTERFACE_MODE_MAX)
728-
phylink_validate_one(pl, supported, state, interface,
731+
phylink_validate_one(pl, NULL, supported, state, interface,
729732
all_s, all_adv);
730733

731734
linkmode_copy(supported, all_s);

0 commit comments

Comments
 (0)