mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
68bc059c55
Manually rebased: backport-5.15/603-v5.19-page_pool-Add-recycle-stats-to-page_pool_put_page_bu.patch pending-5.15/723-net-mt7531-ensure-all-MACs-are-powered-down-before-r.patch* Removed upstreamed: generic-backport/610-v6.3-net-page_pool-use-in_softirq-instead.patch[1] backport-5.15/705-12-v6.0-net-dsa-mt7530-rework-mt753-01-_setup.patch[2] backport-5.15/790-v6.4-0010-net-dsa-mt7530-split-off-common-parts-from-mt7531_se.patch[3] backport-5.15/703-10-v5.16-net-dsa-introduce-helpers-for-iterating-through-port.patch[4] All other patches automatically rebased. * Modified to define the variable i as suggested by DragonBluep in PR discussion. See: https://github.com/openwrt/openwrt/pull/12823#issuecomment-1578518576 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.115&id=3af319d5147454dc63665ef451229c674b538377 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.115&id=0753c1ef24194580f7165ae6e259b59a851392f2 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.115&id=5a7266feaa6d708fc6880a161786eaa884ef3c8e 4.9902f91cf6Build system: x86_64 Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit5714660643)
75 lines
2.2 KiB
Diff
75 lines
2.2 KiB
Diff
From 1bd099c49f65ed923b9f19b8c4b3cd1ff0024091 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Mon, 3 Apr 2023 02:17:40 +0100
|
|
Subject: [PATCH 06/16] net: dsa: mt7530: use unlocked regmap accessors
|
|
|
|
Instead of wrapping the locked register accessor functions, use the
|
|
unlocked variants and add locking wrapper functions to let regmap
|
|
handle the locking.
|
|
|
|
This is a preparation towards being able to always use regmap to
|
|
access switch registers instead of open-coded accessor functions.
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/mt7530.c | 23 ++++++++++++++---------
|
|
1 file changed, 14 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -2914,7 +2914,7 @@ static int mt7530_regmap_read(void *cont
|
|
{
|
|
struct mt7530_priv *priv = context;
|
|
|
|
- *val = mt7530_read(priv, reg);
|
|
+ *val = mt7530_mii_read(priv, reg);
|
|
return 0;
|
|
};
|
|
|
|
@@ -2922,23 +2922,25 @@ static int mt7530_regmap_write(void *con
|
|
{
|
|
struct mt7530_priv *priv = context;
|
|
|
|
- mt7530_write(priv, reg, val);
|
|
+ mt7530_mii_write(priv, reg, val);
|
|
return 0;
|
|
};
|
|
|
|
-static int mt7530_regmap_update_bits(void *context, unsigned int reg,
|
|
- unsigned int mask, unsigned int val)
|
|
+static void
|
|
+mt7530_mdio_regmap_lock(void *mdio_lock)
|
|
{
|
|
- struct mt7530_priv *priv = context;
|
|
+ mutex_lock_nested(mdio_lock, MDIO_MUTEX_NESTED);
|
|
+}
|
|
|
|
- mt7530_rmw(priv, reg, mask, val);
|
|
- return 0;
|
|
-};
|
|
+static void
|
|
+mt7530_mdio_regmap_unlock(void *mdio_lock)
|
|
+{
|
|
+ mutex_unlock(mdio_lock);
|
|
+}
|
|
|
|
static const struct regmap_bus mt7531_regmap_bus = {
|
|
.reg_write = mt7530_regmap_write,
|
|
.reg_read = mt7530_regmap_read,
|
|
- .reg_update_bits = mt7530_regmap_update_bits,
|
|
};
|
|
|
|
static int
|
|
@@ -2964,6 +2966,9 @@ mt7531_create_sgmii(struct mt7530_priv *
|
|
mt7531_pcs_config[i]->reg_stride = 4;
|
|
mt7531_pcs_config[i]->reg_base = MT7531_SGMII_REG_BASE(5 + i);
|
|
mt7531_pcs_config[i]->max_register = 0x17c;
|
|
+ mt7531_pcs_config[i]->lock = mt7530_mdio_regmap_lock;
|
|
+ mt7531_pcs_config[i]->unlock = mt7530_mdio_regmap_unlock;
|
|
+ mt7531_pcs_config[i]->lock_arg = &priv->bus->mdio_lock;
|
|
|
|
regmap = devm_regmap_init(priv->dev,
|
|
&mt7531_regmap_bus, priv,
|