diff --git a/drivers/net/phy/phy-internal.h b/drivers/net/phy/phy-internal.h
new file mode 100644
index 000000000000..56d87495e1f0
--- /dev/null
+++ b/drivers/net/phy/phy-internal.h
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef __PHY_INTERNAL_H
+#define __PHY_INTERNAL_H
+
+#include <linux/lockdep.h>
+#include <linux/phy.h>
+
+static inline int __phy_get_rate_matching(struct phy_device *phydev,
+ phy_interface_t iface)
+{
+ int ret = RATE_MATCH_NONE;
+
+ lockdep_assert_held(&phydev->lock);
+
+ if (phydev->drv->get_rate_matching)
+ return phydev->drv->get_rate_matching(phydev, iface);
+
+ return ret;
+}
+
+#endif /* __PHY_INTERNAL_H */diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index fce9bc7be330..e305bbff16ad 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -38,6 +38,7 @@
#include "phylib-internal.h"
#include "phy-caps.h"
+#include "phy-internal.h"
#define PHY_STATE_TIME HZ
@@ -146,13 +147,11 @@ EXPORT_SYMBOL(phy_print_status);
int phy_get_rate_matching(struct phy_device *phydev,
phy_interface_t iface)
{
- int ret = RATE_MATCH_NONE;
+ int ret;
- if (phydev->drv->get_rate_matching) {
- mutex_lock(&phydev->lock);
- ret = phydev->drv->get_rate_matching(phydev, iface);
- mutex_unlock(&phydev->lock);
- }
+ mutex_lock(&phydev->lock);
+ ret = __phy_get_rate_matching(phydev, iface);
+ mutex_unlock(&phydev->lock);
return ret;
}diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 091c3a79c120..88280866c19a 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -9,6 +9,7 @@
#include <linux/ethtool.h>
#include <linux/export.h>
#include <linux/gpio/consumer.h>
+#include <linux/lockdep.h>
#include <linux/netdevice.h>
#include <linux/of.h>
#include <linux/of_mdio.h>
@@ -24,6 +25,7 @@
#include <linux/workqueue.h>
#include "phy-caps.h"
+#include "phy-internal.h"
#include "sfp.h"
#include "swphy.h"
@@ -550,6 +552,8 @@ static int phylink_validate_mac_and_pcs(struct phylink *pl,
unsigned long capabilities;
int ret;
+ lockdep_assert_held(&pl->state_mutex);
+
/* Get the PCS for this interface mode */
if (pl->mac_ops->mac_select_pcs) {
pcs = pl->mac_ops->mac_select_pcs(pl->config, state->interface);@@ -628,13 +632,15 @@ static void phylink_validate_one(struct phylink *pl, struct phy_device *phy,
__ETHTOOL_DECLARE_LINK_MODE_MASK(tmp_supported);
struct phylink_link_state tmp_state;
+ lockdep_assert_held(&pl->state_mutex);
+
linkmode_copy(tmp_supported, supported);
tmp_state = *state;
tmp_state.interface = interface;
if (phy)
- tmp_state.rate_matching = phy_get_rate_matching(phy, interface);
+ 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",@@ -648,15 +654,17 @@ static void phylink_validate_one(struct phylink *pl, struct phy_device *phy,
}
}
-static int phylink_validate_mask(struct phylink *pl, struct phy_device *phy,
- unsigned long *supported,
- struct phylink_link_state *state,
- const unsigned long *interfaces)
+static int __phylink_validate_mask(struct phylink *pl, struct phy_device *phy,
+ 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, };
int interface;
+ lockdep_assert_held(&pl->state_mutex);
+
for_each_set_bit(interface, interfaces, PHY_INTERFACE_MODE_MAX)
phylink_validate_one(pl, phy, supported, state, interface,
all_s, all_adv);@@ -667,14 +675,36 @@ static int phylink_validate_mask(struct phylink *pl, struct phy_device *phy,
return phylink_is_empty_linkmode(supported) ? -EINVAL : 0;
}
-static int phylink_validate(struct phylink *pl, unsigned long *supported,
- struct phylink_link_state *state)
+static int phylink_validate_mask(struct phylink *pl, struct phy_device *phy,
+ unsigned long *supported,
+ struct phylink_link_state *state,
+ const unsigned long *interfaces)
+{
+ int ret;
+
+ if (phy)
+ mutex_lock(&phy->lock);
+
+ mutex_lock(&pl->state_mutex);
+ ret = __phylink_validate_mask(pl, phy, supported, state, interfaces);
+ mutex_unlock(&pl->state_mutex);
+
+ if (phy)
+ mutex_unlock(&phy->lock);
+
+ return ret;
+}
+
+static int __phylink_validate(struct phylink *pl, unsigned long *supported,
+ struct phylink_link_state *state)
{
const unsigned long *interfaces = pl->supported_interfaces;
+ lockdep_assert_held(&pl->state_mutex);
+
if (state->interface == PHY_INTERFACE_MODE_NA)
- return phylink_validate_mask(pl, NULL, supported, state,
- interfaces);
+ return __phylink_validate_mask(pl, NULL, supported, state,
+ interfaces);
if (!test_bit(state->interface, interfaces))
return -EINVAL;@@ -682,6 +712,18 @@ static int phylink_validate(struct phylink *pl, unsigned long *supported,
return phylink_validate_mac_and_pcs(pl, supported, state);
}
+static int phylink_validate(struct phylink *pl, unsigned long *supported,
+ struct phylink_link_state *state)
+{
+ int ret;
+
+ mutex_lock(&pl->state_mutex);
+ ret = __phylink_validate(pl, supported, state);
+ mutex_unlock(&pl->state_mutex);
+
+ return ret;
+}
+
static void phylink_fill_fixedlink_supported(unsigned long *supported)
{
linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, supported);@@ -2117,7 +2159,7 @@ void phylink_update_mac_pause_capabilities(struct phylink *pl, unsigned long mac
else if (pl->sfp_bus)
linkmode_and(pl->supported, pl->supported, pl->sfp_support);
- phylink_validate(pl, pl->supported, config);
+ __phylink_validate(pl, pl->supported, config);
pause_state = config->pause;
--
2.55.0