lkml.org 
[lkml]   [2021]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.10 018/137] net: mdio: ipq8064: add regmap config to disable REGCACHE
    Date
    From: Ansuel Smith <ansuelsmth@gmail.com>

    [ Upstream commit b097bea10215315e8ee17f88b4c1bbb521b1878c ]

    mdio drivers should not use REGCHACHE. Also disable locking since it's
    handled by the mdio users and regmap is always accessed atomically.

    Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
    Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/mdio/mdio-ipq8064.c | 33 ++++++++++++++++++++++++---------
    1 file changed, 24 insertions(+), 9 deletions(-)

    diff --git a/drivers/net/mdio/mdio-ipq8064.c b/drivers/net/mdio/mdio-ipq8064.c
    index 1bd18857e1c5..f0a6bfa61645 100644
    --- a/drivers/net/mdio/mdio-ipq8064.c
    +++ b/drivers/net/mdio/mdio-ipq8064.c
    @@ -10,7 +10,7 @@
    #include <linux/module.h>
    #include <linux/regmap.h>
    #include <linux/of_mdio.h>
    -#include <linux/phy.h>
    +#include <linux/of_address.h>
    #include <linux/platform_device.h>
    #include <linux/mfd/syscon.h>

    @@ -96,14 +96,34 @@ ipq8064_mdio_write(struct mii_bus *bus, int phy_addr, int reg_offset, u16 data)
    return ipq8064_mdio_wait_busy(priv);
    }

    +static const struct regmap_config ipq8064_mdio_regmap_config = {
    + .reg_bits = 32,
    + .reg_stride = 4,
    + .val_bits = 32,
    + .can_multi_write = false,
    + /* the mdio lock is used by any user of this mdio driver */
    + .disable_locking = true,
    +
    + .cache_type = REGCACHE_NONE,
    +};
    +
    static int
    ipq8064_mdio_probe(struct platform_device *pdev)
    {
    struct device_node *np = pdev->dev.of_node;
    struct ipq8064_mdio *priv;
    + struct resource res;
    struct mii_bus *bus;
    + void __iomem *base;
    int ret;

    + if (of_address_to_resource(np, 0, &res))
    + return -ENOMEM;
    +
    + base = ioremap(res.start, resource_size(&res));
    + if (!base)
    + return -ENOMEM;
    +
    bus = devm_mdiobus_alloc_size(&pdev->dev, sizeof(*priv));
    if (!bus)
    return -ENOMEM;
    @@ -115,15 +135,10 @@ ipq8064_mdio_probe(struct platform_device *pdev)
    bus->parent = &pdev->dev;

    priv = bus->priv;
    - priv->base = device_node_to_regmap(np);
    - if (IS_ERR(priv->base)) {
    - if (priv->base == ERR_PTR(-EPROBE_DEFER))
    - return -EPROBE_DEFER;
    -
    - dev_err(&pdev->dev, "error getting device regmap, error=%pe\n",
    - priv->base);
    + priv->base = devm_regmap_init_mmio(&pdev->dev, base,
    + &ipq8064_mdio_regmap_config);
    + if (IS_ERR(priv->base))
    return PTR_ERR(priv->base);
    - }

    ret = of_mdiobus_register(bus, np);
    if (ret)
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-06 14:11    [W:4.174 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site