* [PATCH v4 1/3] phylib: add Davicom PHY support
2018-08-22 18:35 [PATCH v4 0/3] Add Davicom phy + reset-gpios Sam Ravnborg
@ 2018-08-22 18:36 ` Sam Ravnborg
2018-08-22 18:36 ` [PATCH v4 2/3] phylib: add support for reset-gpios Sam Ravnborg
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Sam Ravnborg @ 2018-08-22 18:36 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Based on driver from Linux kernel 4.18.0-rc4
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
drivers/net/phy/Kconfig | 5 ++
drivers/net/phy/Makefile | 1 +
drivers/net/phy/davicom.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 146 insertions(+)
create mode 100644 drivers/net/phy/davicom.c
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index cda752b65..79fb917ee 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -18,6 +18,11 @@ config AT803X_PHY
---help---
Currently supports the AT8030, AT8031 and AT8035 PHYs.
+config DAVICOM_PHY
+ bool "Driver for Davicom PHYs"
+ ---help---
+ Currently supports dm9161e and dm9131
+
config LXT_PHY
bool "Driver for the Intel LXT PHYs"
---help---
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index 30b20f8ee..4424054d9 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -1,6 +1,7 @@
obj-y += phy.o mdio_bus.o
obj-$(CONFIG_AR8327N_PHY) += ar8327.o
obj-$(CONFIG_AT803X_PHY) += at803x.o
+obj-$(CONFIG_DAVICOM_PHY) += davicom.o
obj-$(CONFIG_LXT_PHY) += lxt.o
obj-$(CONFIG_MARVELL_PHY) += marvell.o
obj-$(CONFIG_MICREL_PHY) += micrel.o
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c
new file mode 100644
index 000000000..8a784b1e5
--- /dev/null
+++ b/drivers/net/phy/davicom.c
@@ -0,0 +1,140 @@
+/*
+ * drivers/net/phy/davicom.c
+ *
+ * Driver for Davicom PHYs
+ *
+ * Author: Andy Fleming
+ *
+ * Copyright (c) 2004 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ */
+
+#include <common.h>
+#include <init.h>
+#include <linux/mii.h>
+#include <linux/ethtool.h>
+#include <linux/phy.h>
+
+#define MII_DM9161_SCR 0x10
+#define MII_DM9161_SCR_INIT 0x0610
+#define MII_DM9161_SCR_RMII 0x0100
+
+/* DM9161 Interrupt Register */
+#define MII_DM9161_INTR 0x15
+#define MII_DM9161_INTR_PEND 0x8000
+#define MII_DM9161_INTR_DPLX_MASK 0x0800
+#define MII_DM9161_INTR_SPD_MASK 0x0400
+#define MII_DM9161_INTR_LINK_MASK 0x0200
+#define MII_DM9161_INTR_MASK 0x0100
+#define MII_DM9161_INTR_DPLX_CHANGE 0x0010
+#define MII_DM9161_INTR_SPD_CHANGE 0x0008
+#define MII_DM9161_INTR_LINK_CHANGE 0x0004
+#define MII_DM9161_INTR_INIT 0x0000
+#define MII_DM9161_INTR_STOP \
+(MII_DM9161_INTR_DPLX_MASK | MII_DM9161_INTR_SPD_MASK \
+ | MII_DM9161_INTR_LINK_MASK | MII_DM9161_INTR_MASK)
+
+/* DM9161 10BT Configuration/Status */
+#define MII_DM9161_10BTCSR 0x12
+#define MII_DM9161_10BTCSR_INIT 0x7800
+
+MODULE_DESCRIPTION("Davicom PHY driver");
+MODULE_AUTHOR("Andy Fleming");
+MODULE_LICENSE("GPL");
+
+
+static int dm9161_config_aneg(struct phy_device *phydev)
+{
+ int err;
+
+ /* Isolate the PHY */
+ err = phy_write(phydev, MII_BMCR, BMCR_ISOLATE);
+
+ if (err < 0)
+ return err;
+
+ /* Configure the new settings */
+ err = genphy_config_aneg(phydev);
+
+ if (err < 0)
+ return err;
+
+ return 0;
+}
+
+static int dm9161_config_init(struct phy_device *phydev)
+{
+ int err, temp;
+
+ /* Isolate the PHY */
+ err = phy_write(phydev, MII_BMCR, BMCR_ISOLATE);
+
+ if (err < 0)
+ return err;
+
+ switch (phydev->interface) {
+ case PHY_INTERFACE_MODE_MII:
+ temp = MII_DM9161_SCR_INIT;
+ break;
+ case PHY_INTERFACE_MODE_RMII:
+ temp = MII_DM9161_SCR_INIT | MII_DM9161_SCR_RMII;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ /* Do not bypass the scrambler/descrambler */
+ err = phy_write(phydev, MII_DM9161_SCR, temp);
+ if (err < 0)
+ return err;
+
+ /* Clear 10BTCSR to default */
+ err = phy_write(phydev, MII_DM9161_10BTCSR, MII_DM9161_10BTCSR_INIT);
+
+ if (err < 0)
+ return err;
+
+ /* Reconnect the PHY, and enable Autonegotiation */
+ return phy_write(phydev, MII_BMCR, BMCR_ANENABLE);
+}
+
+static struct phy_driver dm91xx_driver[] = {
+{
+ .phy_id = 0x0181b880,
+ .drv.name = "Davicom DM9161E",
+ .phy_id_mask = 0x0ffffff0,
+ .features = PHY_BASIC_FEATURES,
+ .config_init = dm9161_config_init,
+ .config_aneg = dm9161_config_aneg,
+}, {
+ .phy_id = 0x0181b8b0,
+ .drv.name = "Davicom DM9161B/C",
+ .phy_id_mask = 0x0ffffff0,
+ .features = PHY_BASIC_FEATURES,
+ .config_init = dm9161_config_init,
+ .config_aneg = dm9161_config_aneg,
+}, {
+ .phy_id = 0x0181b8a0,
+ .drv.name = "Davicom DM9161A",
+ .phy_id_mask = 0x0ffffff0,
+ .features = PHY_BASIC_FEATURES,
+ .config_init = dm9161_config_init,
+ .config_aneg = dm9161_config_aneg,
+}, {
+ .phy_id = 0x00181b80,
+ .drv.name = "Davicom DM9131",
+ .phy_id_mask = 0x0ffffff0,
+ .features = PHY_BASIC_FEATURES,
+} };
+
+static int dm9161_init(void)
+{
+ return phy_drivers_register(dm91xx_driver,
+ ARRAY_SIZE(dm91xx_driver));
+}
+fs_initcall(dm9161_init);
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v4 2/3] phylib: add support for reset-gpios
2018-08-22 18:35 [PATCH v4 0/3] Add Davicom phy + reset-gpios Sam Ravnborg
2018-08-22 18:36 ` [PATCH v4 1/3] phylib: add Davicom PHY support Sam Ravnborg
@ 2018-08-22 18:36 ` Sam Ravnborg
2018-08-22 18:36 ` [PATCH v4 3/3] at91sam9263ek: add PHY, miitool etc. to config Sam Ravnborg
2018-08-24 8:03 ` [PATCH v4 0/3] Add Davicom phy + reset-gpios Sascha Hauer
3 siblings, 0 replies; 5+ messages in thread
From: Sam Ravnborg @ 2018-08-22 18:36 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Add minimal support for reset-gpios in the PHY node.
Example DT that uses this:
macb0: ethernet@fffbc000 {
phy-mode = "rmii";
#address-cells = <1>;
#size-cells = <0>;
ethphy0: ethernet-phy@1 {
reg = <3>;
reset-gpios = <&pioE 17 GPIO_ACTIVE_LOW>;
reset-assert-us = <1000>;
reset-deassert-us = <2000>;
};
};
The reset is required to get the Davicom PHY operational on
my proprietary board, and is assumed relevant for other boards too.
The PHY is reset when we read the info from DT,
before the phy_id is retreived.
The bindings are documented in dts/Bindings/net/phy.txt.
A side-effect of this patch is that we may see
phy devices created from the DT due to the extra call to:
of_mdiobus_register()
with the ethernet node as argument.
The logic to determine if a child node is a PHY node
is a simpler version compared to the one used in the kernel.
The kernel have a whitelist of compatible strings
that is not included in the barebox version.
They can be added later if needed.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
drivers/net/phy/mdio_bus.c | 96 +++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 95 insertions(+), 1 deletion(-)
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index d209716a1..636bdd1db 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -17,14 +17,19 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <common.h>
+#include <of_gpio.h>
#include <driver.h>
#include <init.h>
+#include <gpio.h>
#include <clock.h>
#include <net.h>
#include <errno.h>
#include <linux/phy.h>
#include <linux/err.h>
+#define DEFAULT_GPIO_RESET_ASSERT 1000 /* us */
+#define DEFAULT_GPIO_RESET_DEASSERT 1000 /* us */
+
LIST_HEAD(mii_bus_list);
int mdiobus_detect(struct device_d *dev)
@@ -82,6 +87,82 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *chi
return 0;
}
+/*
+ * Node is considered a PHY node if:
+ * o Compatible string of "ethernet-phy-idX.X"
+ * o Compatible string of "ethernet-phy-ieee802.3-c45"
+ * o Compatible string of "ethernet-phy-ieee802.3-c22"
+ * o No compatibility string
+ *
+ * A device which is not a phy is expected to have a compatible string
+ * indicating what sort of device it is.
+ */
+static bool of_mdiobus_child_is_phy(struct device_node *np)
+{
+ struct property *prop;
+ const char *cp;
+
+ of_property_for_each_string(np, "compatible", prop, cp) {
+ if (!strncmp(cp, "ethernet-phy-id", strlen("ethernet-phy-id")))
+ return true;
+ }
+
+ if (of_device_is_compatible(np, "ethernet-phy-ieee802.3-c45"))
+ return true;
+
+ if (of_device_is_compatible(np, "ethernet-phy-ieee802.3-c22"))
+ return true;
+
+ if (!of_find_property(np, "compatible", NULL))
+ return true;
+
+ return false;
+}
+
+/*
+ * Reset the PHY, based on DT info
+ *
+ * If np is a phy node, and the phy node contains a reset-gpios property
+ * then reset the phy.
+ */
+static void of_mdiobus_reset_phy(struct mii_bus *bus, struct device_node *np)
+{
+ enum of_gpio_flags of_flags;
+ u32 reset_deassert_delay;
+ u32 reset_assert_delay;
+ unsigned long flags;
+ int gpio;
+ int ret;
+
+ gpio = of_get_named_gpio_flags(np, "reset-gpios", 0, &of_flags);
+ if (!gpio_is_valid(gpio))
+ return;
+
+ flags = GPIOF_OUT_INIT_INACTIVE;
+ if (of_flags & OF_GPIO_ACTIVE_LOW)
+ flags |= GPIOF_ACTIVE_LOW;
+
+ ret = gpio_request_one(gpio, flags, np->name);
+ if (ret) {
+ dev_err(&bus->dev, "failed to request reset gpio for: %s\n",
+ np->name);
+ return;
+ }
+
+ reset_assert_delay = DEFAULT_GPIO_RESET_ASSERT;
+ of_property_read_u32(np, "reset-assert-us", &reset_assert_delay);
+
+ reset_deassert_delay = DEFAULT_GPIO_RESET_DEASSERT;
+ of_property_read_u32(np, "reset-deassert-us", &reset_deassert_delay);
+
+ /* reset the PHY */
+ dev_dbg(&bus->dev, "reset PHY with GPIO: %d\n", gpio);
+ gpio_set_active(gpio, 1);
+ udelay(reset_assert_delay);
+ gpio_set_active(gpio, 0);
+ udelay(reset_deassert_delay);
+}
+
/**
* of_mdiobus_register - Register mii_bus and create PHYs from the device tree
* @mdio: pointer to mii_bus structure
@@ -111,6 +192,10 @@ static int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
continue;
}
+ if (!of_mdiobus_child_is_phy(child))
+ continue;
+
+ of_mdiobus_reset_phy(mdio, child);
of_mdiobus_register_phy(mdio, child, addr);
}
@@ -154,8 +239,17 @@ int mdiobus_register(struct mii_bus *bus)
pr_info("%s: probed\n", dev_name(&bus->dev));
- if (bus->dev.device_node)
+ if (bus->dev.device_node) {
+ /* Register PHY's as child node to mdio node */
of_mdiobus_register(bus, bus->dev.device_node);
+ }
+ else if (bus->parent->device_node) {
+ /*
+ * Register PHY's as child node to the ethernet node,
+ * if there was no mdio node
+ */
+ of_mdiobus_register(bus, bus->parent->device_node);
+ }
return 0;
}
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v4 3/3] at91sam9263ek: add PHY, miitool etc. to config
2018-08-22 18:35 [PATCH v4 0/3] Add Davicom phy + reset-gpios Sam Ravnborg
2018-08-22 18:36 ` [PATCH v4 1/3] phylib: add Davicom PHY support Sam Ravnborg
2018-08-22 18:36 ` [PATCH v4 2/3] phylib: add support for reset-gpios Sam Ravnborg
@ 2018-08-22 18:36 ` Sam Ravnborg
2018-08-24 8:03 ` [PATCH v4 0/3] Add Davicom phy + reset-gpios Sascha Hauer
3 siblings, 0 replies; 5+ messages in thread
From: Sam Ravnborg @ 2018-08-22 18:36 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Added Davicom phy to the config now it is supported.
Add miitool to show the phy info.
Also add a bunch of extra commands that can be useful
when handling the evaluation board.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/configs/at91sam9263ek_defconfig | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263ek_defconfig
index e8ad841fa..45c6f79de 100644
--- a/arch/arm/configs/at91sam9263ek_defconfig
+++ b/arch/arm/configs/at91sam9263ek_defconfig
@@ -18,7 +18,7 @@ CONFIG_BOOTM_OFTREE=y
CONFIG_BOOTM_OFTREE_UIMAGE=y
CONFIG_CONSOLE_ACTIVATE_ALL=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
-# CONFIG_CMD_ARM_CPUINFO is not set
+CONFIG_CMD_DMESG=y
CONFIG_LONGHELP=y
CONFIG_CMD_IOMEM=y
CONFIG_CMD_MEMINFO=y
@@ -33,22 +33,32 @@ CONFIG_CMD_PRINTENV=y
CONFIG_CMD_SAVEENV=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_DHCP=y
+CONFIG_CMD_HOST=y
+CONFIG_NET_CMD_IFUP=y
+CONFIG_CMD_MIITOOL=y
CONFIG_CMD_PING=y
CONFIG_CMD_TFTP=y
CONFIG_CMD_EDIT=y
CONFIG_CMD_SPLASH=y
+CONFIG_CMD_FBTEST=y
CONFIG_CMD_READLINE=y
CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_CLK=y
+CONFIG_CMD_DETECT=y
CONFIG_CMD_FLASH=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_LED=y
CONFIG_CMD_LED_TRIGGER=y
+CONFIG_CMD_OF_NODE=y
+CONFIG_CMD_OF_PROPERTY=y
+CONFIG_CMD_OF_DISPLAY_TIMINGS=y
+CONFIG_CMD_OF_FIXUP_STATUS=y
CONFIG_CMD_OFTREE=y
CONFIG_NET=y
CONFIG_NET_NFS=y
CONFIG_OF_BAREBOX_DRIVERS=y
CONFIG_DRIVER_NET_MACB=y
+CONFIG_DAVICOM_PHY=y
# CONFIG_SPI is not set
CONFIG_MTD=y
# CONFIG_MTD_OOB_DEVICE is not set
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v4 0/3] Add Davicom phy + reset-gpios
2018-08-22 18:35 [PATCH v4 0/3] Add Davicom phy + reset-gpios Sam Ravnborg
` (2 preceding siblings ...)
2018-08-22 18:36 ` [PATCH v4 3/3] at91sam9263ek: add PHY, miitool etc. to config Sam Ravnborg
@ 2018-08-24 8:03 ` Sascha Hauer
3 siblings, 0 replies; 5+ messages in thread
From: Sascha Hauer @ 2018-08-24 8:03 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: Barebox List
On Wed, Aug 22, 2018 at 08:35:55PM +0200, Sam Ravnborg wrote:
> Changes in v4:
> - Either register a mdio node or phy child nodes
> - Check for valid phy node before registering the phy node
> This is like the kernel does it
> - Also recognize compatible="ethernet-phy-id*" as PHY's
> again like the kernel, but with a simpler implementation,
> as we do not try to read the actual phy_id
Applied, thanks
Sascha
>
> Changes in v3:
> - Consider the v3 a new implmentation - almost nothing was
> left from v2. Thus also invalidate any former review - sorry.
> - Dropped the need for the mdio {} node, as this node is
> only used when there is dedicated HW support for the mdio.
> - Added so PHY child nodes to ethernet nodes are registered,
> and as part of registration the PHY nodes are reset if
> the reset-gpios property is present.
> - Further dropped that the parsed info is stored in the bus,
> as we only do reset once, thus there is no need to
> save the info from the DT
> - Futher dropped helper function to reset. They was not needed
> - Named the gpio with the name of the PHY node
> in the DT. This makes it unique and easier to recognize.
>
> Changes in v2:
> - Added patch to enable Davicom PHY on at91sam9263ek - evaluation kit
> - Fix so we do reset before comunicating with the PHY
> - Rename to mdio_reset()
> - Reference correct binding file in commit log (mdio.txt)
> - Tested on at91sam9263ek
> The at91sam9263ek kit do not require the reset like my
> proprietary board, so no DT changes required
>
> Intro:
> The following patches was necessary to get networking
> operational on my proprietary target.
> The target is at91sam9263 based with a Davicom PHY.
>
> The Davicom PHY is a straight copy form the Linux
> kernel with the interrupt routine removed and
> minor adjustments to the rest.
>
> The davicom PHY would not work until it had seen a reset
> cycle - which I think may be an artifact of the board design.
>
> To fix the reset issue I have implemented support for the
> reset-gpios binding (see net/phy.txt bindings).
> A minimal implmentation was done, just enough to get
> my target running.
>
> I could have implemented something in macb -
> but I preferred the more generic solution.
>
> Also included are a patch that for the at91sam9263ek
> evaluation board. The patch adds several extra tools
> that are usefull for testing, and enable the Davicom PHY.
>
> Sam
>
> Sam Ravnborg (3):
> phylib: add Davicom PHY support
> phylib: add support for reset-gpios
> at91sam9263ek: add PHY, miitool etc. to config
>
> arch/arm/configs/at91sam9263ek_defconfig | 12 ++-
> drivers/net/phy/Kconfig | 5 ++
> drivers/net/phy/Makefile | 1 +
> drivers/net/phy/davicom.c | 140 +++++++++++++++++++++++++++++++
> drivers/net/phy/mdio_bus.c | 97 ++++++++++++++++++++-
> 5 files changed, 253 insertions(+), 2 deletions(-)
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread