* [PATCH v2 1/3] net: phy: mdio: add IPQ40xx MDIO driver
@ 2020-04-14 18:10 Robert Marko
2020-04-14 18:10 ` [PATCH v2 2/3] dt-bindings: add Qualcomm IPQ4019 MDIO bindings Robert Marko
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Robert Marko @ 2020-04-14 18:10 UTC (permalink / raw)
To: andrew, f.fainelli, hkallweit1, linux, linux-kernel, netdev,
agross, bjorn.andersson, robh+dt, mark.rutland, linux-arm-msm,
devicetree
Cc: Robert Marko, Christian Lamparter, Luka Perkov
This patch adds the driver for the MDIO interface
inside of Qualcomm IPQ40xx series SoC-s.
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Robert Marko <robert.marko@sartura.hr>
Cc: Luka Perkov <luka.perkov@sartura.hr>
---
Changes from v1 to v2:
* Remove magic default value
* Remove lockdep_assert_held
* Add C45 check
* Simplify the driver
* Drop device and mii_bus structs from private struct
* Use devm_mdiobus_alloc_size()
drivers/net/phy/Kconfig | 7 ++
drivers/net/phy/Makefile | 1 +
drivers/net/phy/mdio-ipq40xx.c | 176 +++++++++++++++++++++++++++++++++
3 files changed, 184 insertions(+)
create mode 100644 drivers/net/phy/mdio-ipq40xx.c
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 3fa33d27eeba..815d52fa6080 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_IPQ8064
tristate "Qualcomm IPQ8064 MDIO interface support"
depends on HAS_IOMEM && OF_MDIO
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index 2f5c7093a65b..36aafc6128c4 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -37,6 +37,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_IPQ8064) += mdio-ipq8064.o
obj-$(CONFIG_MDIO_MOXART) += mdio-moxart.o
obj-$(CONFIG_MDIO_MSCC_MIIM) += mdio-mscc-miim.o
diff --git a/drivers/net/phy/mdio-ipq40xx.c b/drivers/net/phy/mdio-ipq40xx.c
new file mode 100644
index 000000000000..d8c11c621f20
--- /dev/null
+++ b/drivers/net/phy/mdio-ipq40xx.c
@@ -0,0 +1,176 @@
+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+/* Copyright (c) 2015, The Linux Foundation. All rights reserved. */
+/* Copyright (c) 2020 Sartura Ltd. */
+
+#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 IPQ40XX_MDIO_RETRY 1000
+#define IPQ40XX_MDIO_DELAY 10
+
+struct ipq40xx_mdio_data {
+ void __iomem *membase;
+};
+
+static int ipq40xx_mdio_wait_busy(struct mii_bus *bus)
+{
+ struct ipq40xx_mdio_data *priv = bus->priv;
+ int i;
+
+ for (i = 0; i < IPQ40XX_MDIO_RETRY; i++) {
+ unsigned int busy;
+
+ busy = readl(priv->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(bus->parent, "MDIO operation timed out\n");
+
+ return -ETIMEDOUT;
+}
+
+static int ipq40xx_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
+{
+ struct ipq40xx_mdio_data *priv = bus->priv;
+ int value = 0;
+ unsigned int cmd = 0;
+
+ /* Reject clause 45 */
+ if (regnum & MII_ADDR_C45)
+ return -EOPNOTSUPP;
+
+ if (ipq40xx_mdio_wait_busy(bus))
+ return -ETIMEDOUT;
+
+ /* issue the phy address and reg */
+ writel((mii_id << 8) | regnum, priv->membase + MDIO_CTRL_1_REG);
+
+ cmd = MDIO_CTRL_4_ACCESS_START | MDIO_CTRL_4_ACCESS_CODE_READ;
+
+ /* issue read command */
+ writel(cmd, priv->membase + MDIO_CTRL_4_REG);
+
+ /* Wait read complete */
+ if (ipq40xx_mdio_wait_busy(bus))
+ return -ETIMEDOUT;
+
+ /* Read data */
+ value = readl(priv->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 *priv = bus->priv;
+ unsigned int cmd = 0;
+
+ /* Reject clause 45 */
+ if (regnum & MII_ADDR_C45)
+ return -EOPNOTSUPP;
+
+ if (ipq40xx_mdio_wait_busy(bus))
+ return -ETIMEDOUT;
+
+ /* issue the phy address and reg */
+ writel((mii_id << 8) | regnum, priv->membase + MDIO_CTRL_1_REG);
+
+ /* issue write data */
+ writel(value, priv->membase + MDIO_CTRL_2_REG);
+
+ cmd = MDIO_CTRL_4_ACCESS_START | MDIO_CTRL_4_ACCESS_CODE_WRITE;
+ /* issue write command */
+ writel(cmd, priv->membase + MDIO_CTRL_4_REG);
+
+ /* Wait write complete */
+ if (ipq40xx_mdio_wait_busy(bus))
+ return -ETIMEDOUT;
+
+ return 0;
+}
+
+static int ipq40xx_mdio_probe(struct platform_device *pdev)
+{
+ struct ipq40xx_mdio_data *priv;
+ struct mii_bus *bus;
+ int ret;
+
+ bus = devm_mdiobus_alloc_size(&pdev->dev, sizeof(*priv));
+ if (!bus)
+ return -ENOMEM;
+
+ priv = bus->priv;
+
+ priv->membase = devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR(priv->membase))
+ return PTR_ERR(priv->membase);
+
+ bus->name = "ipq40xx_mdio";
+ bus->read = ipq40xx_mdio_read;
+ bus->write = ipq40xx_mdio_write;
+ bus->parent = &pdev->dev;
+ snprintf(bus->id, MII_BUS_ID_SIZE, "%s%d", pdev->name, pdev->id);
+
+ ret = of_mdiobus_register(bus, pdev->dev.of_node);
+ if (ret) {
+ dev_err(&pdev->dev, "Cannot register MDIO bus!\n");
+ return ret;
+ }
+
+ platform_set_drvdata(pdev, bus);
+
+ return 0;
+}
+
+static int ipq40xx_mdio_remove(struct platform_device *pdev)
+{
+ struct mii_bus *bus = platform_get_drvdata(pdev);
+
+ mdiobus_unregister(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");
--
2.26.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 2/3] dt-bindings: add Qualcomm IPQ4019 MDIO bindings
2020-04-14 18:10 [PATCH v2 1/3] net: phy: mdio: add IPQ40xx MDIO driver Robert Marko
@ 2020-04-14 18:10 ` Robert Marko
2020-04-14 21:11 ` Florian Fainelli
2020-04-14 18:10 ` [PATCH v2 3/3] dts: ipq4019: add MDIO node Robert Marko
` (3 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Robert Marko @ 2020-04-14 18:10 UTC (permalink / raw)
To: andrew, f.fainelli, hkallweit1, linux, linux-kernel, netdev,
agross, bjorn.andersson, robh+dt, mark.rutland, linux-arm-msm,
devicetree
Cc: Robert Marko, Luka Perkov
This patch adds the binding document for the IPQ40xx MDIO driver.
Signed-off-by: Robert Marko <robert.marko@sartura.hr>
Cc: Luka Perkov <luka.perkov@sartura.hr>
---
.../bindings/net/qcom,ipq40xx-mdio.yaml | 62 +++++++++++++++++++
1 file changed, 62 insertions(+)
create mode 100644 Documentation/devicetree/bindings/net/qcom,ipq40xx-mdio.yaml
diff --git a/Documentation/devicetree/bindings/net/qcom,ipq40xx-mdio.yaml b/Documentation/devicetree/bindings/net/qcom,ipq40xx-mdio.yaml
new file mode 100644
index 000000000000..3e2ccf417fb6
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/qcom,ipq40xx-mdio.yaml
@@ -0,0 +1,62 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/qcom,ipq40xx-mdio.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm IPQ40xx MDIO Controller Device Tree Bindings
+
+maintainers:
+ - Robert Marko <robert.marko@sartura.hr>
+
+allOf:
+ - $ref: "mdio.yaml#"
+
+properties:
+ compatible:
+ const: qcom,ipq40xx-mdio
+
+ "#address-cells":
+ const: 1
+
+ "#size-cells":
+ const: 0
+
+ reg:
+ maxItems: 1
+
+required:
+ - compatible
+ - reg
+ - "#address-cells"
+ - "#size-cells"
+
+examples:
+ - |
+ mdio@90000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "qcom,ipq40xx-mdio";
+ reg = <0x90000 0x64>;
+ status = "disabled";
+
+ ethphy0: ethernet-phy@0 {
+ reg = <0>;
+ };
+
+ ethphy1: ethernet-phy@1 {
+ reg = <1>;
+ };
+
+ ethphy2: ethernet-phy@2 {
+ reg = <2>;
+ };
+
+ ethphy3: ethernet-phy@3 {
+ reg = <3>;
+ };
+
+ ethphy4: ethernet-phy@4 {
+ reg = <4>;
+ };
+ };
--
2.26.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 3/3] dts: ipq4019: add MDIO node
2020-04-14 18:10 [PATCH v2 1/3] net: phy: mdio: add IPQ40xx MDIO driver Robert Marko
2020-04-14 18:10 ` [PATCH v2 2/3] dt-bindings: add Qualcomm IPQ4019 MDIO bindings Robert Marko
@ 2020-04-14 18:10 ` Robert Marko
2020-04-14 21:13 ` Florian Fainelli
2020-04-14 18:43 ` [PATCH v2 1/3] net: phy: mdio: add IPQ40xx MDIO driver Andrew Lunn
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Robert Marko @ 2020-04-14 18:10 UTC (permalink / raw)
To: andrew, f.fainelli, hkallweit1, linux, linux-kernel, netdev,
agross, bjorn.andersson, robh+dt, mark.rutland, linux-arm-msm,
devicetree
Cc: Robert Marko, Christian Lamparter, Luka Perkov
This patch adds the necessary MDIO interface node
to the Qualcomm IPQ4019 DTSI.
Built-in QCA8337N switch is managed using it,
and since we have a driver for it lets add it.
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Robert Marko <robert.marko@sartura.hr>
Cc: Luka Perkov <luka.perkov@sartura.hr>
---
arch/arm/boot/dts/qcom-ipq4019.dtsi | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi
index b4803a428340..80d0a69e9fed 100644
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
@@ -578,6 +578,34 @@ wifi1: wifi@a800000 {
status = "disabled";
};
+ mdio: mdio@90000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "qcom,ipq40xx-mdio";
+ reg = <0x90000 0x64>;
+ status = "disabled";
+
+ ethphy0: ethernet-phy@0 {
+ reg = <0>;
+ };
+
+ ethphy1: ethernet-phy@1 {
+ reg = <1>;
+ };
+
+ ethphy2: ethernet-phy@2 {
+ reg = <2>;
+ };
+
+ ethphy3: ethernet-phy@3 {
+ reg = <3>;
+ };
+
+ ethphy4: ethernet-phy@4 {
+ reg = <4>;
+ };
+ };
+
usb3_ss_phy: ssphy@9a000 {
compatible = "qcom,usb-ss-ipq4019-phy";
#phy-cells = <0>;
--
2.26.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v2 1/3] net: phy: mdio: add IPQ40xx MDIO driver
2020-04-14 18:10 [PATCH v2 1/3] net: phy: mdio: add IPQ40xx MDIO driver Robert Marko
2020-04-14 18:10 ` [PATCH v2 2/3] dt-bindings: add Qualcomm IPQ4019 MDIO bindings Robert Marko
2020-04-14 18:10 ` [PATCH v2 3/3] dts: ipq4019: add MDIO node Robert Marko
@ 2020-04-14 18:43 ` Andrew Lunn
2020-04-14 21:17 ` Florian Fainelli
2020-04-15 9:33 ` Russell King - ARM Linux admin
4 siblings, 0 replies; 11+ messages in thread
From: Andrew Lunn @ 2020-04-14 18:43 UTC (permalink / raw)
To: Robert Marko
Cc: f.fainelli, hkallweit1, linux, linux-kernel, netdev, agross,
bjorn.andersson, robh+dt, mark.rutland, linux-arm-msm,
devicetree, Christian Lamparter, Luka Perkov
Hi Robert
This is looking better
> +#include <linux/delay.h>
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/mutex.h>
I don't think you need this header. There are no mutexes here.
> +#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
So your next version will hopefully have better names.
> +static int ipq40xx_mdio_wait_busy(struct mii_bus *bus)
> +{
> + struct ipq40xx_mdio_data *priv = bus->priv;
> + int i;
> +
> + for (i = 0; i < IPQ40XX_MDIO_RETRY; i++) {
> + unsigned int busy;
> +
> + busy = readl(priv->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(bus->parent, "MDIO operation timed out\n");
> +
> + return -ETIMEDOUT;
> +}
You can probably make use of include/linux/iopoll.h
Andrew
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 2/3] dt-bindings: add Qualcomm IPQ4019 MDIO bindings
2020-04-14 18:10 ` [PATCH v2 2/3] dt-bindings: add Qualcomm IPQ4019 MDIO bindings Robert Marko
@ 2020-04-14 21:11 ` Florian Fainelli
2020-04-15 8:52 ` Robert Marko
0 siblings, 1 reply; 11+ messages in thread
From: Florian Fainelli @ 2020-04-14 21:11 UTC (permalink / raw)
To: Robert Marko, andrew, hkallweit1, linux, linux-kernel, netdev,
agross, bjorn.andersson, robh+dt, mark.rutland, linux-arm-msm,
devicetree
Cc: Luka Perkov
On 4/14/2020 11:10 AM, Robert Marko wrote:
> This patch adds the binding document for the IPQ40xx MDIO driver.
>
> Signed-off-by: Robert Marko <robert.marko@sartura.hr>
> Cc: Luka Perkov <luka.perkov@sartura.hr>
> ---
[snip]
> +examples:
> + - |
> + mdio@90000 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "qcom,ipq40xx-mdio";
> + reg = <0x90000 0x64>;
> + status = "disabled";
I believe the preference is to not put status properties in examples.
Other than that:
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
--
Florian
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 3/3] dts: ipq4019: add MDIO node
2020-04-14 18:10 ` [PATCH v2 3/3] dts: ipq4019: add MDIO node Robert Marko
@ 2020-04-14 21:13 ` Florian Fainelli
2020-04-15 8:51 ` Robert Marko
0 siblings, 1 reply; 11+ messages in thread
From: Florian Fainelli @ 2020-04-14 21:13 UTC (permalink / raw)
To: Robert Marko, andrew, hkallweit1, linux, linux-kernel, netdev,
agross, bjorn.andersson, robh+dt, mark.rutland, linux-arm-msm,
devicetree
Cc: Christian Lamparter, Luka Perkov
On 4/14/2020 11:10 AM, Robert Marko wrote:
> This patch adds the necessary MDIO interface node
> to the Qualcomm IPQ4019 DTSI.
>
> Built-in QCA8337N switch is managed using it,
> and since we have a driver for it lets add it.
>
> Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
> Signed-off-by: Robert Marko <robert.marko@sartura.hr>
> Cc: Luka Perkov <luka.perkov@sartura.hr>
> ---
> arch/arm/boot/dts/qcom-ipq4019.dtsi | 28 ++++++++++++++++++++++++++++
> 1 file changed, 28 insertions(+)
Earlier contributions to that file seem to suggest that the preferred
subject is:
ARM: dts: qcom: <subject>
--
Florian
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 1/3] net: phy: mdio: add IPQ40xx MDIO driver
2020-04-14 18:10 [PATCH v2 1/3] net: phy: mdio: add IPQ40xx MDIO driver Robert Marko
` (2 preceding siblings ...)
2020-04-14 18:43 ` [PATCH v2 1/3] net: phy: mdio: add IPQ40xx MDIO driver Andrew Lunn
@ 2020-04-14 21:17 ` Florian Fainelli
2020-04-15 9:33 ` Russell King - ARM Linux admin
4 siblings, 0 replies; 11+ messages in thread
From: Florian Fainelli @ 2020-04-14 21:17 UTC (permalink / raw)
To: Robert Marko, andrew, hkallweit1, linux, linux-kernel, netdev,
agross, bjorn.andersson, robh+dt, mark.rutland, linux-arm-msm,
devicetree
Cc: Christian Lamparter, Luka Perkov
On 4/14/2020 11:10 AM, 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@gmail.com>
> Signed-off-by: Robert Marko <robert.marko@sartura.hr>
> Cc: Luka Perkov <luka.perkov@sartura.hr>
> ---
> Changes from v1 to v2:
> * Remove magic default value
> * Remove lockdep_assert_held
> * Add C45 check
> * Simplify the driver
> * Drop device and mii_bus structs from private struct
> * Use devm_mdiobus_alloc_size()
>
> drivers/net/phy/Kconfig | 7 ++
> drivers/net/phy/Makefile | 1 +
> drivers/net/phy/mdio-ipq40xx.c | 176 +++++++++++++++++++++++++++++++++
> 3 files changed, 184 insertions(+)
> create mode 100644 drivers/net/phy/mdio-ipq40xx.c
>
> diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
> index 3fa33d27eeba..815d52fa6080 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
You can drop the OF dependency here, of_mdiobus_register() becomes
mdiobus_register() with CONFIG_OF=n.
[snip]
> +static int ipq40xx_mdio_wait_busy(struct mii_bus *bus)
> +{
> + struct ipq40xx_mdio_data *priv = bus->priv;
> + int i;
> +
> + for (i = 0; i < IPQ40XX_MDIO_RETRY; i++) {
> + unsigned int busy;
> +
> + busy = readl(priv->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 */
typo: cleard instead of cleared.
> + udelay(IPQ40XX_MDIO_DELAY);
> + }
consider using readl_poll_timeout() for this loop.
With that fixed:
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
--
Florian
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 3/3] dts: ipq4019: add MDIO node
2020-04-14 21:13 ` Florian Fainelli
@ 2020-04-15 8:51 ` Robert Marko
0 siblings, 0 replies; 11+ messages in thread
From: Robert Marko @ 2020-04-15 8:51 UTC (permalink / raw)
To: Florian Fainelli
Cc: Andrew Lunn, Heiner Kallweit, linux, linux-kernel, netdev,
Andy Gross, Bjorn Andersson, robh+dt, Mark Rutland,
linux-arm-msm, devicetree, Christian Lamparter, Luka Perkov
On Tue, Apr 14, 2020 at 11:13 PM Florian Fainelli <f.fainelli@gmail.com> wrote:
>
>
>
> On 4/14/2020 11:10 AM, Robert Marko wrote:
> > This patch adds the necessary MDIO interface node
> > to the Qualcomm IPQ4019 DTSI.
> >
> > Built-in QCA8337N switch is managed using it,
> > and since we have a driver for it lets add it.
> >
> > Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
> > Signed-off-by: Robert Marko <robert.marko@sartura.hr>
> > Cc: Luka Perkov <luka.perkov@sartura.hr>
> > ---
> > arch/arm/boot/dts/qcom-ipq4019.dtsi | 28 ++++++++++++++++++++++++++++
> > 1 file changed, 28 insertions(+)
>
> Earlier contributions to that file seem to suggest that the preferred
> subject is:
>
> ARM: dts: qcom: <subject>
Will be changed in v3.
Thanks
> --
> Florian
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 2/3] dt-bindings: add Qualcomm IPQ4019 MDIO bindings
2020-04-14 21:11 ` Florian Fainelli
@ 2020-04-15 8:52 ` Robert Marko
0 siblings, 0 replies; 11+ messages in thread
From: Robert Marko @ 2020-04-15 8:52 UTC (permalink / raw)
To: Florian Fainelli
Cc: Andrew Lunn, Heiner Kallweit, linux, linux-kernel, netdev,
Andy Gross, Bjorn Andersson, robh+dt, Mark Rutland,
linux-arm-msm, devicetree, Luka Perkov
On Tue, Apr 14, 2020 at 11:11 PM Florian Fainelli <f.fainelli@gmail.com> wrote:
>
>
>
> On 4/14/2020 11:10 AM, Robert Marko wrote:
> > This patch adds the binding document for the IPQ40xx MDIO driver.
> >
> > Signed-off-by: Robert Marko <robert.marko@sartura.hr>
> > Cc: Luka Perkov <luka.perkov@sartura.hr>
> > ---
>
> [snip]
>
> > +examples:
> > + - |
> > + mdio@90000 {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > + compatible = "qcom,ipq40xx-mdio";
> > + reg = <0x90000 0x64>;
> > + status = "disabled";
>
> I believe the preference is to not put status properties in examples.
> Other than that:
Will be changed in v3.
Thanks
>
> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
> --
> Florian
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 1/3] net: phy: mdio: add IPQ40xx MDIO driver
2020-04-14 18:10 [PATCH v2 1/3] net: phy: mdio: add IPQ40xx MDIO driver Robert Marko
` (3 preceding siblings ...)
2020-04-14 21:17 ` Florian Fainelli
@ 2020-04-15 9:33 ` Russell King - ARM Linux admin
2020-04-15 15:07 ` Robert Marko
4 siblings, 1 reply; 11+ messages in thread
From: Russell King - ARM Linux admin @ 2020-04-15 9:33 UTC (permalink / raw)
To: Robert Marko
Cc: andrew, f.fainelli, hkallweit1, linux-kernel, netdev, agross,
bjorn.andersson, robh+dt, mark.rutland, linux-arm-msm,
devicetree, Christian Lamparter, Luka Perkov
On Tue, Apr 14, 2020 at 08:10:11PM +0200, Robert Marko wrote:
> diff --git a/drivers/net/phy/mdio-ipq40xx.c b/drivers/net/phy/mdio-ipq40xx.c
> new file mode 100644
> index 000000000000..d8c11c621f20
> --- /dev/null
> +++ b/drivers/net/phy/mdio-ipq40xx.c
> @@ -0,0 +1,176 @@
> +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
> +/* Copyright (c) 2015, The Linux Foundation. All rights reserved. */
> +/* Copyright (c) 2020 Sartura Ltd. */
> +
> +#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>
> +
Looking at how these registers are used, they could be renamed:
> +#define MDIO_CTRL_0_REG 0x40
This seems to be unused.
> +#define MDIO_CTRL_1_REG 0x44
MDIO_ADDR_REG
> +#define MDIO_CTRL_2_REG 0x48
MDIO_DATA_WRITE_REG
> +#define MDIO_CTRL_3_REG 0x4c
MDIO_DATA_READ_REG
> +#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
MDIO_CMD_* ?
> +
> +#define IPQ40XX_MDIO_RETRY 1000
> +#define IPQ40XX_MDIO_DELAY 10
> +
> +struct ipq40xx_mdio_data {
> + void __iomem *membase;
> +};
> +
> +static int ipq40xx_mdio_wait_busy(struct mii_bus *bus)
> +{
> + struct ipq40xx_mdio_data *priv = bus->priv;
> + int i;
> +
> + for (i = 0; i < IPQ40XX_MDIO_RETRY; i++) {
> + unsigned int busy;
> +
> + busy = readl(priv->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(bus->parent, "MDIO operation timed out\n");
> +
> + return -ETIMEDOUT;
> +}
> +
> +static int ipq40xx_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
> +{
> + struct ipq40xx_mdio_data *priv = bus->priv;
> + int value = 0;
> + unsigned int cmd = 0;
No need to initialise either of these, and you can eliminate "value"
which will then satisfy davem's requirement for reverse-christmas-tree
ordering of variable declarations.
> +
> + /* Reject clause 45 */
> + if (regnum & MII_ADDR_C45)
> + return -EOPNOTSUPP;
> +
> + if (ipq40xx_mdio_wait_busy(bus))
> + return -ETIMEDOUT;
> +
> + /* issue the phy address and reg */
> + writel((mii_id << 8) | regnum, priv->membase + MDIO_CTRL_1_REG);
> +
> + cmd = MDIO_CTRL_4_ACCESS_START | MDIO_CTRL_4_ACCESS_CODE_READ;
> +
> + /* issue read command */
> + writel(cmd, priv->membase + MDIO_CTRL_4_REG);
> +
> + /* Wait read complete */
> + if (ipq40xx_mdio_wait_busy(bus))
> + return -ETIMEDOUT;
> +
> + /* Read data */
> + value = readl(priv->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 *priv = bus->priv;
> + unsigned int cmd = 0;
No need to initialise cmd.
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 10.2Mbps down 587kbps up
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 1/3] net: phy: mdio: add IPQ40xx MDIO driver
2020-04-15 9:33 ` Russell King - ARM Linux admin
@ 2020-04-15 15:07 ` Robert Marko
0 siblings, 0 replies; 11+ messages in thread
From: Robert Marko @ 2020-04-15 15:07 UTC (permalink / raw)
To: Russell King - ARM Linux admin
Cc: Andrew Lunn, Florian Fainelli, Heiner Kallweit, linux-kernel,
netdev, Andy Gross, Bjorn Andersson, robh+dt, Mark Rutland,
linux-arm-msm, devicetree, Christian Lamparter, Luka Perkov
I have sent a v3.
I tried to incorporate all of your remarks there.
Thanks
Robert
On Wed, Apr 15, 2020 at 11:33 AM Russell King - ARM Linux admin
<linux@armlinux.org.uk> wrote:
>
> On Tue, Apr 14, 2020 at 08:10:11PM +0200, Robert Marko wrote:
> > diff --git a/drivers/net/phy/mdio-ipq40xx.c b/drivers/net/phy/mdio-ipq40xx.c
> > new file mode 100644
> > index 000000000000..d8c11c621f20
> > --- /dev/null
> > +++ b/drivers/net/phy/mdio-ipq40xx.c
> > @@ -0,0 +1,176 @@
> > +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
> > +/* Copyright (c) 2015, The Linux Foundation. All rights reserved. */
> > +/* Copyright (c) 2020 Sartura Ltd. */
> > +
> > +#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>
> > +
>
> Looking at how these registers are used, they could be renamed:
>
> > +#define MDIO_CTRL_0_REG 0x40
>
> This seems to be unused.
>
> > +#define MDIO_CTRL_1_REG 0x44
>
> MDIO_ADDR_REG
>
> > +#define MDIO_CTRL_2_REG 0x48
>
> MDIO_DATA_WRITE_REG
>
> > +#define MDIO_CTRL_3_REG 0x4c
>
> MDIO_DATA_READ_REG
>
> > +#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
>
> MDIO_CMD_* ?
>
> > +
> > +#define IPQ40XX_MDIO_RETRY 1000
> > +#define IPQ40XX_MDIO_DELAY 10
> > +
> > +struct ipq40xx_mdio_data {
> > + void __iomem *membase;
> > +};
> > +
> > +static int ipq40xx_mdio_wait_busy(struct mii_bus *bus)
> > +{
> > + struct ipq40xx_mdio_data *priv = bus->priv;
> > + int i;
> > +
> > + for (i = 0; i < IPQ40XX_MDIO_RETRY; i++) {
> > + unsigned int busy;
> > +
> > + busy = readl(priv->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(bus->parent, "MDIO operation timed out\n");
> > +
> > + return -ETIMEDOUT;
> > +}
> > +
> > +static int ipq40xx_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
> > +{
> > + struct ipq40xx_mdio_data *priv = bus->priv;
> > + int value = 0;
> > + unsigned int cmd = 0;
>
> No need to initialise either of these, and you can eliminate "value"
> which will then satisfy davem's requirement for reverse-christmas-tree
> ordering of variable declarations.
>
> > +
> > + /* Reject clause 45 */
> > + if (regnum & MII_ADDR_C45)
> > + return -EOPNOTSUPP;
> > +
> > + if (ipq40xx_mdio_wait_busy(bus))
> > + return -ETIMEDOUT;
> > +
> > + /* issue the phy address and reg */
> > + writel((mii_id << 8) | regnum, priv->membase + MDIO_CTRL_1_REG);
> > +
> > + cmd = MDIO_CTRL_4_ACCESS_START | MDIO_CTRL_4_ACCESS_CODE_READ;
> > +
> > + /* issue read command */
> > + writel(cmd, priv->membase + MDIO_CTRL_4_REG);
> > +
> > + /* Wait read complete */
> > + if (ipq40xx_mdio_wait_busy(bus))
> > + return -ETIMEDOUT;
> > +
> > + /* Read data */
> > + value = readl(priv->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 *priv = bus->priv;
> > + unsigned int cmd = 0;
>
> No need to initialise cmd.
>
> --
> RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
> FTTC broadband for 0.8mile line in suburbia: sync at 10.2Mbps down 587kbps up
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-04-15 15:07 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-14 18:10 [PATCH v2 1/3] net: phy: mdio: add IPQ40xx MDIO driver Robert Marko
2020-04-14 18:10 ` [PATCH v2 2/3] dt-bindings: add Qualcomm IPQ4019 MDIO bindings Robert Marko
2020-04-14 21:11 ` Florian Fainelli
2020-04-15 8:52 ` Robert Marko
2020-04-14 18:10 ` [PATCH v2 3/3] dts: ipq4019: add MDIO node Robert Marko
2020-04-14 21:13 ` Florian Fainelli
2020-04-15 8:51 ` Robert Marko
2020-04-14 18:43 ` [PATCH v2 1/3] net: phy: mdio: add IPQ40xx MDIO driver Andrew Lunn
2020-04-14 21:17 ` Florian Fainelli
2020-04-15 9:33 ` Russell King - ARM Linux admin
2020-04-15 15:07 ` Robert Marko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.