niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

net: phylink: provide phylink_validate_mask_caps() helper

Browse source 
Provide a helper that restricts the link modes according to the
phylink capabilities.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
[rebased on net-next/master and added documentation]
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Russell King (Oracle) 2022-10-17 16:22:35 -04:00 • committed by David S. Miller
parent 045d05018a
commit f392a18464
2 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
drivers/net/phy/phylink.c
View file

@ -561,6 +561,35 @@ unsigned long phylink_get_capabilities(phy_interface_t interface,
} }
EXPORT_SYMBOL_GPL(phylink_get_capabilities); EXPORT_SYMBOL_GPL(phylink_get_capabilities);
/**
* phylink_validate_mask_caps() - Restrict link modes based on caps
* @supported: ethtool bitmask for supported link modes.
* @state: an (optional) pointer to a &struct phylink_link_state.
* @mac_capabilities: bitmask of MAC capabilities
*
* Calculate the supported link modes based on @mac_capabilities, and restrict
* @supported and @state based on that. Use this function if your capabiliies
* aren't constant, such as if they vary depending on the interface.
*/
void phylink_validate_mask_caps(unsigned long *supported,
struct phylink_link_state *state,
unsigned long mac_capabilities)
{
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
unsigned long caps;
phylink_set_port_modes(mask);
phylink_set(mask, Autoneg);
caps = phylink_get_capabilities(state->interface, mac_capabilities,
state->rate_matching);
phylink_caps_to_linkmodes(mask, caps);
linkmode_and(supported, supported, mask);
if (state)
linkmode_and(state->advertising, state->advertising, mask);
}
EXPORT_SYMBOL_GPL(phylink_validate_mask_caps);
/** /**
* phylink_generic_validate() - generic validate() callback implementation * phylink_generic_validate() - generic validate() callback implementation
* @config: a pointer to a &struct phylink_config. * @config: a pointer to a &struct phylink_config.
@ -569,24 +598,12 @@ EXPORT_SYMBOL_GPL(phylink_get_capabilities);
* *
* Generic implementation of the validate() callback that MAC drivers can * Generic implementation of the validate() callback that MAC drivers can
* use when they pass the range of supported interfaces and MAC capabilities. * use when they pass the range of supported interfaces and MAC capabilities.
* This makes use of phylink_get_linkmodes().
*/ */
void phylink_generic_validate(struct phylink_config *config, void phylink_generic_validate(struct phylink_config *config,
unsigned long *supported, unsigned long *supported,
struct phylink_link_state *state) struct phylink_link_state *state)
{ {
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, }; phylink_validate_mask_caps(supported, state, config->mac_capabilities);
unsigned long caps;
phylink_set_port_modes(mask);
phylink_set(mask, Autoneg);
caps = phylink_get_capabilities(state->interface,
config->mac_capabilities,
state->rate_matching);
phylink_caps_to_linkmodes(mask, caps);
linkmode_and(supported, supported, mask);
linkmode_and(state->advertising, state->advertising, mask);
} }
EXPORT_SYMBOL_GPL(phylink_generic_validate); EXPORT_SYMBOL_GPL(phylink_generic_validate);

3
include/linux/phylink.h
View file

@ -556,6 +556,9 @@ void phylink_caps_to_linkmodes(unsigned long *linkmodes, unsigned long caps);
unsigned long phylink_get_capabilities(phy_interface_t interface, unsigned long phylink_get_capabilities(phy_interface_t interface,
unsigned long mac_capabilities, unsigned long mac_capabilities,
int rate_matching); int rate_matching);
void phylink_validate_mask_caps(unsigned long *supported,
struct phylink_link_state *state,
unsigned long caps);
void phylink_generic_validate(struct phylink_config *config, void phylink_generic_validate(struct phylink_config *config,
unsigned long *supported, unsigned long *supported,
struct phylink_link_state *state); struct phylink_link_state *state);