UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: phylink: Generate caps and convert to linkmodes separately 

If we call phylink_caps_to_linkmodes directly from
phylink_get_linkmodes, it is difficult to re-use this functionality in
MAC drivers. This is because MAC drivers must then work with an ethtool
linkmode bitmap, instead of with mac capabilities. Instead, let the
caller of phylink_get_linkmodes do the conversion. To reflect this
change, rename the function to phylink_get_capabilities.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sean Anderson 2022-09-20 18:12:30 -04:00 committed by David S. Miller
parent 606116529a
commit 3e6eab8f3e
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/phy/phylink.c
View File

@ -305,16 +305,14 @@ void phylink_caps_to_linkmodes(unsigned long *linkmodes, unsigned long caps)
EXPORT_SYMBOL_GPL(phylink_caps_to_linkmodes);
/**
* phylink_get_linkmodes() - get acceptable link modes
* @linkmodes: ethtool linkmode mask (must be already initialised)
* phylink_get_capabilities() - get capabilities for a given MAC
* @interface: phy interface mode defined by &typedef phy_interface_t
* @mac_capabilities: bitmask of MAC capabilities
*
* Set all possible pause, speed and duplex linkmodes in @linkmodes that
* are supported by the @interface mode and @mac_capabilities. @linkmodes
* must have been initialised previously.
* Get the MAC capabilities that are supported by the @interface mode and
* @mac_capabilities.
*/
void phylink_get_linkmodes(unsigned long *linkmodes, phy_interface_t interface,
unsigned long phylink_get_capabilities(phy_interface_t interface,
unsigned long mac_capabilities)
{
unsigned long caps = MAC_SYM_PAUSE | MAC_ASYM_PAUSE;
@ -391,9 +389,9 @@ void phylink_get_linkmodes(unsigned long *linkmodes, phy_interface_t interface,
break;
}
phylink_caps_to_linkmodes(linkmodes, caps & mac_capabilities);
return caps & mac_capabilities;
}
EXPORT_SYMBOL_GPL(phylink_get_linkmodes);
EXPORT_SYMBOL_GPL(phylink_get_capabilities);
/**
* phylink_generic_validate() - generic validate() callback implementation
@ -410,10 +408,13 @@ void phylink_generic_validate(struct phylink_config *config,
struct phylink_link_state *state)
{
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
unsigned long caps;
phylink_set_port_modes(mask);
phylink_set(mask, Autoneg);
phylink_get_linkmodes(mask, state->interface, config->mac_capabilities);
caps = phylink_get_capabilities(state->interface,
config->mac_capabilities);
phylink_caps_to_linkmodes(mask, caps);
linkmode_and(supported, supported, mask);
linkmode_and(state->advertising, state->advertising, mask);

2
include/linux/phylink.h
View File

@ -548,7 +548,7 @@ void pcs_link_up(struct phylink_pcs *pcs, unsigned int mode,
#endif
void phylink_caps_to_linkmodes(unsigned long *linkmodes, unsigned long caps);
void phylink_get_linkmodes(unsigned long *linkmodes, phy_interface_t interface,
unsigned long phylink_get_capabilities(phy_interface_t interface,
unsigned long mac_capabilities);
void phylink_generic_validate(struct phylink_config *config,
unsigned long *supported,