net: dsa: realtek: allow subdrivers to externally lock regmap

Currently there is no way for Realtek DSA subdrivers to serialize
consecutive regmap accesses. In preparation for a bugfix relating to
indirect PHY register access - which involves a series of regmap
reads and writes - add a facility for subdrivers to serialize their
regmap access.

Specifically, a mutex is added to the driver private data structure and
the standard regmap is initialized with custom lock/unlock ops which use
this mutex. Then, a "nolock" variant of the regmap is added, which is
functionally equivalent to the existing regmap except that regmap
locking is disabled. Functions that wish to serialize a sequence of
regmap accesses may then lock the newly introduced driver-owned mutex
before using the nolock regmap.

Doing things this way means that subdriver code that doesn't care about
serialized register access - i.e. the vast majority of code - needn't
worry about synchronizing register access with an external lock: it can
just continue to use the original regmap.

Another advantage of this design is that, while regmaps with locking
disabled do not expose a debugfs interface for obvious reasons, there
still exists the original regmap which does expose this interface. This
interface remains safe to use even combined with driver codepaths that
use the nolock regmap, because said codepaths will use the same mutex
to synchronize access.

With respect to disadvantages, it can be argued that having
near-duplicate regmaps is confusing. However, the naming is rather
explicit, and examples will abound.

Finally, while we are at it, rename realtek_smi_mdio_regmap_config to
realtek_smi_regmap_config. This makes it consistent with the naming
realtek_mdio_regmap_config in realtek-mdio.c.

Signed-off-by: Alvin Šipraga <alsi@bang-olufsen.dk>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/realtek/realtek-mdio.c b/drivers/net/dsa/realtek/realtek-mdio.c
index 0308be9..31e1f10 100644 (file)
--- a/drivers/net/dsa/realtek/realtek-mdio.c
+++ b/drivers/net/dsa/realtek/realtek-mdio.c
@@ -98,6 +98,20 @@ out_unlock:
        return ret;
 }
 
+static void realtek_mdio_lock(void *ctx)
+{
+       struct realtek_priv *priv = ctx;
+
+       mutex_lock(&priv->map_lock);
+}
+
+static void realtek_mdio_unlock(void *ctx)
+{
+       struct realtek_priv *priv = ctx;
+
+       mutex_unlock(&priv->map_lock);
+}
+
 static const struct regmap_config realtek_mdio_regmap_config = {
        .reg_bits = 10, /* A4..A0 R4..R0 */
        .val_bits = 16,
@@ -108,6 +122,21 @@ static const struct regmap_config realtek_mdio_regmap_config = {
        .reg_read = realtek_mdio_read,
        .reg_write = realtek_mdio_write,
        .cache_type = REGCACHE_NONE,
+       .lock = realtek_mdio_lock,
+       .unlock = realtek_mdio_unlock,
+};
+
+static const struct regmap_config realtek_mdio_nolock_regmap_config = {
+       .reg_bits = 10, /* A4..A0 R4..R0 */
+       .val_bits = 16,
+       .reg_stride = 1,
+       /* PHY regs are at 0x8000 */
+       .max_register = 0xffff,
+       .reg_format_endian = REGMAP_ENDIAN_BIG,
+       .reg_read = realtek_mdio_read,
+       .reg_write = realtek_mdio_write,
+       .cache_type = REGCACHE_NONE,
+       .disable_locking = true,
 };
 
 static int realtek_mdio_probe(struct mdio_device *mdiodev)
@@ -115,8 +144,9 @@ static int realtek_mdio_probe(struct mdio_device *mdiodev)
        struct realtek_priv *priv;
        struct device *dev = &mdiodev->dev;
        const struct realtek_variant *var;
-       int ret;
+       struct regmap_config rc;
        struct device_node *np;
+       int ret;
 
        var = of_device_get_match_data(dev);
        if (!var)
@@ -126,13 +156,25 @@ static int realtek_mdio_probe(struct mdio_device *mdiodev)
        if (!priv)
                return -ENOMEM;
 
-       priv->map = devm_regmap_init(dev, NULL, priv, &realtek_mdio_regmap_config);
+       mutex_init(&priv->map_lock);
+
+       rc = realtek_mdio_regmap_config;
+       rc.lock_arg = priv;
+       priv->map = devm_regmap_init(dev, NULL, priv, &rc);
        if (IS_ERR(priv->map)) {
                ret = PTR_ERR(priv->map);
                dev_err(dev, "regmap init failed: %d\n", ret);
                return ret;
        }
 
+       rc = realtek_mdio_nolock_regmap_config;
+       priv->map_nolock = devm_regmap_init(dev, NULL, priv, &rc);
+       if (IS_ERR(priv->map_nolock)) {
+               ret = PTR_ERR(priv->map_nolock);
+               dev_err(dev, "regmap init failed: %d\n", ret);
+               return ret;
+       }
+
        priv->mdio_addr = mdiodev->addr;
        priv->bus = mdiodev->bus;
        priv->dev = &mdiodev->dev;

diff --git a/drivers/net/dsa/realtek/realtek-smi.c b/drivers/net/dsa/realtek/realtek-smi.c
index 8806b74..2243d3d 100644 (file)
--- a/drivers/net/dsa/realtek/realtek-smi.c
+++ b/drivers/net/dsa/realtek/realtek-smi.c
@@ -311,7 +311,21 @@ static int realtek_smi_read(void *ctx, u32 reg, u32 *val)
        return realtek_smi_read_reg(priv, reg, val);
 }
 
-static const struct regmap_config realtek_smi_mdio_regmap_config = {
+static void realtek_smi_lock(void *ctx)
+{
+       struct realtek_priv *priv = ctx;
+
+       mutex_lock(&priv->map_lock);
+}
+
+static void realtek_smi_unlock(void *ctx)
+{
+       struct realtek_priv *priv = ctx;
+
+       mutex_unlock(&priv->map_lock);
+}
+
+static const struct regmap_config realtek_smi_regmap_config = {
        .reg_bits = 10, /* A4..A0 R4..R0 */
        .val_bits = 16,
        .reg_stride = 1,
@@ -321,6 +335,21 @@ static const struct regmap_config realtek_smi_mdio_regmap_config = {
        .reg_read = realtek_smi_read,
        .reg_write = realtek_smi_write,
        .cache_type = REGCACHE_NONE,
+       .lock = realtek_smi_lock,
+       .unlock = realtek_smi_unlock,
+};
+
+static const struct regmap_config realtek_smi_nolock_regmap_config = {
+       .reg_bits = 10, /* A4..A0 R4..R0 */
+       .val_bits = 16,
+       .reg_stride = 1,
+       /* PHY regs are at 0x8000 */
+       .max_register = 0xffff,
+       .reg_format_endian = REGMAP_ENDIAN_BIG,
+       .reg_read = realtek_smi_read,
+       .reg_write = realtek_smi_write,
+       .cache_type = REGCACHE_NONE,
+       .disable_locking = true,
 };
 
 static int realtek_smi_mdio_read(struct mii_bus *bus, int addr, int regnum)
@@ -385,6 +414,7 @@ static int realtek_smi_probe(struct platform_device *pdev)
        const struct realtek_variant *var;
        struct device *dev = &pdev->dev;
        struct realtek_priv *priv;
+       struct regmap_config rc;
        struct device_node *np;
        int ret;
 
@@ -395,14 +425,26 @@ static int realtek_smi_probe(struct platform_device *pdev)
        if (!priv)
                return -ENOMEM;
        priv->chip_data = (void *)priv + sizeof(*priv);
-       priv->map = devm_regmap_init(dev, NULL, priv,
-                                    &realtek_smi_mdio_regmap_config);
+
+       mutex_init(&priv->map_lock);
+
+       rc = realtek_smi_regmap_config;
+       rc.lock_arg = priv;
+       priv->map = devm_regmap_init(dev, NULL, priv, &rc);
        if (IS_ERR(priv->map)) {
                ret = PTR_ERR(priv->map);
                dev_err(dev, "regmap init failed: %d\n", ret);
                return ret;
        }
 
+       rc = realtek_smi_nolock_regmap_config;
+       priv->map_nolock = devm_regmap_init(dev, NULL, priv, &rc);
+       if (IS_ERR(priv->map_nolock)) {
+               ret = PTR_ERR(priv->map_nolock);
+               dev_err(dev, "regmap init failed: %d\n", ret);
+               return ret;
+       }
+
        /* Link forward and backward */
        priv->dev = dev;
        priv->clk_delay = var->clk_delay;

diff --git a/drivers/net/dsa/realtek/realtek.h b/drivers/net/dsa/realtek/realtek.h
index e7d3e1b..4fa7c6b 100644 (file)
--- a/drivers/net/dsa/realtek/realtek.h
+++ b/drivers/net/dsa/realtek/realtek.h
@@ -52,6 +52,8 @@ struct realtek_priv {
        struct gpio_desc        *mdc;
        struct gpio_desc        *mdio;
        struct regmap           *map;
+       struct regmap           *map_nolock;
+       struct mutex            map_lock;
        struct mii_bus          *slave_mii_bus;
        struct mii_bus          *bus;
        int                     mdio_addr;