Add MV88E6xxx DSA driver and use on gwventana
Subsystems (4)
v7 cover Add MV88E6xxx DSA driver and use on gwventana
This series adds a DSA driver for the MV88E6xxx based on drivers/net/phy/mv88e61xx and uses it in the gwventana_gw5904_defconfig.
The hope is that the other three boards that use the MV88E61xx driver can move to this as well eventually so that we can remove the non-dm driver and the 4 Kconfig options it requires.
The MV88E6xxx has an MDIO interface thus DM_MDIO must be used so support for a UCLASS_MDIO driver is added to the fec_mxc ethernet driver in a way that allows a fallback to the previous non DM_MDIO case as there are many boards out there using this driver that define DM_MDIO but do not have the required dt props for a DM_MDIO driver which would cause a regression.
Additionally some other patches are here suggested by Vladimir:
- ensure MDIO children are scanned on post-bind is needed
- sanity check DSA driver required ops are present
- allow DSA drivers to not require xmit/recv functions
- remove unecessary xmit/recv functions from ksz9477 driver
v7:
- rebase on master
- update commit short msg (s/MV88E61xx/MV88E6xxx)
- replace inline smi_cmd* with macros using logical operators
- replace bitfield_replace with logical operators for readibility
- removed some unused register definitions
- config switch based SERDES mode once in probe vs port_enable
- rework port_enable to clean up and:
- enable energy-detect for all non fixed PHY ports
- configure RGMII delays based on interface type
- add Vladimir's rb tag to patch 8
v6:
- update commit messages
- squash accidently change to mv88e6xxx driver into previous patch
- remove unused dt label for cpu port
- removed unnecessary semicolon
- update commit msg (s/MV88E61xx/MV88E6xxx)
- remove GbE from commit msg and Kconfig desc
- squash accidental change from patch 7 into patch 6
- added error print on failure to read switch id
- mv88e6xxx_probe:
- check for switch enabled
- remove unused variable enabled
- remove unnecessary call to dsa_set_tagging
- port_probe:
- new function to configure phy features by calling phy_config
- port_enable:
- only enable energy-detect sensing on phy ports
- add phy/cmode verification mistmatch warning
- remove mv88e6xxx_fixed_port_setup()
- always force link up for fixed ports
- always set SERDES mode regardless of cpu port
- remove unnecessary setting of CPUDEST
- port_disable:
- remove pointless error check
- removed unnecessary priv data for mdio controller
- fix indentation
- change variable name for clarity
v5:
- fix typo in defconfig update
- added support for MV88E6320
- added Fabio's rb tag
v4:
- use standard Linux internal MDIO dt structure
- use PHY_FIXED_ID define
- rename to mv88e6xxx
- sort includes alphabetically
- remove dsa term from function names
- reduce indentation level and remove unecessary code in of probe_mdio function
- rename pdev to mdev to represent mdio device
v3:
- fix mdios node in dt
- add Vladimir's rb tag's
v2:
- added Ramon's rb tag's to first two patches
- add patches for dsa-uclass to sanity check ops and make xmit/recv optional
- fec: fix fallback for non conforming DM_MDIO dts
- mv88e61xx:
- rebase on v2022.07-rc2 (use ofnode_get_phy_node)
- remove unused commented out fields from struct
- remove unused PORT_MASK macro
- remove phy from priv struct name
- refactor code from original drivers/net/phy/mv88e61xx with suggestions from review to consolidate some functions into mv88e61xx_dsa_port_enable
- remove unecessary skiping of disabling of CPU port
- remove unecessary dev_set_parent_priv
- remove unnecessary static init flag
- replace debug with a dev_warn if switch device-id unsupported
- remove unnecessary xmit/recv functions as we rely on the fact that only a single port is active instead of mangling packets
Tested on a Gateworks GW5904 which has a Marvell 88E6176 switch hanging off the IMX6 FEC.
Best Regards,
Tim
Tim Harvey (8):
net: mdio-uclass: scan for dm mdio children on post-bind
net: dsa: move cpu port probe to dsa_post_probe
net: dsa: ensure dsa driver has proper ops
net: dsa: allow rcv() and xmit() to be optional
net: ksz9477: remove unnecessary xmit and recv functions
net: fec: add support for DM_MDIO
net: add MV88E6xxx DSA driver
board: gw_ventana: enable MV88E61XX DSA support
arch/arm/dts/imx6qdl-gw5904.dtsi | 32 +- board/gateworks/gw_ventana/gw_ventana.c | 50 +- configs/gwventana_gw5904_defconfig | 7 +- drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/fec_mxc.c | 90 ++- drivers/net/ksz9477.c | 23 - drivers/net/mv88e6xxx.c | 795 ++++++++++++++++++++++++ net/dsa-uclass.c | 55 +- net/mdio-uclass.c | 4 + 10 files changed, 992 insertions(+), 72 deletions(-) create mode 100644 drivers/net/mv88e6xxx.c
Signature · 1 line
2.25.1
PATCH v7 1/8 net: mdio-uclass: scan for dm mdio children on post-bind
If a DM_MDIO driver is used we need to scan the subnodes as well.
---
v7:
- no changes
v6:
- no changes
v5:
- added Fabio's rb tag
v4:
- no changes
v3:
- no changes
v2:
- added Ramon's rb tag
--- net/mdio-uclass.c | 4 ++++ 1 file changed, 4 insertions(+)
net/mdio-uclass.c +4 -0
@@ -49,7 +49,11 @@ static int dm_mdio_post_bind(struct udevice *dev)return -EINVAL ; } +#if CONFIG_IS_ENABLED (OF_REAL ) +return dm_scan_fdt_dev (dev); +#else return 0 ; +#endif }int dm_mdio_read (struct udevice *mdio_dev,int addr,int devad,int reg)
Signature · 1 line
2.25.1
PATCH v7 2/8 net: dsa: move cpu port probe to dsa_post_probe
In reply to Tim HarveyIn order to ensure that a DSA driver probe gets called before dsa_ops->port_probe move the port_probe of the cpu_port to a post-probe function.
---
v7:
- no changes
v6:
- removed unnecessary semicolon
v5:
- added Fabio's rb tag
v4:
- no changes
v3:
- added Vladimir's rb tag
v2:
- added Ramon's rb tag
--- net/dsa-uclass.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
net/dsa-uclass.c +10 -1
@@ -466,7 +466,6 @@ static int dsa_pre_probe(struct udevice *dev) {struct dsa_pdata *pdata =dev_get_uclass_plat (dev);struct dsa_priv *priv =dev_get_uclass_priv (dev); -struct dsa_ops *ops =dsa_get_ops (dev);int err; priv->num_ports = pdata->num_ports;
@@ -482,6 +481,15 @@ static int dsa_pre_probe(struct udevice *dev)if (err)return err; +return 0 ; +} + +static int dsa_post_probe (struct udevice *dev) +{ +struct dsa_priv *priv =dev_get_uclass_priv (dev); +struct dsa_ops *ops =dsa_get_ops (dev); +int err; +/* Simulate a probing event for the CPU port */ if (ops->port_probe) { err = ops->port_probe(dev, priv->cpu_port,
@@ -498,6 +506,7 @@ UCLASS_DRIVER(dsa) = { .name = "dsa", .post_bind = dsa_post_bind, .pre_probe = dsa_pre_probe, + .post_probe = dsa_post_probe, .per_device_auto = sizeof(struct dsa_priv), .per_device_plat_auto = sizeof(struct dsa_pdata), .per_child_plat_auto = sizeof(struct dsa_port_pdata),
Signature · 1 line
2.25.1
PATCH v7 3/8 net: dsa: ensure dsa driver has proper ops
In reply to Tim HarveyAdd a function to sanity check a dsa driver having proper ops.
---
v7:
- no changes
v6:
- no changes
v5:
- added Fabio's rb tag
v4:
- no changes
v3:
- added Vladimir's rb tag
v2: new patch
--- net/dsa-uclass.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
net/dsa-uclass.c +17 -0
@@ -342,6 +342,19 @@ U_BOOT_DRIVER(dsa_port) = { .plat_auto = sizeof(struct eth_pdata), }; +static int dsa_sanitize_ops (struct udevice *dev) +{ +struct dsa_ops *ops =dsa_get_ops (dev); + +if ((!ops->xmit || !ops->rcv) && + (!ops->port_enable && !ops->port_disable)) { +dev_err (dev,"Packets cannot be steered to ports\n" ); +return -EINVAL ; + } + +return 0 ; +} +/* * This function mostly deals with pulling information out of the device tree * into the pdata structure.
@@ -358,6 +371,10 @@ static int dsa_post_bind(struct udevice *dev)if (!ofnode_valid (node))return -ENODEV ; + err =dsa_sanitize_ops (dev); +if (err) +return err; + pdata->master_node =ofnode_null (); node =ofnode_find_subnode (node,"ports" );
Signature · 1 line
2.25.1
PATCH v7 4/8 net: dsa: allow rcv() and xmit() to be optional
In reply to Tim HarveyAllow rcv() and xmit() dsa driver ops to be optional in case a driver does not care to mangle a packet as in U-Boot only one network port is enabled at a time and thus no packet mangling is necessary.
---
v7:
- no changes
v6:
- no changes
v5:
- added Fabio's rb tag
v4:
- no changes
v3:
- added Vladimir's rb tag
v2: new patch
--- net/dsa-uclass.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-)
net/dsa-uclass.c +18 -9
@@ -131,16 +131,14 @@ static void dsa_port_stop(struct udevice *pdev)* We copy the frame to a stack buffer where we have reserved headroom and * tailroom space. Headroom and tailroom are set to 0. */ -static int dsa_port_send (struct udevice *pdev,void *packet,int length) +static int dsa_port_mangle_packet (struct udevice *pdev,void *packet,int length) { +struct dsa_port_pdata *port_pdata =dev_get_parent_plat (pdev);struct udevice *dev =dev_get_parent (pdev);struct dsa_priv *priv =dev_get_uclass_priv (dev);int head = priv->headroom, tail = priv->tailroom; -struct udevice *master =dsa_get_master (dev);struct dsa_ops *ops =dsa_get_ops (dev);uchar dsa_packet_tmp[PKTSIZE_ALIGN ]; -struct dsa_port_pdata *port_pdata; -int err;if (length + head + tail >PKTSIZE_ALIGN )return -EINVAL ;
@@ -152,10 +150,21 @@ static int dsa_port_send(struct udevice *pdev, void *packet, int length)/* copy back to preserve original buffer alignment */ memcpy (packet, dsa_packet_tmp, length); - port_pdata =dev_get_parent_plat (pdev); - err = ops->xmit (dev, port_pdata->index, packet, length); -if (err) -return err; +return ops->xmit (dev, port_pdata->index, packet, length); +} + +static int dsa_port_send (struct udevice *pdev,void *packet,int length) +{ +struct udevice *dev =dev_get_parent (pdev); +struct udevice *master =dsa_get_master (dev); +struct dsa_ops *ops =dsa_get_ops (dev); +int err; + +if (ops->xmit) { + err =dsa_port_mangle_packet (pdev, packet, length); +if (err) +return err; + }return eth_get_ops (master)->send (master, packet, length); }
@@ -172,7 +181,7 @@ static int dsa_port_recv(struct udevice *pdev, int flags, uchar **packetp)int length, port_index, err; length =eth_get_ops (master)->recv (master, flags, packetp); -if (length <=0 ) +if (length <=0 || !ops->rcv)return length;/*
Signature · 1 line
2.25.1
PATCH v7 5/8 net: ksz9477: remove unnecessary xmit and recv functions
In reply to Tim HarveyRemove the unnecessary xmit and recv functions.
---
v7:
- no changes
v6:
- no changes
v5:
- added Fabio's rb tag
v4:
- no changes
v3:
- added Vladimir's rb tag
v2: new patch
--- drivers/net/ksz9477.c | 23 ----------------------- 1 file changed, 23 deletions(-)
drivers/net/ksz9477.c +0 -23
@@ -62,7 +62,6 @@struct ksz_dsa_priv {struct udevice *dev; -int active_port; };static inline int ksz_read8 (struct udevice *dev,u32 reg,u8 *val)
@@ -382,9 +381,6 @@ static int ksz_port_enable(struct udevice *dev, int port, struct phy_device *phy data8 |=SW_START ;ksz_write8 (priv->dev,REG_SW_OPERATION , data8); -/* keep track of current enabled non-cpu port */ - priv->active_port = port; -return 0 ; }
@@ -413,28 +409,9 @@ static void ksz_port_disable(struct udevice *dev, int port, struct phy_device *p*/ } -static int ksz_xmit (struct udevice *dev,int port,void *packet,int length) -{ -dev_dbg (dev,"%s P%d %d\n" , __func__, port +1 , length); - -return 0 ; -} - -static int ksz_recv (struct udevice *dev,int *port,void *packet,int length) -{ -struct ksz_dsa_priv *priv =dev_get_priv (dev); - -dev_dbg (dev,"%s P%d %d\n" , __func__, priv->active_port +1 , length); - *port = priv->active_port; - -return 0 ; -}; -static const struct dsa_ops ksz_dsa_ops = { .port_enable = ksz_port_enable, .port_disable = ksz_port_disable, - .xmit = ksz_xmit, - .rcv = ksz_recv, };static int ksz_probe_mdio (struct udevice *dev)
Signature · 1 line
2.25.1
PATCH v7 6/8 net: fec: add support for DM_MDIO
In reply to Tim HarveyAdd support for DM_MDIO by registering a UCLASS_MDIO driver and attempting to use it. This is necessary if wanting to use a DSA driver for example hanging off of the FEC MAC.
Care is taken to fallback to non DM_MDIO mii bus as several boards define DM_MDIO without having the proper device-tree configuration necessary such as an mdio subnode, a phy-mode prop, and either a valid phy-handle prop or fixed-phy subnode which will cause dm_eth_phy_connect() to fail.
---
v7:
- no changes
v6:
- no changes
v5:
- added Fabio's rb tag
v4:
- no changes
v3:
- no changes
v2:
- fix fallback mechanism for legacy dt's that do not have phy-handle and mdio subnode
--- drivers/net/fec_mxc.c | 90 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 2 deletions(-)
drivers/net/fec_mxc.c +88 -2
@@ -30,6 +30,8 @@#include <asm/arch/imx-regs.h> #include <asm/mach-imx/sys_proto.h> #include <asm-generic/gpio.h> +#include <dm/device_compat.h> +#include <dm/lists.h> #include "fec_mxc.h" #include <eth_phy.h>
@@ -1026,6 +1028,81 @@ struct mii_dev *fec_get_miibus(ulong base_addr, int dev_id)return bus; } +#ifdef CONFIG_DM_MDIO +struct dm_fec_mdio_priv { +struct ethernet_regs *regs; +}; + +static int dm_fec_mdio_read (struct udevice *dev,int addr,int devad,int reg) +{ +struct dm_fec_mdio_priv *priv =dev_get_priv (dev); + +return fec_mdio_read (priv->regs, addr, reg); +} + +static int dm_fec_mdio_write (struct udevice *dev,int addr,int devad,int reg,u16 data) +{ +struct dm_fec_mdio_priv *priv =dev_get_priv (dev); + +return fec_mdio_write (priv->regs, addr, reg, data); +} + +static const struct mdio_ops dm_fec_mdio_ops = { + .read = dm_fec_mdio_read, + .write = dm_fec_mdio_write, +}; + +static int dm_fec_mdio_probe (struct udevice *dev) +{ +struct dm_fec_mdio_priv *priv =dev_get_priv (dev); + + priv->regs = (struct ethernet_regs *)ofnode_get_addr (dev_ofnode (dev->parent)); + +return 0 ; +} + +U_BOOT_DRIVER (fec_mdio) = { + .name ="fec_mdio" , + .id =UCLASS_MDIO , + .probe = dm_fec_mdio_probe, + .ops = &dm_fec_mdio_ops, + .priv_auto =sizeof (struct dm_fec_mdio_priv ), +}; + +static int dm_fec_bind_mdio (struct udevice *dev) +{ +struct udevice *mdiodev; +const char *name; +ofnode mdio; +int ret = -ENODEV ; + +/* for a UCLASS_MDIO driver we need to bind and probe manually +* for an internal MDIO bus that has no dt compatible of its own +*/ +ofnode_for_each_subnode (mdio,dev_ofnode (dev)) { + name =ofnode_get_name (mdio); + +if (strcmp (name,"mdio" )) +continue ; + + ret =device_bind_driver_to_node (dev,"fec_mdio" , + name, mdio, &mdiodev); +if (ret) { +printf ("%s bind %s failed: %d\n" , __func__, name, ret); +break ; + } + +/* need to probe it as there is no compatible to do so */ + ret =uclass_get_device_by_ofnode (UCLASS_MDIO , mdio, &mdiodev); +if (!ret) +return 0 ; +printf ("%s probe %s failed: %d\n" , __func__, name, ret); + } + +return ret; +} +#endif +static int fecmxc_read_rom_hwaddr (struct udevice *dev) {struct fec_priv *priv =dev_get_priv (dev);
@@ -1089,7 +1166,7 @@ static int device_get_phy_addr(struct fec_priv *priv, struct udevice *dev)static int fec_phy_init (struct fec_priv *priv,struct udevice *dev) { -struct phy_device *phydev; +struct phy_device *phydev =NULL ;int addr; addr =device_get_phy_addr (priv, dev);
@@ -1097,7 +1174,10 @@ static int fec_phy_init(struct fec_priv *priv, struct udevice *dev) addr =CONFIG_FEC_MXC_PHYADDR ;#endif - phydev =phy_connect (priv->bus, addr, dev, priv->interface); +if (IS_ENABLED (CONFIG_DM_MDIO )) + phydev =dm_eth_phy_connect (dev); +if (!phydev) + phydev =phy_connect (priv->bus, addr, dev, priv->interface);if (!phydev)return -ENODEV ;
@@ -1228,6 +1308,12 @@ static int fecmxc_probe(struct udevice *dev) priv->dev_id =dev_seq (dev); +if (IS_ENABLED (CONFIG_DM_MDIO )) { + ret =dm_fec_bind_mdio (dev); +if (ret && ret != -ENODEV ) +return ret; + } +#ifdef CONFIG_DM_ETH_PHY bus =eth_phy_get_mdio_bus (dev);#endif
Signature · 1 line
2.25.1
PATCH v7 7/8 net: add MV88E6xxx DSA driver
In reply to Tim HarveyAdd a DSA driver for the MV88E6xxx compatible Ethernet switches.
---
v7:
- rebase on master
- update commit short msg (s/MV88E61xx/MV88E6xxx)
- replace inline smi_cmd* with macros using logical operators
- replace bitfield_replace with logical operators for readibility
- removed some unused register definitions
- config switch based SERDES mode once in probe vs port_enable
- rework port_enable to clean up and:
- enable energy-detect for all non fixed PHY ports
- configure RGMII delays based on interface type
v6:
- update commit msg (s/MV88E61xx/MV88E6xxx)
- remove GbE from commit msg and Kconfig desc
- squash accidental change from patch 7 into patch 6
- added error print on failure to read switch id
- mv88e6xxx_probe:
- check for switch enabled
- remove unused variable enabled
- remove unnecessary call to dsa_set_tagging
- port_probe:
- new function to configure phy features by calling phy_config
- port_enable:
- only enable energy-detect sensing on phy ports
- add phy/cmode verification mistmatch warning
- remove mv88e6xxx_fixed_port_setup()
- always force link up for fixed ports
- always set SERDES mode regardless of cpu port
- remove unnecessary setting of CPUDEST
- port_disable:
- remove pointless error check
- removed unnecessary priv data for mdio controller
- fix indentation
- change variable name for clarity
v5:
- added support for MV88E6320
- added Fabio's rb tag
v4:
- rename to mv88e6xxx
- sort includes alphabetically
- remove dsa term from function names
- reduce indentation level and remove unecessary code in of probe_mdio function
- rename pdev to mdev to represent mdio device
v3:
- Added Vladimir's rb tag
v2:
- rebase on v2022.07-rc1 (use ofnode_get_phy_node)
- remove unused commented out fields from struct
- remove unused PORT_MASK macro
- remove phy from priv struct name
- refactor code from original drivers/net/phy/mv88e61xx with suggestions from review to consolidate some functions into mv88e61xx_dsa_port_enable
- remove unecessary skiping of disabling of CPU port
- remove unecessary dev_set_parent_priv
- remove unnecessary static init flag
- replace debug with a dev_warn if switch device-id unsupported
- remove unnecessary xmit/recv functions as we rely on the fact that only a single port is active instead of mangling packets
--- drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/mv88e6xxx.c | 795 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 803 insertions(+) create mode 100644 drivers/net/mv88e6xxx.c
drivers/net/Kconfig +7 -0
@@ -438,6 +438,13 @@ config KSZ9477 This driver implements a DSA switch driver for the KSZ9477 family of GbE switches using the I2C interface. +config MV88E6XXX + bool "Marvell MV88E6xxx Ethernet switch DSA driver" + depends on DM_DSA && DM_MDIO + help + This driver implements a DSA switch driver for the MV88E6xxx family + of Ethernet switches using the MDIO interface + config MVGBE bool "Marvell Orion5x/Kirkwood network interface support" depends on ARCH_KIRKWOOD || ARCH_ORION5X
drivers/net/Makefile +1 -0
@@ -59,6 +59,7 @@ obj-$(CONFIG_MEDIATEK_ETH) += mtk_eth.o obj-$(CONFIG_MPC8XX_FEC) += mpc8xx_fec.o obj-$(CONFIG_MT7620_ETH) += mt7620-eth.o obj-$(CONFIG_MT7628_ETH) += mt7628-eth.o +obj-$(CONFIG_MV88E6XXX) += mv88e6xxx.o obj-$(CONFIG_MVGBE) += mvgbe.o obj-$(CONFIG_MVMDIO) += mvmdio.o obj-$(CONFIG_MVNETA) += mvneta.o
drivers/net/mv88e6xxx.c new file +795 -0
795 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH v7 7/8] net: add MV88E6xxx DSA driver
This patch looks much better to me. Only one comment.
Quoted 58 lines · Tim Harvey
drivers/net/mv88e6xxx.c new file +58
-0+static int mv88e6xxx_port_enable (struct udevice *dev,int port,struct phy_device *phy) +{ +struct mv88e6xxx_priv *priv =dev_get_priv (dev); +int val, ret; + +dev_dbg (dev,"%s P%d phy:0x%08x %s\n" , __func__, port, + phy->phy_id,phy_string_for_interface (phy->interface)); + +if (phy->phy_id ==PHY_FIXED_ID ) { +/* Physical Control register: Table 62 */ + val =mv88e6xxx_port_read (dev, port,PORT_REG_PHYS_CTRL ); + +/* configure RGMII delays for fixed link */ +switch (phy->interface) { +case PHY_INTERFACE_MODE_RGMII : +case PHY_INTERFACE_MODE_RGMII_ID : +case PHY_INTERFACE_MODE_RGMII_RXID : +case PHY_INTERFACE_MODE_RGMII_TXID : +dev_dbg (dev,"configure internal RGMII delays\n" ); + +/* RGMII delays */ + val &= ~(PORT_REG_PHYS_CTRL_RGMII_DELAY_RXCLK || +PORT_REG_PHYS_CTRL_RGMII_DELAY_TXCLK ); +if (phy->interface ==PHY_INTERFACE_MODE_RGMII_ID || + phy->interface ==PHY_INTERFACE_MODE_RGMII_RXID ) + val |=PORT_REG_PHYS_CTRL_RGMII_DELAY_RXCLK ; +if (phy->interface ==PHY_INTERFACE_MODE_RGMII_ID || + phy->interface ==PHY_INTERFACE_MODE_RGMII_TXID ) + val |=PORT_REG_PHYS_CTRL_RGMII_DELAY_TXCLK ; +break ; +default : +break ; + } + +/* Force Link */ + val |=PORT_REG_PHYS_CTRL_LINK_VALUE | +PORT_REG_PHYS_CTRL_LINK_FORCE ; + + ret =mv88e6xxx_port_write (dev, port,PORT_REG_PHYS_CTRL , val); +if (ret <0 ) +return ret; + +if (mv88e6xxx_6352_family (dev)) { +/* validate interface type */ +dev_dbg (dev,"validate interface type\n" ); + val =mv88e6xxx_get_cmode (dev, port); +if (val <0 ) +return val; +switch (phy->interface) { +case PHY_INTERFACE_MODE_RGMII : +case PHY_INTERFACE_MODE_RGMII_RXID : +case PHY_INTERFACE_MODE_RGMII_TXID : +case PHY_INTERFACE_MODE_RGMII_ID : +if (val !=PORT_REG_STATUS_CMODE_RGMII ) + goto mismatch; +break ; +case PHY_INTERFACE_MODE_1000BASEX : +if (val !=PORT_REG_STATUS_CMODE_1000BASE_X )
drivers/net/mv88e6xxx.c line 632
Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10
-0+ goto mismatch; +break ; +mismatch: +default : +dev_err (dev,"Mismatched PHY mode %s on port %d!\n" , +phy_string_for_interface (phy->interface), port); +break ; + } + } + }else {
What I was saying was here. The phy_id is not PHY_FIXED_ID, okay, but that doesn't necessarily imply this is an internal PHY port, as the code below goes on to assume. Maybe this is the case for your setup, but I would like to see some guarding in a generic driver such that internal PHY configuration only gets done for ports where that PHY exists.
Which actually brings me to another, more important point. This PHY_REG_CTRL1 access is the only PHY access that the DSA driver performs. But we also have a driver for the internal PHY. Why doesn't the Marvell PHY driver do this write? Also, what is the utility of enabling energy-detect sense?
Quoted 37 lines
drivers/net/mv88e6xxx.c new file +37
-0+/* Enable energy-detect sensing on PHY */ +dev_dbg (dev,"enabling energy-detect sense on PHY\n" ); + val =mv88e6xxx_phy_read (dev, port,PHY_REG_CTRL1 ); +if (val <0 ) +return val; +switch (priv->id) { +case PORT_SWITCH_ID_6096 : +case PORT_SWITCH_ID_6097 : +case PORT_SWITCH_ID_6172 : +case PORT_SWITCH_ID_6176 : +case PORT_SWITCH_ID_6240 : +case PORT_SWITCH_ID_6352 : + val &= ~GENMASK (8 ,2 ); + val |= (PHY_REG_CTRL1_ENERGY_DET_SENSE_XMIT <<8 ); +break ; +default : + val &= ~GENMASK (14 ,1 ); + val |= (PHY_REG_CTRL1_ENERGY_DET_SENSE_PULSE <<14 ); +break ; + } + val =mv88e6xxx_phy_write (dev, port,PHY_REG_CTRL1 , val); +if (val <0 ) +return val; + } + +/* enable port */ + val =mv88e6xxx_port_read (dev, port,PORT_REG_CTRL ); +if (val <0 ) +return val; + val &= ~(PORT_REG_CTRL_PSTATE_MASK <<PORT_REG_CTRL_PSTATE_SHIFT ); + val |= (PORT_REG_CTRL_PSTATE_FORWARD <<PORT_REG_CTRL_PSTATE_SHIFT ); + val =mv88e6xxx_port_write (dev, port,PORT_REG_CTRL , val); +if (val <0 ) +return val; + +return phy_startup (phy); +}
Re: [PATCH v7 7/8] net: add MV88E6xxx DSA driver
Quoted 70 lines · Vladimir Oltean
This patch looks much better to me. Only one comment.
Quoted 66 lines · Tim Harvey
drivers/net/mv88e6xxx.c new file +66
-0+static int mv88e6xxx_port_enable (struct udevice *dev,int port,struct phy_device *phy) +{ +struct mv88e6xxx_priv *priv =dev_get_priv (dev); +int val, ret; + +dev_dbg (dev,"%s P%d phy:0x%08x %s\n" , __func__, port, + phy->phy_id,phy_string_for_interface (phy->interface)); + +if (phy->phy_id ==PHY_FIXED_ID ) { +/* Physical Control register: Table 62 */ + val =mv88e6xxx_port_read (dev, port,PORT_REG_PHYS_CTRL ); + +/* configure RGMII delays for fixed link */ +switch (phy->interface) { +case PHY_INTERFACE_MODE_RGMII : +case PHY_INTERFACE_MODE_RGMII_ID : +case PHY_INTERFACE_MODE_RGMII_RXID : +case PHY_INTERFACE_MODE_RGMII_TXID : +dev_dbg (dev,"configure internal RGMII delays\n" ); + +/* RGMII delays */ + val &= ~(PORT_REG_PHYS_CTRL_RGMII_DELAY_RXCLK || +PORT_REG_PHYS_CTRL_RGMII_DELAY_TXCLK ); +if (phy->interface ==PHY_INTERFACE_MODE_RGMII_ID || + phy->interface ==PHY_INTERFACE_MODE_RGMII_RXID ) + val |=PORT_REG_PHYS_CTRL_RGMII_DELAY_RXCLK ; +if (phy->interface ==PHY_INTERFACE_MODE_RGMII_ID || + phy->interface ==PHY_INTERFACE_MODE_RGMII_TXID ) + val |=PORT_REG_PHYS_CTRL_RGMII_DELAY_TXCLK ; +break ; +default : +break ; + } + +/* Force Link */ + val |=PORT_REG_PHYS_CTRL_LINK_VALUE | +PORT_REG_PHYS_CTRL_LINK_FORCE ; + + ret =mv88e6xxx_port_write (dev, port,PORT_REG_PHYS_CTRL , val); +if (ret <0 ) +return ret; + +if (mv88e6xxx_6352_family (dev)) { +/* validate interface type */ +dev_dbg (dev,"validate interface type\n" ); + val =mv88e6xxx_get_cmode (dev, port); +if (val <0 ) +return val; +switch (phy->interface) { +case PHY_INTERFACE_MODE_RGMII : +case PHY_INTERFACE_MODE_RGMII_RXID : +case PHY_INTERFACE_MODE_RGMII_TXID : +case PHY_INTERFACE_MODE_RGMII_ID : +if (val !=PORT_REG_STATUS_CMODE_RGMII ) + goto mismatch; +break ; +case PHY_INTERFACE_MODE_1000BASEX : +if (val !=PORT_REG_STATUS_CMODE_1000BASE_X ) + goto mismatch; +break ; +mismatch: +default : +dev_err (dev,"Mismatched PHY mode %s on port %d!\n" , +phy_string_for_interface (phy->interface), port); +break ; + }
Quoted 9 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ } + } else {What I was saying was here. The
phy_idis notPHY_FIXED_ID, okay, but that doesn't necessarily imply this is an internal PHY port, as the code below goes on to assume. Maybe this is the case for your setup, but I would like to see some guarding in a generic driver such that internal PHY configuration only gets done for ports where that PHY exists.
ok, I understand now
Quoted 6 lines
Which actually brings me to another, more important point. This
PHY_REG_CTRL1access is the only PHY access that the DSA driver performs. But we also have a driver for the internal PHY. Why doesn't the Marvell PHY driver do this write? Also, what is the utility of enabling energy-detect sense?
not sure honestly - it's in the original drivers/net/phy/mv88e61xxx.c driver that I based this one off of.
From the functional spec of the 88E6176:
- energy detect mode1 (what I'm doing here):
only the signal detection circuitry and the serial management interface are active. If the PHY detects energy on the line, it starts to Auto-Negotiate sending FLPs for 5 seconds. If at the end of 5 seconds the Auto-Negotiation is not completed, then the PHY stops sending FLPs and goes back to monitoring receive energy. If Auto-Negotation is completed, then the PHY goes into normal 10/100/1000 MBps operation. If during normal operation the link is lost, the PHY will re-start Auto-Negotiation. If no energy is detected after 5 seconds, the PHY goes back to monitoring receive energy.
- energy detect mode2 (appears to be the power-on default):
The PHY sends out a single 10Mbps NLP (Normal Link Pulse) every on second. Except for this difference, Mode 2 is identical to Mode 1 operation. If the device is in Mode 1, it cannot wake up a connected device; therefore, the connected device must be transmitting NLPs, or either device must be woken up through register access. If the device is in Mode 2, then it can wake a connected device.
- energy detect disabled:
Normal 10/100/1000 mbps operation
You bring up a great point regarding the Marvell PHY driver not doing this... I'm happy to kill it off?
Tim
Quoted 37 lines
Quoted 37 lines
drivers/net/mv88e6xxx.c new file +37
-0+/* Enable energy-detect sensing on PHY */ +dev_dbg (dev,"enabling energy-detect sense on PHY\n" ); + val =mv88e6xxx_phy_read (dev, port,PHY_REG_CTRL1 ); +if (val <0 ) +return val; +switch (priv->id) { +case PORT_SWITCH_ID_6096 : +case PORT_SWITCH_ID_6097 : +case PORT_SWITCH_ID_6172 : +case PORT_SWITCH_ID_6176 : +case PORT_SWITCH_ID_6240 : +case PORT_SWITCH_ID_6352 : + val &= ~GENMASK (8 ,2 ); + val |= (PHY_REG_CTRL1_ENERGY_DET_SENSE_XMIT <<8 ); +break ; +default : + val &= ~GENMASK (14 ,1 ); + val |= (PHY_REG_CTRL1_ENERGY_DET_SENSE_PULSE <<14 ); +break ; + } + val =mv88e6xxx_phy_write (dev, port,PHY_REG_CTRL1 , val); +if (val <0 ) +return val; + } + +/* enable port */ + val =mv88e6xxx_port_read (dev, port,PORT_REG_CTRL ); +if (val <0 ) +return val; + val &= ~(PORT_REG_CTRL_PSTATE_MASK <<PORT_REG_CTRL_PSTATE_SHIFT ); + val |= (PORT_REG_CTRL_PSTATE_FORWARD <<PORT_REG_CTRL_PSTATE_SHIFT ); + val =mv88e6xxx_port_write (dev, port,PORT_REG_CTRL , val); +if (val <0 ) +return val; + +return phy_startup (phy); +}
Re: [PATCH v7 7/8] net: add MV88E6xxx DSA driver
Quoted 2 lines · Tim Harvey
not sure honestly - it's in the original
drivers/net/phy/mv88e61xxx.cdriver that I based this one off of.
You keep saying this; it doesn't matter where it comes from, the point is whether it's useful to keep it in a new driver or not...
Quoted 21 lines
From the functional spec of the 88E6176:
- energy detect mode1 (what I'm doing here):
only the signal detection circuitry and the serial management interface are active. If the PHY detects energy on the line, it starts to Auto-Negotiate sending FLPs for 5 seconds. If at the end of 5 seconds the Auto-Negotiation is not completed, then the PHY stops sending FLPs and goes back to monitoring receive energy. If Auto-Negotation is completed, then the PHY goes into normal 10/100/1000 MBps operation. If during normal operation the link is lost, the PHY will re-start Auto-Negotiation. If no energy is detected after 5 seconds, the PHY goes back to monitoring receive energy.
- energy detect mode2 (appears to be the power-on default):
The PHY sends out a single 10Mbps NLP (Normal Link Pulse) every on second. Except for this difference, Mode 2 is identical to Mode 1 operation. If the device is in Mode 1, it cannot wake up a connected device; therefore, the connected device must be transmitting NLPs, or either device must be woken up through register access. If the device is in Mode 2, then it can wake a connected device.
- energy detect disabled:
Normal 10/100/1000 mbps operation
Quoted 2 lines
You bring up a great point regarding the Marvell PHY driver not doing this... I'm happy to kill it off?
Ah, ok, it's a low power mode.
That being said, it seems like Marvell is saying: hey, we offer you the ability to save power (when the PHY should be up) by disabling much of the PHY circuitry, just leave on some signal detection circuit. We certainly won't be emitting any NLP such that the link partner will know the link is up. You go first and then we'll respond!
I wonder what happens if you connect 2 Marvell PHY ports with Energy Detect to each other... the link shouldn't come up, right?
I absolutely think that this setting has no purpose in a bootloader driver. Just a potential pain point. You want the bootloader networking to be bullet proof.
Kill it!
PATCH v7 8/8 board: gw_ventana: enable MV88E61XX DSA support
In reply to Tim HarveyAdd MV88E61XX DSA support:
- update dt to provide internal MDIO bus and port handles. U-Boot requires a more restrictive subset of the dt bindings required by Linux for the sake of simplifying code
- update defconfig to remove old driver and enable new one
- replace mv88e61xx_hw_reset weak override with board_phy_config support for register configuration that is outside the scope of the DSA driver
---
v7:
- added Vladimir's rb tag
v6:
- update commit message
- squash accidently change to mv88e6xxx driver into previous patch
- remove unused label for cpu port
v5:
- fix typo in defconfig s/MV88E61XX/MV88E6XXX
- added Fabio's rb tag
v4:
- use standard Linux internal MDIO dt structure
- use PHY_FIXED_ID define
v3:
- move mdio's mdio@0 subnode
v2: no changes
--- arch/arm/dts/imx6qdl-gw5904.dtsi | 32 +++++++++++++++- board/gateworks/gw_ventana/gw_ventana.c | 50 +++++++++---------------- configs/gwventana_gw5904_defconfig | 7 ++-- 3 files changed, 52 insertions(+), 37 deletions(-)
arch/arm/dts/imx6qdl-gw5904.dtsi +31 -1
@@ -212,6 +212,27 @@ compatible = "marvell,mv88e6085"; reg = <0>; + mdio { + #address-cells = <1>; + #size-cells = <0>; + + sw_phy0: ethernet-phy@0 { + reg = <0x0>; + }; + + sw_phy1: ethernet-phy@1 { + reg = <0x1>; + }; + + sw_phy2: ethernet-phy@2 { + reg = <0x2>; + }; + + sw_phy3: ethernet-phy@3 { + reg = <0x3>; + }; + }; + ports { #address-cells = <1>; #size-cells = <0>;
@@ -219,27 +240,36 @@ port@0 { reg = <0>; label = "lan4"; + phy-handle = <&sw_phy0>; }; port@1 { reg = <1>; label = "lan3"; + phy-handle = <&sw_phy1>; }; port@2 { reg = <2>; label = "lan2"; + phy-handle = <&sw_phy2>; }; port@3 { reg = <3>; label = "lan1"; + phy-handle = <&sw_phy3>; }; port@5 { reg = <5>; - label = "cpu"; ethernet = <&fec>; + phy-mode = "rgmii-id"; + + fixed-link { + speed = <1000>; + full-duplex; + }; }; }; };
board/gateworks/gw_ventana/gw_ventana.c +18 -32
62 lines not on this page · raw message
configs/gwventana_gw5904_defconfig +3 -4
@@ -108,13 +108,12 @@ CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y CONFIG_MTD=y CONFIG_PHYLIB=y -CONFIG_MV88E61XX_SWITCH=y -CONFIG_MV88E61XX_CPU_PORT=5 -CONFIG_MV88E61XX_PHY_PORTS=0xf -CONFIG_MV88E61XX_FIXED_PORTS=0x0 +CONFIG_PHY_FIXED=y CONFIG_DM_MDIO=y +CONFIG_DM_DSA=y CONFIG_E1000=y CONFIG_FEC_MXC=y +CONFIG_MV88E6XXX=y CONFIG_MII=y CONFIG_PCI=y CONFIG_PCIE_IMX=y
Signature · 1 line
2.25.1
Re: [PATCH v7 8/8] board: gw_ventana: enable MV88E61XX DSA support
After the realization from the v6 review, can you please add to this:
Quoted 33 lines · Tim Harvey
arch/arm/dts/imx6qdl-gw5904.dtsi +21
-0@@ -212,6 +212,27 @@ compatible = "marvell,mv88e6085"; reg = <0>; + mdio { + #address-cells = <1>; + #size-cells = <0>; + + sw_phy0: ethernet-phy@0 { + reg = <0x0>; + }; + + sw_phy1: ethernet-phy@1 { + reg = <0x1>; + }; + + sw_phy2: ethernet-phy@2 { + reg = <0x2>; + }; + + sw_phy3: ethernet-phy@3 { + reg = <0x3>; + }; + }; + ports { #address-cells = <1>; #size-cells = <0>;
arch/arm/dts/imx6qdl-gw5904.dtsi line 243
Quoted 4 lines
arch/arm/dts/imx6qdl-gw5904.dtsi +1
-0@@ -219,27 +240,36 @@ port@0 { reg = <0>; label = "lan4"; + phy-handle = <&sw_phy0>;
phy-mode = "internal";
arch/arm/dts/imx6qdl-gw5904.dtsi line 249
Quoted 6 lines
arch/arm/dts/imx6qdl-gw5904.dtsi +1
-0}; port@1 { reg = <1>; label = "lan3"; + phy-handle = <&sw_phy1>;
phy-mode = "internal";
arch/arm/dts/imx6qdl-gw5904.dtsi line 255
Quoted 6 lines
arch/arm/dts/imx6qdl-gw5904.dtsi +1
-0}; port@2 { reg = <2>; label = "lan2"; + phy-handle = <&sw_phy2>;
phy-mode = "internal";
arch/arm/dts/imx6qdl-gw5904.dtsi line 261
Quoted 6 lines
arch/arm/dts/imx6qdl-gw5904.dtsi +1
-0}; port@3 { reg = <3>; label = "lan1"; + phy-handle = <&sw_phy3>;
phy-mode = "internal";
Quoted 15 lines
arch/arm/dts/imx6qdl-gw5904.dtsi +6
-1}; port@5 { reg = <5>; - label = "cpu"; ethernet = <&fec>; + phy-mode = "rgmii-id"; + + fixed-link { + speed = <1000>; + full-duplex; + }; }; }; };