Commit 385e72b4 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

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: default avatarLuo Jie <quic_luoj@quicinc.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/E1r6VIG-00DDLx-Cb@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5f492a04

drivers/net/phy/phylink.c

+5 −2
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static int phylink_validate_mac_and_pcs(struct phylink *pl, 
	return phylink_is_empty_linkmode(supported) ? -EINVAL : 0;

}



static void phylink_validate_one(struct phylink *pl,

static void phylink_validate_one(struct phylink *pl, struct phy_device *phy,

				 const unsigned long *supported,

				 const struct phylink_link_state *state,

				 phy_interface_t interface,
@@ -704,6 +704,9 @@ static void phylink_validate_one(struct phylink *pl, 
	tmp_state = *state;

	tmp_state.interface = interface;



	if (phy)

		tmp_state.rate_matching = phy_get_rate_matching(phy, interface);



	if (!phylink_validate_mac_and_pcs(pl, tmp_supported, &tmp_state)) {

		phylink_dbg(pl, " interface %u (%s) rate match %s supports %*pbl\n",

			    interface, phy_modes(interface),
@@ -725,7 +728,7 @@ static int phylink_validate_mask(struct phylink *pl, unsigned long *supported, 
	int interface;



	for_each_set_bit(interface, interfaces, PHY_INTERFACE_MODE_MAX)

		phylink_validate_one(pl, supported, state, interface,

		phylink_validate_one(pl, NULL, supported, state, interface,

				     all_s, all_adv);



	linkmode_copy(supported, all_s);