renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-26 15:45:14 +08:00
Code

net: phylink: add ability to validate a set of interface modes

Browse Source 
Rather than having the ability to validate all supported interface
modes or a single interface mode, introduce the ability to validate
a subset of supported modes.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
[ rebased on current net-next ]
Signed-off-by: Marek Behún <kabel@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Russell King (Oracle) 2022-09-30 16:20:59 +02:00 committed by David S. Miller
parent 3735264d72
commit 1645f44dd5
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -637,8 +637,9 @@ static int phylink_validate_mac_and_pcs(struct phylink *pl,
return phylink_is_empty_linkmode(supported) ? -EINVAL : 0;
}
static int phylink_validate_any(struct phylink *pl, unsigned long *supported,
struct phylink_link_state *state)
static int phylink_validate_mask(struct phylink *pl, unsigned long *supported,
struct phylink_link_state *state,
const unsigned long *interfaces)
{
__ETHTOOL_DECLARE_LINK_MODE_MASK(all_adv) = { 0, };
__ETHTOOL_DECLARE_LINK_MODE_MASK(all_s) = { 0, };
@ -647,7 +648,7 @@ static int phylink_validate_any(struct phylink *pl, unsigned long *supported,
int intf;
for (intf = 0; intf < PHY_INTERFACE_MODE_MAX; intf++) {
if (test_bit(intf, pl->config->supported_interfaces)) {
if (test_bit(intf, interfaces)) {
linkmode_copy(s, supported);
t = *state;
@ -668,12 +669,14 @@ static int phylink_validate_any(struct phylink *pl, unsigned long *supported,
static int phylink_validate(struct phylink *pl, unsigned long *supported,
struct phylink_link_state *state)
{
if (!phy_interface_empty(pl->config->supported_interfaces)) {
if (state->interface == PHY_INTERFACE_MODE_NA)
return phylink_validate_any(pl, supported, state);
const unsigned long *interfaces = pl->config->supported_interfaces;
if (!test_bit(state->interface,
pl->config->supported_interfaces))
if (!phy_interface_empty(interfaces)) {
if (state->interface == PHY_INTERFACE_MODE_NA)
return phylink_validate_mask(pl, supported, state,
interfaces);
if (!test_bit(state->interface, interfaces))
return -EINVAL;
}