| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 14 Apr 2020 20:15:27 +0200
From: Robert Marko <robert.marko@...tura.hr>
To: Heiner Kallweit <hkallweit1@...il.com>
Cc: Andrew Lunn <andrew@...n.ch>, f.fainelli@...il.com,
linux@...linux.org.uk, linux-kernel@...r.kernel.org,
netdev@...r.kernel.org, Andy Gross <agross@...nel.org>,
Bjorn Andersson <bjorn.andersson@...aro.org>,
robh+dt@...nel.org, Mark Rutland <mark.rutland@....com>,
linux-arm-msm <linux-arm-msm@...r.kernel.org>,
devicetree@...r.kernel.org,
Christian Lamparter <chunkeey@...il.com>,
Luka Perkov <luka.perkov@...tura.hr>
Subject: Re: [PATCH 1/3] net: phy: mdio: add IPQ40xx MDIO driver
On Mon, Apr 13, 2020 at 7:18 PM Heiner Kallweit <hkallweit1@...il.com> wrote:
>
> On 13.04.2020 19:01, Robert Marko wrote:
> > This patch adds the driver for the MDIO interface
> > inside of Qualcomm IPQ40xx series SoC-s.
> >
> > Signed-off-by: Christian Lamparter <chunkeey@...il.com>
> > Signed-off-by: Robert Marko <robert.marko@...tura.hr>
> > Cc: Luka Perkov <luka.perkov@...tura.hr>
> > ---
> > drivers/net/phy/Kconfig | 7 ++
> > drivers/net/phy/Makefile | 1 +
> > drivers/net/phy/mdio-ipq40xx.c | 180 +++++++++++++++++++++++++++++++++
> > 3 files changed, 188 insertions(+)
> > create mode 100644 drivers/net/phy/mdio-ipq40xx.c
> >
> > diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
> > index 9dabe03a668c..614d08635012 100644
> > --- a/drivers/net/phy/Kconfig
> > +++ b/drivers/net/phy/Kconfig
> > @@ -157,6 +157,13 @@ config MDIO_I2C
> >
> > This is library mode.
> >
> > +config MDIO_IPQ40XX
> > + tristate "Qualcomm IPQ40xx MDIO interface"
> > + depends on HAS_IOMEM && OF
> > + help
> > + This driver supports the MDIO interface found in Qualcomm
> > + IPQ40xx series Soc-s.
> > +
> > config MDIO_MOXART
> > tristate "MOXA ART MDIO interface support"
> > depends on ARCH_MOXART || COMPILE_TEST
> > diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
> > index fe5badf13b65..c89fc187fd74 100644
> > --- a/drivers/net/phy/Makefile
> > +++ b/drivers/net/phy/Makefile
> > @@ -36,6 +36,7 @@ obj-$(CONFIG_MDIO_CAVIUM) += mdio-cavium.o
> > obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o
> > obj-$(CONFIG_MDIO_HISI_FEMAC) += mdio-hisi-femac.o
> > obj-$(CONFIG_MDIO_I2C) += mdio-i2c.o
> > +obj-$(CONFIG_MDIO_IPQ40XX) += mdio-ipq40xx.o
> > obj-$(CONFIG_MDIO_MOXART) += mdio-moxart.o
> > obj-$(CONFIG_MDIO_MSCC_MIIM) += mdio-mscc-miim.o
> > obj-$(CONFIG_MDIO_OCTEON) += mdio-octeon.o
> > diff --git a/drivers/net/phy/mdio-ipq40xx.c b/drivers/net/phy/mdio-ipq40xx.c
> > new file mode 100644
> > index 000000000000..8068f1e6a077
> > --- /dev/null
> > +++ b/drivers/net/phy/mdio-ipq40xx.c
> > @@ -0,0 +1,180 @@
> > +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
> > +/* Copyright (c) 2015, The Linux Foundation. All rights reserved. */
> > +
> > +#include <linux/delay.h>
> > +#include <linux/kernel.h>
> > +#include <linux/module.h>
> > +#include <linux/mutex.h>
> > +#include <linux/io.h>
> > +#include <linux/of_address.h>
> > +#include <linux/of_mdio.h>
> > +#include <linux/phy.h>
> > +#include <linux/platform_device.h>
> > +
> > +#define MDIO_CTRL_0_REG 0x40
> > +#define MDIO_CTRL_1_REG 0x44
> > +#define MDIO_CTRL_2_REG 0x48
> > +#define MDIO_CTRL_3_REG 0x4c
> > +#define MDIO_CTRL_4_REG 0x50
> > +#define MDIO_CTRL_4_ACCESS_BUSY BIT(16)
> > +#define MDIO_CTRL_4_ACCESS_START BIT(8)
> > +#define MDIO_CTRL_4_ACCESS_CODE_READ 0
> > +#define MDIO_CTRL_4_ACCESS_CODE_WRITE 1
> > +#define CTRL_0_REG_DEFAULT_VALUE 0x150FF
> > +
> > +#define IPQ40XX_MDIO_RETRY 1000
> > +#define IPQ40XX_MDIO_DELAY 10
> > +
> > +struct ipq40xx_mdio_data {
> > + struct mii_bus *mii_bus;
> > + void __iomem *membase;
> > + struct device *dev;
> > +};
> > +
> > +static int ipq40xx_mdio_wait_busy(struct ipq40xx_mdio_data *am)
> > +{
> > + int i;
> > +
> > + for (i = 0; i < IPQ40XX_MDIO_RETRY; i++) {
> > + unsigned int busy;
> > +
> > + busy = readl(am->membase + MDIO_CTRL_4_REG) &
> > + MDIO_CTRL_4_ACCESS_BUSY;
> > + if (!busy)
> > + return 0;
> > +
> > + /* BUSY might take to be cleard by 15~20 times of loop */
> > + udelay(IPQ40XX_MDIO_DELAY);
> > + }
> > +
> > + dev_err(am->dev, "%s: MDIO operation timed out\n", am->mii_bus->name);
> > +
> > + return -ETIMEDOUT;
> > +}
> > +
> > +static int ipq40xx_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
> > +{
> > + struct ipq40xx_mdio_data *am = bus->priv;
> > + int value = 0;
> > + unsigned int cmd = 0;
> > +
> > + lockdep_assert_held(&bus->mdio_lock);
> > +
> > + if (ipq40xx_mdio_wait_busy(am))
> > + return -ETIMEDOUT;
> > +
> > + /* issue the phy address and reg */
> > + writel((mii_id << 8) | regnum, am->membase + MDIO_CTRL_1_REG);
> > +
> > + cmd = MDIO_CTRL_4_ACCESS_START | MDIO_CTRL_4_ACCESS_CODE_READ;
> > +
> > + /* issue read command */
> > + writel(cmd, am->membase + MDIO_CTRL_4_REG);
> > +
> > + /* Wait read complete */
> > + if (ipq40xx_mdio_wait_busy(am))
> > + return -ETIMEDOUT;
> > +
> > + /* Read data */
> > + value = readl(am->membase + MDIO_CTRL_3_REG);
> > +
> > + return value;
> > +}
> > +
> > +static int ipq40xx_mdio_write(struct mii_bus *bus, int mii_id, int regnum,
> > + u16 value)
> > +{
> > + struct ipq40xx_mdio_data *am = bus->priv;
> > + unsigned int cmd = 0;
> > +
> > + lockdep_assert_held(&bus->mdio_lock);
> > +
> > + if (ipq40xx_mdio_wait_busy(am))
> > + return -ETIMEDOUT;
> > +
> > + /* issue the phy address and reg */
> > + writel((mii_id << 8) | regnum, am->membase + MDIO_CTRL_1_REG);
> > +
> > + /* issue write data */
> > + writel(value, am->membase + MDIO_CTRL_2_REG);
> > +
> > + cmd = MDIO_CTRL_4_ACCESS_START | MDIO_CTRL_4_ACCESS_CODE_WRITE;
> > + /* issue write command */
> > + writel(cmd, am->membase + MDIO_CTRL_4_REG);
> > +
> > + /* Wait write complete */
> > + if (ipq40xx_mdio_wait_busy(am))
> > + return -ETIMEDOUT;
> > +
> > + return 0;
> > +}
> > +
> > +static int ipq40xx_mdio_probe(struct platform_device *pdev)
> > +{
> > + struct ipq40xx_mdio_data *am;
> > + struct resource *res;
> > +
> > + am = devm_kzalloc(&pdev->dev, sizeof(*am), GFP_KERNEL);
> > + if (!am)
> > + return -ENOMEM;
> > +
> > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > + if (!res) {
> > + dev_err(&pdev->dev, "no iomem resource found\n");
> > + return -ENXIO;
> > + }
> > +
> > + am->membase = devm_ioremap_resource(&pdev->dev, res);
>
> You can use devm_platform_ioremap_resource() here.
Thanks, its now used in v2.
>
> > + if (IS_ERR(am->membase)) {
> > + dev_err(&pdev->dev, "unable to ioremap registers\n");
> > + return PTR_ERR(am->membase);
> > + }
> > +
> > + am->mii_bus = devm_mdiobus_alloc(&pdev->dev);
> > + if (!am->mii_bus)
> > + return -ENOMEM;
> > +
>
> You could use devm_mdiobus_alloc_size() and omit allocating am
> separately.
Thanks, I switched to it in v2 along some other improvements.
>
> > + writel(CTRL_0_REG_DEFAULT_VALUE, am->membase + MDIO_CTRL_0_REG);
> > +
> > + am->mii_bus->name = "ipq40xx_mdio";
> > + am->mii_bus->read = ipq40xx_mdio_read;
> > + am->mii_bus->write = ipq40xx_mdio_write;
> > + am->mii_bus->priv = am;
> > + am->mii_bus->parent = &pdev->dev;
> > + snprintf(am->mii_bus->id, MII_BUS_ID_SIZE, "%s", dev_name(&pdev->dev));
> > +
> > + am->dev = &pdev->dev;
> > + platform_set_drvdata(pdev, am);
> > +
> > + return of_mdiobus_register(am->mii_bus, pdev->dev.of_node);
> > +}
> > +
> > +static int ipq40xx_mdio_remove(struct platform_device *pdev)
> > +{
> > + struct ipq40xx_mdio_data *am = platform_get_drvdata(pdev);
> > +
> > + mdiobus_unregister(am->mii_bus);
> > +
> > + return 0;
> > +}
> > +
> > +static const struct of_device_id ipq40xx_mdio_dt_ids[] = {
> > + { .compatible = "qcom,ipq40xx-mdio" },
> > + { }
> > +};
> > +MODULE_DEVICE_TABLE(of, ipq40xx_mdio_dt_ids);
> > +
> > +static struct platform_driver ipq40xx_mdio_driver = {
> > + .probe = ipq40xx_mdio_probe,
> > + .remove = ipq40xx_mdio_remove,
> > + .driver = {
> > + .name = "ipq40xx-mdio",
> > + .of_match_table = ipq40xx_mdio_dt_ids,
> > + },
> > +};
> > +
> > +module_platform_driver(ipq40xx_mdio_driver);
> > +
> > +MODULE_DESCRIPTION("IPQ40XX MDIO interface driver");
> > +MODULE_AUTHOR("Qualcomm Atheros");
> > +MODULE_LICENSE("Dual BSD/GPL");
> >
>
Powered by blists - more mailing lists