mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 13:48:06 +00:00
59 lines
2.3 KiB
Diff
59 lines
2.3 KiB
Diff
|
From c6fec66d3cd76d797f70b30f1511bed10ba45a96 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
||
|
|
Date: Fri, 24 Nov 2023 12:28:29 +0000
|
||
|
|
Subject: [PATCH 5/7] net: phylink: pass PHY into phylink_validate_mask()
|
||
|
|
|
||
|
|
Pass the phy (if any) into phylink_validate_mask() 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/E1r6VIL-00DDM3-HJ@rmk-PC.armlinux.org.uk
|
||
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||
|
|
---
|
||
|
|
drivers/net/phy/phylink.c | 11 +++++++----
|
||
|
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/phy/phylink.c
|
||
|
|
+++ b/drivers/net/phy/phylink.c
|
||
|
|
@@ -734,7 +734,8 @@ static void phylink_validate_one(struct
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int phylink_validate_mask(struct phylink *pl, unsigned long *supported,
|
||
|
|
+static int phylink_validate_mask(struct phylink *pl, struct phy_device *phy,
|
||
|
|
+ unsigned long *supported,
|
||
|
|
struct phylink_link_state *state,
|
||
|
|
const unsigned long *interfaces)
|
||
|
|
{
|
||
|
|
@@ -743,7 +744,7 @@ static int phylink_validate_mask(struct
|
||
|
|
int interface;
|
||
|
|
|
||
|
|
for_each_set_bit(interface, interfaces, PHY_INTERFACE_MODE_MAX)
|
||
|
|
- phylink_validate_one(pl, NULL, supported, state, interface,
|
||
|
|
+ phylink_validate_one(pl, phy, supported, state, interface,
|
||
|
|
all_s, all_adv);
|
||
|
|
|
||
|
|
linkmode_copy(supported, all_s);
|
||
|
|
@@ -758,7 +759,8 @@ static int phylink_validate(struct phyli
|
||
|
|
const unsigned long *interfaces = pl->config->supported_interfaces;
|
||
|
|
|
||
|
|
if (state->interface == PHY_INTERFACE_MODE_NA)
|
||
|
|
- return phylink_validate_mask(pl, supported, state, interfaces);
|
||
|
|
+ return phylink_validate_mask(pl, NULL, supported, state,
|
||
|
|
+ interfaces);
|
||
|
|
|
||
|
|
if (!test_bit(state->interface, interfaces))
|
||
|
|
return -EINVAL;
|
||
|
|
@@ -3194,7 +3196,8 @@ static int phylink_sfp_config_optical(st
|
||
|
|
/* For all the interfaces that are supported, reduce the sfp_support
|
||
|
|
* mask to only those link modes that can be supported.
|
||
|
|
*/
|
||
|
|
- ret = phylink_validate_mask(pl, pl->sfp_support, &config, interfaces);
|
||
|
|
+ ret = phylink_validate_mask(pl, NULL, pl->sfp_support, &config,
|
||
|
|
+ interfaces);
|
||
|
|
if (ret) {
|
||
|
|
phylink_err(pl, "unsupported SFP module: validation with support %*pb failed\n",
|
||
|
|
__ETHTOOL_LINK_MODE_MASK_NBITS, support);
|