Switch MVPP2 to use new MVMDIO
Subsystems (2)
v3 cover Switch MVPP2 to use new MVMDIO
From: Nevo Hed <[email protected]>
This patchset includes several commits form Marvell's downstream repo including Ken Ma's patch to replace the SMI implementation with his own Marvell MDIO impolementation. That MVMDIO implementation never made it to upstream and has since been re-implemented by Alex Marginean and seems to be in line for inclusion [1]. My last patch in this set modified Ken's mvpp2 patch to use this new MVMDIO implementation. Few other mvpp2 patches picked as they seemed important yet missing from upstream.
Changes since v2:
- Removed Reviewed-on lines from Marvell commits, they are meaningless in upstream U-Boot
- Commit messages rewording
- Split out Kconfig (select of MVMDIO & DM_MDIO by MVPP2)
- reworded heading on dtsi change to match last commit (due to noticing no delegates weere listed on patchworks)
Changes since v1:
- removes a redaundant fixed-link patch
[1] https://patchwork.ozlabs.org/cover/1136769/
Grzegorz Jaszczyk (1):
net: mvpp2: mark phy as invalid in case of missing appropriate driver
Ken Ma (1):
net: mvpp2: Replace SMI implementation with marvell MDIO API
Nevo Hed (4):
net: mvpp2: no deref null
arm: dts: armada-cp110-*dtsi: add xmdio nodes
net: mvpp2: use new MVMDIO driver
net: mvpp2: MVPP2 now needs MVMDIO
Stefan Chulski (1):
net: mvpp2x: fix traffic stuck after PHY start error
arch/arm/dts/armada-cp110-master.dtsi | 9 + arch/arm/dts/armada-cp110-slave.dtsi | 9 + drivers/net/Kconfig | 2 + drivers/net/mvpp2.c | 240 ++++++-------------------- 4 files changed, 72 insertions(+), 188 deletions(-)
--
2.21.0
PATCH v3 1/7 net: mvpp2x: fix traffic stuck after PHY start error
From: Stefan Chulski <[email protected]>
Issue:
- Network stuck if autonegotion fails.
Issue root cause:
- When autonegotiation fails during port open procedure, the packet processor configuration does not finish and open procedure exits with error.
- However, this doesn't prevent u-boot network framework from calling send and receive procedures.
- Using transmit and receive functions of misconfigured packet processor will cause traffic to get stuck.
Fix:
- Continue packet processor configuration even if autonegotiation fails. Only error message is triggered in this case.
- Exit transmit and receive functions if there is no PHY link indication.
- U-boot network framework now calls open procedure again during next transmit initiation.
--- drivers/net/mvpp2.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)
drivers/net/mvpp2.c +14 -13
@@ -4494,7 +4494,7 @@ static void mvpp2_stop_dev(struct mvpp2_port *port)gop_port_enable (port,0 ); } -static int mvpp2_phy_connect (struct udevice *dev,struct mvpp2_port *port) +static void mvpp2_phy_connect (struct udevice *dev,struct mvpp2_port *port) {struct phy_device *phy_dev;
@@ -4504,7 +4504,7 @@ static int mvpp2_phy_connect(struct udevice *dev, struct mvpp2_port *port) port->phy_dev = phy_dev;if (!phy_dev) {netdev_err (port->dev,"cannot connect to phy\n" ); -return -ENODEV ; +return ; } phy_dev->supported &=PHY_GBIT_FEATURES ; phy_dev->advertising = phy_dev->supported;
@@ -4516,18 +4516,14 @@ static int mvpp2_phy_connect(struct udevice *dev, struct mvpp2_port *port)phy_config (phy_dev);phy_startup (phy_dev); -if (!phy_dev->link) { +if (!phy_dev->link)printf ("%s: No link\n" , phy_dev->dev->name); -return -1 ; - } - - port->init =1 ; +else + port->init =1 ; }else {mvpp2_egress_enable (port);mvpp2_ingress_enable (port); } - -return 0 ; }static int mvpp2_open (struct udevice *dev,struct mvpp2_port *port)
@@ -4567,10 +4563,7 @@ static int mvpp2_open(struct udevice *dev, struct mvpp2_port *port) }if (port->phy_node) { - err =mvpp2_phy_connect (dev, port); -if (err <0 ) -return err; - +mvpp2_phy_connect (dev, port);mvpp2_link_event (port); }else {mvpp2_egress_enable (port);
@@ -5175,6 +5168,10 @@ static int mvpp2_recv(struct udevice *dev, int flags, uchar **packetp)struct mvpp2_rx_queue *rxq;u8 *data; +if (port->phy_node) +if (!port->phy_dev->link) +return 0 ; +/* Process RX packets */ rxq = port->rxqs[0 ];
@@ -5240,6 +5237,10 @@ static int mvpp2_send(struct udevice *dev, void *packet, int length)int tx_done;int timeout; +if (port->phy_node) +if (!port->phy_dev->link) +return 0 ; + txq = port->txqs[0 ]; aggr_txq = &port->priv->aggr_txqs[smp_processor_id ()];
Signature · 1 line
2.21.0
PATCH v3 1/7 net: mvpp2x: fix traffic stuck after PHY start error
Quoted 111 lines · On Tue, Aug 6, 2019 at 6:52 PM <[email protected]> wrote:
From: Stefan Chulski <[email protected]>
Issue:
- Network stuck if autonegotion fails.Issue root cause:
- When autonegotiation fails during port open procedure, the packet processor configuration does not finish and open procedure exits with error.
- However, this doesn't prevent u-boot network framework from calling send and receive procedures.
- Using transmit and receive functions of misconfigured packet processor will cause traffic to get stuck.Fix:
- Continue packet processor configuration even if autonegotiation fails. Only error message is triggered in this case.
- Exit transmit and receive functions if there is no PHY link indication.
- U-boot network framework now calls open procedure again during next transmit initiation.Signed-off-by Stefan Chulski <[email protected]>Reviewed-by Igal Liberman <[email protected]>Tested-by Igal Liberman <[email protected]>--- drivers/net/mvpp2.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)drivers/net/mvpp2.c +14
-14@@ -4494,7 +4494,7 @@ static void mvpp2_stop_dev(struct mvpp2_port *port)gop_port_enable (port,0 ); } -static int mvpp2_phy_connect (struct udevice *dev,struct mvpp2_port *port) +static void mvpp2_phy_connect (struct udevice *dev,struct mvpp2_port *port) {struct phy_device *phy_dev;@@ -4504,7 +4504,7 @@ static int mvpp2_phy_connect(struct udevice *dev, struct mvpp2_port *port) port->phy_dev = phy_dev;if (!phy_dev) {netdev_err (port->dev,"cannot connect to phy\n" ); -return -ENODEV ; +return ; } phy_dev->supported &=PHY_GBIT_FEATURES ; phy_dev->advertising = phy_dev->supported;@@ -4516,18 +4516,14 @@ static int mvpp2_phy_connect(struct udevice *dev, struct mvpp2_port *port)phy_config (phy_dev);phy_startup (phy_dev); -if (!phy_dev->link) { +if (!phy_dev->link)printf ("%s: No link\n" , phy_dev->dev->name); -return -1 ; - } - - port->init =1 ; +else + port->init =1 ; }else {mvpp2_egress_enable (port);mvpp2_ingress_enable (port); } - -return 0 ; }static int mvpp2_open (struct udevice *dev,struct mvpp2_port *port)@@ -4567,10 +4563,7 @@ static int mvpp2_open(struct udevice *dev, struct mvpp2_port *port) }if (port->phy_node) { - err =mvpp2_phy_connect (dev, port); -if (err <0 ) -return err; - +mvpp2_phy_connect (dev, port);mvpp2_link_event (port); }else {mvpp2_egress_enable (port);@@ -5175,6 +5168,10 @@ static int mvpp2_recv(struct udevice *dev, int flags, uchar **packetp)struct mvpp2_rx_queue *rxq;u8 *data; +if (port->phy_node) +if (!port->phy_dev->link) +return 0 ; +/* Process RX packets */ rxq = port->rxqs[0 ];@@ -5240,6 +5237,10 @@ static int mvpp2_send(struct udevice *dev, void *packet, int length)int tx_done;int timeout; +if (port->phy_node) +if (!port->phy_dev->link) +return 0 ; + txq = port->txqs[0 ]; aggr_txq = &port->priv->aggr_txqs[smp_processor_id ()]; --
Quoted 2 lines
2.21.0
PATCH v3 1/7 net: mvpp2x: fix traffic stuck after PHY start error
In reply to nhed+uboot at starry.comQuoted 25 lines · On Tue, Aug 6, 2019 at 10:52 AM <[email protected]> wrote:
From: Stefan Chulski <[email protected]>
Issue:
- Network stuck if autonegotion fails.Issue root cause:
- When autonegotiation fails during port open procedure, the packet processor configuration does not finish and open procedure exits with error.
- However, this doesn't prevent u-boot network framework from calling send and receive procedures.
- Using transmit and receive functions of misconfigured packet processor will cause traffic to get stuck.Fix:
- Continue packet processor configuration even if autonegotiation fails. Only error message is triggered in this case.
- Exit transmit and receive functions if there is no PHY link indication.
- U-boot network framework now calls open procedure again during next transmit initiation.
Quoted 3 lines
Signed-off-by Stefan Chulski <[email protected]>Reviewed-by Igal Liberman <[email protected]>Tested-by Igal Liberman <[email protected]>
PATCH v3 2/7 net: mvpp2: Replace SMI implementation with marvell MDIO API
In reply to nhed+uboot at starry.comFrom: Ken Ma <[email protected]>
The availability of the marvell MDIO driver enables us to eliminate the SMI function implementation within the mvpp2 driver.
This replacement also fixes 2 old issues:
1. Each pp2 port device now has its own mdio bus field member since some pp2 ports may use SMI mdio bus while some other pp2 ports may use XSMI mdio bus, but the old mvpp2_base device has a shared bus for all its pp2 ports; this patch moves mdio bus field member from struct mvpp2 to struct mvpp2_port;
2. Old code uses mvpp2_base device name as mdio bus name; but for Armada80x0, cp0 ethernet device and cp1 ethernet device have the same device name - "ethernet at 0"; and because mdio_register() checks unique name, then the second probed mvpp2_base device fails to register mdio bus; since new marvell MDIO driver has resolved the unique name issue - different mdio names can be set in fdt and if a mdio name is not set, the default mdio name is generated from the mdio bus base address, so this issue is fixed by this replacement.
--- drivers/net/mvpp2.c | 158 ++++---------------------------------------- 1 file changed, 12 insertions(+), 146 deletions(-)
drivers/net/mvpp2.c +12 -146
@@ -32,6 +32,7 @@#include <linux/mbus.h> #include <asm-generic/gpio.h> #include <fdt_support.h> +#include <mdio.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -62,8 +63,6 @@ do { \#define MTU 1500#define RX_BUFFER_SIZE (ALIGN(MTU + WRAP, ARCH_DMA_MINALIGN)) -#define MVPP2_SMI_TIMEOUT 10000 -/* RX Fifo Registers */ #define MVPP2_RX_DATA_FIFO_SIZE_REG (port) (0x00 + 4 * (port))#define MVPP2_RX_ATTR_FIFO_SIZE_REG (port) (0x20 + 4 * (port))
@@ -490,23 +489,8 @@ do { \#define MVPP2_QUEUE_NEXT_DESC (q, index) \ (((index) < (q)->last_desc) ? ((index) + 1) : 0) -/* SMI: 0xc0054 -> offset 0x54 to lms_base */ -#define MVPP21_SMI 0x0054/* PP2.2: SMI: 0x12a200 -> offset 0x1200 to iface_base */ #define MVPP22_SMI 0x1200 -#define MVPP2_PHY_REG_MASK 0x1f -/* SMI register fields */ -#define MVPP2_SMI_DATA_OFFS 0/* Data */ -#define MVPP2_SMI_DATA_MASK (0xffff << MVPP2_SMI_DATA_OFFS) -#define MVPP2_SMI_DEV_ADDR_OFFS 16/* PHY device address */ -#define MVPP2_SMI_REG_ADDR_OFFS 21/* PHY device reg addr*/ -#define MVPP2_SMI_OPCODE_OFFS 26/* Write/Read opcode */ -#define MVPP2_SMI_OPCODE_READ (1 << MVPP2_SMI_OPCODE_OFFS) -#define MVPP2_SMI_READ_VALID (1 << 27)/* Read Valid */ -#define MVPP2_SMI_BUSY (1 << 28)/* Busy */ - -#define MVPP2_PHY_ADDR_MASK 0x1f -#define MVPP2_PHY_REG_MASK 0x1f/* Additional PPv2.2 offsets */ #define MVPP22_MPCS 0x007000
@@ -973,7 +957,6 @@ struct mvpp2_port {struct phy_device *phy_dev;phy_interface_t phy_interface; -int phy_node;int phyaddr;struct mii_dev *bus;#ifdef CONFIG_DM_GPIO
@@ -4562,7 +4545,7 @@ static int mvpp2_open(struct udevice *dev, struct mvpp2_port *port)return err; } -if (port->phy_node) { +if (port->phyaddr <PHY_MAX_ADDR ) {mvpp2_phy_connect (dev, port);mvpp2_link_event (port); }else {
@@ -4701,6 +4684,7 @@ static int phy_info_parse(struct udevice *dev, struct mvpp2_port *port)u32 id;u32 phyaddr =0 ;int phy_mode =-1 ; +int ret;/* Default mdio_base from the same eth base */ if (port->priv->hw_version ==MVPP21 )
@@ -4719,17 +4703,12 @@ static int phy_info_parse(struct udevice *dev, struct mvpp2_port *port)dev_err (&pdev->dev,"could not find phy address\n" );return -1 ; } - - phy_ofnode =ofnode_get_parent (offset_to_ofnode (phy_node)); - phy_base =ofnode_get_addr (phy_ofnode); - port->mdio_base = (void *)phy_base; - -if (port->mdio_base <0 ) { -dev_err (&pdev->dev,"could not find mdio base address\n" ); -return -1 ; - } + ret =mdio_mii_bus_get_from_phy (phy_node, &port->bus); +if (ret) +return ret; }else { - phy_node =0 ; +/* phy_addr is set to invalid value */ + phyaddr =PHY_MAX_ADDR ; } phy_mode_str =fdt_getprop (gd->fdt_blob, port_node,"phy-mode" ,NULL );
@@ -4767,7 +4746,6 @@ static int phy_info_parse(struct udevice *dev, struct mvpp2_port *port) port->first_rxq = port->id * rxq_number; else port->first_rxq = port->id * port->priv->max_port_rxqs; - port->phy_node = phy_node; port->phy_interface = phy_mode; port->phyaddr = phyaddr;
@@ -5044,119 +5022,7 @@ static int mvpp2_init(struct udevice *dev, struct mvpp2 *priv)return 0 ; } -/* SMI / MDIO functions */ - -static int smi_wait_ready (struct mvpp2_port *priv) -{ -u32 timeout =MVPP2_SMI_TIMEOUT ; -u32 smi_reg; - -/* wait till the SMI is not busy */ -do { -/* read smi register */ - smi_reg =readl (priv->mdio_base); -if (timeout-- ==0 ) { -printf ("Error: SMI busy timeout\n" ); -return -EFAULT ; - } - }while (smi_reg &MVPP2_SMI_BUSY ); - -return 0 ; -} - -/* -* mpp2_mdio_read - miiphy_read callback function. -* -* Returns 16bit phy register value, or 0xffff on error -*/ -static int mpp2_mdio_read (struct mii_dev *bus,int addr,int devad,int reg) -{ -struct mvpp2_port *priv = bus->priv; -u32 smi_reg; -u32 timeout; - -/* check parameters */ -if (addr >MVPP2_PHY_ADDR_MASK ) { -printf ("Error: Invalid PHY address %d\n" , addr); -return -EFAULT ; - } - -if (reg >MVPP2_PHY_REG_MASK ) { -printf ("Err: Invalid register offset %d\n" , reg); -return -EFAULT ; - } - -/* wait till the SMI is not busy */ -if (smi_wait_ready (priv) <0 ) -return -EFAULT ; - -/* fill the phy address and regiser offset and read opcode */ - smi_reg = (addr <<MVPP2_SMI_DEV_ADDR_OFFS ) - | (reg <<MVPP2_SMI_REG_ADDR_OFFS ) - |MVPP2_SMI_OPCODE_READ ; - -/* write the smi register */ -writel (smi_reg, priv->mdio_base); - -/* wait till read value is ready */ - timeout =MVPP2_SMI_TIMEOUT ; - -do { -/* read smi register */ - smi_reg =readl (priv->mdio_base); -if (timeout-- ==0 ) { -printf ("Err: SMI read ready timeout\n" ); -return -EFAULT ; - } - }while (!(smi_reg &MVPP2_SMI_READ_VALID )); - -/* Wait for the data to update in the SMI register */ -for (timeout =0 ; timeout <MVPP2_SMI_TIMEOUT ; timeout++) - ; - -return readl (priv->mdio_base) &MVPP2_SMI_DATA_MASK ; -} - -/* -* mpp2_mdio_write - miiphy_write callback function. -* -* Returns 0 if write succeed, -EINVAL on bad parameters -* -ETIME on timeout -*/ -static int mpp2_mdio_write (struct mii_dev *bus,int addr,int devad,int reg, -u16 value) -{ -struct mvpp2_port *priv = bus->priv; -u32 smi_reg; - -/* check parameters */ -if (addr >MVPP2_PHY_ADDR_MASK ) { -printf ("Error: Invalid PHY address %d\n" , addr); -return -EFAULT ; - } - -if (reg >MVPP2_PHY_REG_MASK ) { -printf ("Err: Invalid register offset %d\n" , reg); -return -EFAULT ; - } - -/* wait till the SMI is not busy */ -if (smi_wait_ready (priv) <0 ) -return -EFAULT ; - -/* fill the phy addr and reg offset and write opcode and data */ - smi_reg = value <<MVPP2_SMI_DATA_OFFS ; - smi_reg |= (addr <<MVPP2_SMI_DEV_ADDR_OFFS ) - | (reg <<MVPP2_SMI_REG_ADDR_OFFS ); - smi_reg &= ~MVPP2_SMI_OPCODE_READ ; - -/* write the smi register */ -writel (smi_reg, priv->mdio_base); - -return 0 ; -} - -static int mvpp2_recv (struct udevice *dev,int flags,uchar **packetp) +int mvpp2_recv (struct udevice *dev,int flags,uchar **packetp) {struct mvpp2_port *port =dev_get_priv (dev);struct mvpp2_rx_desc *rx_desc;
@@ -5168,7 +5034,7 @@ static int mvpp2_recv(struct udevice *dev, int flags, uchar **packetp)struct mvpp2_rx_queue *rxq;u8 *data; -if (port->phy_node) +if (port->phyaddr <PHY_MAX_ADDR )if (!port->phy_dev->link)return 0 ;
@@ -5237,7 +5103,7 @@ static int mvpp2_send(struct udevice *dev, void *packet, int length)int tx_done;int timeout; -if (port->phy_node) +if (port->phyaddr <PHY_MAX_ADDR )if (!port->phy_dev->link)return 0 ;
@@ -5474,7 +5340,7 @@ static int mvpp2_probe(struct udevice *dev) port->gop_id *MVPP22_PORT_OFFSET ;/* Set phy address of the port */ -if (port->phy_node) +if (port->phyaddr <PHY_MAX_ADDR )mvpp22_smi_phy_addr_cfg (port);/* GoP Init */
Signature · 1 line
2.21.0
PATCH v3 2/7 net: mvpp2: Replace SMI implementation with marvell MDIO API
Quoted 278 lines · On Tue, Aug 6, 2019 at 6:52 PM <[email protected]> wrote:
From: Ken Ma <[email protected]>
The availability of the marvell MDIO driver enables us to eliminate the SMI function implementation within the mvpp2 driver.
This replacement also fixes 2 old issues:
1. Each pp2 port device now has its own mdio bus field member since some pp2 ports may use SMI mdio bus while some other pp2 ports may use XSMI mdio bus, but the oldmvpp2_basedevice has a shared bus for all its pp2 ports; this patch moves mdio bus field member from struct mvpp2 to structmvpp2_port;
2. Old code usesmvpp2_basedevice name as mdio bus name; but for Armada80x0, cp0 ethernet device and cp1 ethernet device have the same device name - "ethernet at 0"; and becausemdio_register()checks unique name, then the second probedmvpp2_basedevice fails to register mdio bus; since new marvell MDIO driver has resolved the unique name issue - different mdio names can be set in fdt and if a mdio name is not set, the default mdio name is generated from the mdio bus base address, so this issue is fixed by this replacement.Signed-off-by Ken Ma <[email protected]>Reviewed-by Igal Liberman <[email protected]>Tested-by Igal Liberman <[email protected]>Signed-off-by Nevo Hed <[email protected]>--- drivers/net/mvpp2.c | 158 ++++---------------------------------------- 1 file changed, 12 insertions(+), 146 deletions(-)drivers/net/mvpp2.c +12
-147@@ -32,6 +32,7 @@#include <linux/mbus.h> #include <asm-generic/gpio.h> #include <fdt_support.h> +#include <mdio.h> DECLARE_GLOBAL_DATA_PTR ;@@ -62,8 +63,6 @@ do { \#define MTU 1500#define RX_BUFFER_SIZE (ALIGN(MTU + WRAP, ARCH_DMA_MINALIGN)) -#define MVPP2_SMI_TIMEOUT 10000 -/* RX Fifo Registers */ #define MVPP2_RX_DATA_FIFO_SIZE_REG (port) (0x00 + 4 * (port))#define MVPP2_RX_ATTR_FIFO_SIZE_REG (port) (0x20 + 4 * (port))@@ -490,23 +489,8 @@ do { \#define MVPP2_QUEUE_NEXT_DESC (q, index) \ (((index) < (q)->last_desc) ? ((index) + 1) : 0) -/* SMI: 0xc0054 -> offset 0x54 to lms_base */ -#define MVPP21_SMI 0x0054/* PP2.2: SMI: 0x12a200 -> offset 0x1200 to iface_base */ #define MVPP22_SMI 0x1200 -#define MVPP2_PHY_REG_MASK 0x1f -/* SMI register fields */ -#define MVPP2_SMI_DATA_OFFS 0/* Data */ -#define MVPP2_SMI_DATA_MASK (0xffff << MVPP2_SMI_DATA_OFFS) -#define MVPP2_SMI_DEV_ADDR_OFFS 16/* PHY device address */ -#define MVPP2_SMI_REG_ADDR_OFFS 21/* PHY device reg addr*/ -#define MVPP2_SMI_OPCODE_OFFS 26/* Write/Read opcode */ -#define MVPP2_SMI_OPCODE_READ (1 << MVPP2_SMI_OPCODE_OFFS) -#define MVPP2_SMI_READ_VALID (1 << 27)/* Read Valid */ -#define MVPP2_SMI_BUSY (1 << 28)/* Busy */ - -#define MVPP2_PHY_ADDR_MASK 0x1f -#define MVPP2_PHY_REG_MASK 0x1f/* Additional PPv2.2 offsets */ #define MVPP22_MPCS 0x007000@@ -973,7 +957,6 @@ struct mvpp2_port {struct phy_device *phy_dev;phy_interface_t phy_interface; -int phy_node;int phyaddr;struct mii_dev *bus;#ifdef CONFIG_DM_GPIO @@ -4562,7 +4545,7 @@ static int mvpp2_open(struct udevice *dev, struct mvpp2_port *port)return err; } -if (port->phy_node) { +if (port->phyaddr <PHY_MAX_ADDR ) {mvpp2_phy_connect (dev, port);mvpp2_link_event (port); }else {@@ -4701,6 +4684,7 @@ static int phy_info_parse(struct udevice *dev, struct mvpp2_port *port)u32 id;u32 phyaddr =0 ;int phy_mode =-1 ; +int ret;/* Default mdio_base from the same eth base */ if (port->priv->hw_version ==MVPP21 )@@ -4719,17 +4703,12 @@ static int phy_info_parse(struct udevice *dev, struct mvpp2_port *port)dev_err (&pdev->dev,"could not find phy address\n" );return -1 ; } - - phy_ofnode =ofnode_get_parent (offset_to_ofnode (phy_node)); - phy_base =ofnode_get_addr (phy_ofnode); - port->mdio_base = (void *)phy_base; - -if (port->mdio_base <0 ) { -dev_err (&pdev->dev,"could not find mdio base address\n" ); -return -1 ; - } + ret =mdio_mii_bus_get_from_phy (phy_node, &port->bus); +if (ret) +return ret; }else { - phy_node =0 ; +/* phy_addr is set to invalid value */ + phyaddr =PHY_MAX_ADDR ; } phy_mode_str =fdt_getprop (gd->fdt_blob, port_node,"phy-mode" ,NULL );@@ -4767,7 +4746,6 @@ static int phy_info_parse(struct udevice *dev, struct mvpp2_port *port) port->first_rxq = port->id * rxq_number; else port->first_rxq = port->id * port->priv->max_port_rxqs; - port->phy_node = phy_node; port->phy_interface = phy_mode; port->phyaddr = phyaddr;@@ -5044,119 +5022,7 @@ static int mvpp2_init(struct udevice *dev, struct mvpp2 *priv)return 0 ; } -/* SMI / MDIO functions */ - -static int smi_wait_ready (struct mvpp2_port *priv) -{ -u32 timeout =MVPP2_SMI_TIMEOUT ; -u32 smi_reg; - -/* wait till the SMI is not busy */ -do { -/* read smi register */ - smi_reg =readl (priv->mdio_base); -if (timeout-- ==0 ) { -printf ("Error: SMI busy timeout\n" ); -return -EFAULT ; - } - }while (smi_reg &MVPP2_SMI_BUSY ); - -return 0 ; -} - -/* -* mpp2_mdio_read - miiphy_read callback function. -* -* Returns 16bit phy register value, or 0xffff on error -*/ -static int mpp2_mdio_read (struct mii_dev *bus,int addr,int devad,int reg) -{ -struct mvpp2_port *priv = bus->priv; -u32 smi_reg; -u32 timeout; - -/* check parameters */ -if (addr >MVPP2_PHY_ADDR_MASK ) { -printf ("Error: Invalid PHY address %d\n" , addr); -return -EFAULT ; - } - -if (reg >MVPP2_PHY_REG_MASK ) { -printf ("Err: Invalid register offset %d\n" , reg); -return -EFAULT ; - } - -/* wait till the SMI is not busy */ -if (smi_wait_ready (priv) <0 ) -return -EFAULT ; - -/* fill the phy address and regiser offset and read opcode */ - smi_reg = (addr <<MVPP2_SMI_DEV_ADDR_OFFS ) - | (reg <<MVPP2_SMI_REG_ADDR_OFFS ) - |MVPP2_SMI_OPCODE_READ ; - -/* write the smi register */ -writel (smi_reg, priv->mdio_base); - -/* wait till read value is ready */ - timeout =MVPP2_SMI_TIMEOUT ; - -do { -/* read smi register */ - smi_reg =readl (priv->mdio_base); -if (timeout-- ==0 ) { -printf ("Err: SMI read ready timeout\n" ); -return -EFAULT ; - } - }while (!(smi_reg &MVPP2_SMI_READ_VALID )); - -/* Wait for the data to update in the SMI register */ -for (timeout =0 ; timeout <MVPP2_SMI_TIMEOUT ; timeout++) - ; - -return readl (priv->mdio_base) &MVPP2_SMI_DATA_MASK ; -} - -/* -* mpp2_mdio_write - miiphy_write callback function. -* -* Returns 0 if write succeed, -EINVAL on bad parameters -* -ETIME on timeout -*/ -static int mpp2_mdio_write (struct mii_dev *bus,int addr,int devad,int reg, -u16 value) -{ -struct mvpp2_port *priv = bus->priv; -u32 smi_reg; - -/* check parameters */ -if (addr >MVPP2_PHY_ADDR_MASK ) { -printf ("Error: Invalid PHY address %d\n" , addr); -return -EFAULT ; - } - -if (reg >MVPP2_PHY_REG_MASK ) { -printf ("Err: Invalid register offset %d\n" , reg); -return -EFAULT ; - } - -/* wait till the SMI is not busy */ -if (smi_wait_ready (priv) <0 ) -return -EFAULT ; - -/* fill the phy addr and reg offset and write opcode and data */ - smi_reg = value <<MVPP2_SMI_DATA_OFFS ; - smi_reg |= (addr <<MVPP2_SMI_DEV_ADDR_OFFS ) - | (reg <<MVPP2_SMI_REG_ADDR_OFFS ); - smi_reg &= ~MVPP2_SMI_OPCODE_READ ; - -/* write the smi register */ -writel (smi_reg, priv->mdio_base); - -return 0 ; -} - -static int mvpp2_recv (struct udevice *dev,int flags,uchar **packetp) +int mvpp2_recv (struct udevice *dev,int flags,uchar **packetp) {struct mvpp2_port *port =dev_get_priv (dev);struct mvpp2_rx_desc *rx_desc;@@ -5168,7 +5034,7 @@ static int mvpp2_recv(struct udevice *dev, int flags, uchar **packetp)struct mvpp2_rx_queue *rxq;u8 *data; -if (port->phy_node) +if (port->phyaddr <PHY_MAX_ADDR )if (!port->phy_dev->link)return 0 ;@@ -5237,7 +5103,7 @@ static int mvpp2_send(struct udevice *dev, void *packet, int length)int tx_done;int timeout; -if (port->phy_node) +if (port->phyaddr <PHY_MAX_ADDR )if (!port->phy_dev->link)return 0 ;@@ -5474,7 +5340,7 @@ static int mvpp2_probe(struct udevice *dev) port->gop_id *MVPP22_PORT_OFFSET ;/* Set phy address of the port */ -if (port->phy_node) +if (port->phyaddr <PHY_MAX_ADDR )mvpp22_smi_phy_addr_cfg (port);/* GoP Init */ --
Quoted 2 lines
2.21.0
PATCH v3 3/7 net: mvpp2: mark phy as invalid in case of missing appropriate driver
In reply to nhed+uboot at starry.comFrom: Grzegorz Jaszczyk <[email protected]>
If the phy doesn't match with any existing u-boot drivers, the phy framework will connect it to the generic one which uid == 0xffffffff. In this case, act as if the phy wouldn't be declared in dts. Otherwise, in case of 3310 (for which the driver doesn't exist) the link is marked as always down. Removing phy entry from dts in case of 3310 is not a good option because it is required for the phy_fw_down procedure.
This patch fixes the issue with the link always down on MCBIN board.
--- drivers/net/mvpp2.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/net/mvpp2.c +21 -0
@@ -4484,6 +4484,27 @@ static void mvpp2_phy_connect(struct udevice *dev, struct mvpp2_port *port)if (!port->init || port->link ==0 ) { phy_dev =phy_connect (port->bus, port->phyaddr, dev, port->phy_interface); + +/* If the phy doesn't match with any existing u-boot drivers the +* phy framework will connect it to generic one which +* uid == 0xffffffff. In this case act as if the phy wouldn't be +* declared in dts. Otherwise in case of 3310 (for which the +* driver doesn't exist) the link will not be correctly +* detected. Removing phy entry from dts in case of 3310 is not +* an option because it is required for the phy_fw_down +* procedure. +*/ +if (phy_dev->drv->uid ==0xffffffff ) {/* Generic phy */ +netdev_warn (port->dev, +"Marking phy as invalid, link will not be checked\n" ); +/* set phy_addr to invalid value */ + port->phyaddr =PHY_MAX_ADDR ; +mvpp2_egress_enable (port); +mvpp2_ingress_enable (port); + +return ; + } + port->phy_dev = phy_dev;if (!phy_dev) {netdev_err (port->dev,"cannot connect to phy\n" );
Signature · 1 line
2.21.0
PATCH v3 3/7 net: mvpp2: mark phy as invalid in case of missing appropriate driver
Quoted 53 lines · On Tue, Aug 6, 2019 at 6:52 PM <[email protected]> wrote:
From: Grzegorz Jaszczyk <[email protected]>
If the phy doesn't match with any existing u-boot drivers, the phy framework will connect it to the generic one which uid ==
0xffffffff. In this case, act as if the phy wouldn't be declared in dts. Otherwise, in case of 3310 (for which the driver doesn't exist) the link is marked as always down. Removing phy entry from dts in case of 3310 is not a good option because it is required for thephy_fw_downprocedure.This patch fixes the issue with the link always down on MCBIN board.
Signed-off-by Grzegorz Jaszczyk <[email protected]>Reviewed-by Igal Liberman <[email protected]>Tested-by Igal Liberman <[email protected]>--- drivers/net/mvpp2.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)drivers/net/mvpp2.c +21
-1@@ -4484,6 +4484,27 @@ static void mvpp2_phy_connect(struct udevice *dev, struct mvpp2_port *port)if (!port->init || port->link ==0 ) { phy_dev =phy_connect (port->bus, port->phyaddr, dev, port->phy_interface); + +/* If the phy doesn't match with any existing u-boot drivers the +* phy framework will connect it to generic one which +* uid == 0xffffffff. In this case act as if the phy wouldn't be +* declared in dts. Otherwise in case of 3310 (for which the +* driver doesn't exist) the link will not be correctly +* detected. Removing phy entry from dts in case of 3310 is not +* an option because it is required for the phy_fw_down +* procedure. +*/ +if (phy_dev->drv->uid ==0xffffffff ) {/* Generic phy */ +netdev_warn (port->dev, +"Marking phy as invalid, link will not be checked\n" ); +/* set phy_addr to invalid value */ + port->phyaddr =PHY_MAX_ADDR ; +mvpp2_egress_enable (port); +mvpp2_ingress_enable (port); + +return ; + } + port->phy_dev = phy_dev;if (!phy_dev) {netdev_err (port->dev,"cannot connect to phy\n" ); --
Quoted 2 lines
2.21.0
PATCH v3 4/7 net: mvpp2: no deref null
In reply to nhed+uboot at starry.comFrom: Nevo Hed <[email protected]>
phy_dev ptr is set from return of phy_connect() and is used before test to see if NULL. Obviously since the test already sxists someone made the determination that this NULL is possible.
--- drivers/net/mvpp2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/mvpp2.c +2 -1
@@ -4494,7 +4494,8 @@ static void mvpp2_phy_connect(struct udevice *dev, struct mvpp2_port *port)* an option because it is required for the phy_fw_down * procedure. */ -if (phy_dev->drv->uid ==0xffffffff ) {/* Generic phy */ +if (phy_dev && + phy_dev->drv->uid ==0xffffffff ) {/* Generic phy */ netdev_warn (port->dev,"Marking phy as invalid, link will not be checked\n" );/* set phy_addr to invalid value */
Signature · 1 line
2.21.0
PATCH v3 4/7 net: mvpp2: no deref null
Quoted 27 lines · On Tue, Aug 6, 2019 at 6:52 PM <[email protected]> wrote:
From: Nevo Hed <[email protected]>
phy_devptr is set from return ofphy_connect()and is used before test to see if NULL. Obviously since the test already sxists someone made the determination that this NULL is possible.Signed-off-by Nevo Hed <[email protected]>--- drivers/net/mvpp2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/net/mvpp2.c +2
-2@@ -4494,7 +4494,8 @@ static void mvpp2_phy_connect(struct udevice *dev, struct mvpp2_port *port)* an option because it is required for the phy_fw_down * procedure. */ -if (phy_dev->drv->uid ==0xffffffff ) {/* Generic phy */ +if (phy_dev && + phy_dev->drv->uid ==0xffffffff ) {/* Generic phy */ netdev_warn (port->dev,"Marking phy as invalid, link will not be checked\n" );/* set phy_addr to invalid value */ --
Quoted 2 lines
2.21.0
PATCH v3 5/7 arm: dts: armada-cp110-*dtsi: add xmdio nodes
In reply to nhed+uboot at starry.comFrom: Nevo Hed <[email protected]>
Based on upstream-linux
See https://github.com/torvalds/linux/commit/f66b2aff.
However made the XSMI register window 0x16 (22) bytes per my reading of the functional spec. Similar commits in Marvels own repo bump it to 0x200 (512) bytes but I did not see the reasoning for that.
https://github.com/MarvellEmbeddedProcessors/u-boot-marvell/commit/4d932b4.
Also added device-name attributes to prevent ambiguity in the mdio command.
--- arch/arm/dts/armada-cp110-master.dtsi | 9 +++++++++ arch/arm/dts/armada-cp110-slave.dtsi | 9 +++++++++ 2 files changed, 18 insertions(+)
arch/arm/dts/armada-cp110-master.dtsi +9 -0
@@ -99,6 +99,15 @@ device-name = "cpm-mdio"; }; + cpm_xmdio: mdio at 12a600 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "marvell,xmdio"; + reg = <0x12a600 0x16>; + status = "disabled"; + device-name = "cpm-xmdio"; + }; + cpm_syscon0: system-controller at 440000 { compatible = "marvell,cp110-system-controller0", "syscon";
arch/arm/dts/armada-cp110-slave.dtsi +9 -0
@@ -99,6 +99,15 @@ device-name = "cps-mdio"; }; + cps_xmdio: mdio at 12a600 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "marvell,xmdio"; + reg = <0x12a600 0x16>; + status = "disabled"; + device-name = "cps-xmdio"; + }; + cps_syscon0: system-controller at 440000 { compatible = "marvell,cp110-system-controller0", "syscon";
Signature · 1 line
2.21.0
PATCH v3 5/7 arm: dts: armada-cp110-*dtsi: add xmdio nodes
Quoted 62 lines · On Tue, Aug 6, 2019 at 6:52 PM <[email protected]> wrote:
From: Nevo Hed <[email protected]>
Based on upstream-linux
See https://github.com/torvalds/linux/commit/f66b2aff.However made the XSMI register window
0x16(22) bytes per my reading of the functional spec. Similar commits in Marvels own repo bump it to0x200(512) bytes but I did not see the reasoning for that.https://github.com/MarvellEmbeddedProcessors/u-boot-marvell/commit/4d932b4.
Also added device-name attributes to prevent ambiguity in the
mdiocommand.Signed-off-by Nevo Hed <[email protected]>--- arch/arm/dts/armada-cp110-master.dtsi | 9 +++++++++ arch/arm/dts/armada-cp110-slave.dtsi | 9 +++++++++ 2 files changed, 18 insertions(+)arch/arm/dts/armada-cp110-master.dtsi +9
-0@@ -99,6 +99,15 @@ device-name = "cpm-mdio"; }; + cpm_xmdio: mdio at 12a600 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "marvell,xmdio"; + reg = <0x12a600 0x16>; + status = "disabled"; + device-name = "cpm-xmdio"; + }; + cpm_syscon0: system-controller at 440000 { compatible = "marvell,cp110-system-controller0", "syscon";arch/arm/dts/armada-cp110-slave.dtsi +9
-1@@ -99,6 +99,15 @@ device-name = "cps-mdio"; }; + cps_xmdio: mdio at 12a600 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "marvell,xmdio"; + reg = <0x12a600 0x16>; + status = "disabled"; + device-name = "cps-xmdio"; + }; + cps_syscon0: system-controller at 440000 { compatible = "marvell,cp110-system-controller0", "syscon"; --
Quoted 2 lines
2.21.0
PATCH v3 5/7 arm: dts: armada-cp110-*dtsi: add xmdio nodes
In reply to nhed+uboot at starry.comQuoted 10 lines · On Tue, Aug 6, 2019 at 10:52 AM <[email protected]> wrote:
From: Nevo Hed <[email protected]>
Based on upstream-linux
See https://github.com/torvalds/linux/commit/f66b2aff.However made the XSMI register window
0x16(22) bytes per my reading of the functional spec. Similar commits in Marvels own repo bump it to0x200(512) bytes but I did not see the reasoning for that.
Quoted 6 lines
https://github.com/MarvellEmbeddedProcessors/u-boot-marvell/commit/4d932b4.
Also added device-name attributes to prevent ambiguity in the
mdiocommand.Signed-off-by Nevo Hed <[email protected]>
PATCH v3 6/7 net: mvpp2: use new MVMDIO driver
In reply to nhed+uboot at starry.comFrom: Nevo Hed <[email protected]>
An earlier commit in this changeset is taken from Marvells repos but was based on an MVMDIO implementation that never made it into U-Boot. With this patch the mvpp2 driver switches to use the new MVMDIO driver that is based on a more universal mdio-uclass implementation.
--- drivers/net/mvpp2.c | 45 ++++++++++----------------------------------- 1 file changed, 10 insertions(+), 35 deletions(-)
drivers/net/mvpp2.c +10 -35
@@ -32,7 +32,7 @@#include <linux/mbus.h> #include <asm-generic/gpio.h> #include <fdt_support.h> -#include <mdio.h> +#include <linux/mdio.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -936,7 +936,6 @@ struct mvpp2_port {/* Per-port registers' base address */ void __iomem *base; -void __iomem *mdio_base;struct mvpp2_rx_queue **rxqs;struct mvpp2_tx_queue **txqs;
@@ -958,7 +957,7 @@ struct mvpp2_port {struct phy_device *phy_dev;phy_interface_t phy_interface;int phyaddr; -struct mii_dev *bus; +struct udevice *mdio_dev;#ifdef CONFIG_DM_GPIO struct gpio_desc phy_reset_gpio;struct gpio_desc phy_tx_disable_gpio;
@@ -4482,8 +4481,8 @@ static void mvpp2_phy_connect(struct udevice *dev, struct mvpp2_port *port)struct phy_device *phy_dev;if (!port->init || port->link ==0 ) { - phy_dev =phy_connect (port->bus, port->phyaddr, dev, - port->phy_interface); + phy_dev =dm_mdio_phy_connect (port->mdio_dev, port->phyaddr, + dev, port->phy_interface);/* If the phy doesn't match with any existing u-boot drivers the * phy framework will connect it to generic one which
@@ -4708,24 +4707,18 @@ static int phy_info_parse(struct udevice *dev, struct mvpp2_port *port)int phy_mode =-1 ;int ret; -/* Default mdio_base from the same eth base */ -if (port->priv->hw_version ==MVPP21 ) - port->mdio_base = port->priv->lms_base +MVPP21_SMI ; -else - port->mdio_base = port->priv->iface_base +MVPP22_SMI ; - phy_node =fdtdec_lookup_phandle (gd->fdt_blob, port_node,"phy" );if (phy_node >0 ) { -ofnode phy_ofnode; -fdt_addr_t phy_base; - +int parent; phyaddr =fdtdec_get_int (gd->fdt_blob, phy_node,"reg" ,0 );if (phyaddr <0 ) {dev_err (&pdev->dev,"could not find phy address\n" );return -1 ; } - ret =mdio_mii_bus_get_from_phy (phy_node, &port->bus); + parent =fdt_parent_offset (gd->fdt_blob, phy_node); + ret =uclass_get_device_by_of_offset (UCLASS_MDIO , parent, + &port->mdio_dev);if (ret)return ret; }else {
@@ -5044,7 +5037,7 @@ static int mvpp2_init(struct udevice *dev, struct mvpp2 *priv)return 0 ; } -int mvpp2_recv (struct udevice *dev,int flags,uchar **packetp) +static int mvpp2_recv (struct udevice *dev,int flags,uchar **packetp) {struct mvpp2_port *port =dev_get_priv (dev);struct mvpp2_rx_desc *rx_desc;
@@ -5309,31 +5302,13 @@ static int mvpp2_probe(struct udevice *dev) {struct mvpp2_port *port =dev_get_priv (dev);struct mvpp2 *priv =dev_get_priv (dev->parent); -struct mii_dev *bus;int err;/* Only call the probe function for the parent once */ if (!priv->probe_done) err =mvpp2_base_probe (dev->parent); - port->priv =dev_get_priv (dev->parent); - -/* Create and register the MDIO bus driver */ - bus =mdio_alloc (); -if (!bus) { -printf ("Failed to allocate MDIO bus\n" ); -return -ENOMEM ; - } - - bus->read = mpp2_mdio_read; - bus->write = mpp2_mdio_write; -snprintf (bus->name,sizeof (bus->name), dev->name); - bus->priv = (void *)port; - port->bus = bus; - - err =mdio_register (bus); -if (err) -return err; + port->priv = priv; err =phy_info_parse (dev, port);if (err)
Signature · 1 line
2.21.0
PATCH v3 6/7 net: mvpp2: use new MVMDIO driver
Quoted 9 lines · On Tue, Aug 6, 2019 at 10:52 AM <[email protected]> wrote:
From: Nevo Hed <[email protected]>
An earlier commit in this changeset is taken from Marvells repos but was based on an MVMDIO implementation that never made it into U-Boot. With this patch the mvpp2 driver switches to use the new MVMDIO driver that is based on a more universal mdio-uclass implementation.
Signed-off-by Nevo Hed <[email protected]>
You are missing Ramon's review tag in v3.
PATCH v3 7/7 net: mvpp2: MVPP2 now needs MVMDIO
In reply to nhed+uboot at starry.comFrom: Nevo Hed <[email protected]>
Changes to mvpp2.c require the MVMDIO module which in turn uses DM_MDIO.
--- drivers/net/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/Kconfig +2 -0
@@ -297,6 +297,8 @@ config MVPP2 bool "Marvell Armada 375/7K/8K network interface support" depends on ARMADA_375 || ARMADA_8K select PHYLIB + select MVMDIO + select DM_MDIO help This driver supports the network interface units in the Marvell ARMADA 375, 7K and 8K SoCs.
Signature · 1 line
2.21.0
PATCH v3 7/7 net: mvpp2: MVPP2 now needs MVMDIO
Quoted 25 lines · On Tue, Aug 6, 2019 at 6:52 PM <[email protected]> wrote:
From: Nevo Hed <[email protected]>
Changes to
mvpp2.crequire the MVMDIO module which in turn usesDM_MDIO.Signed-off-by Nevo Hed <[email protected]>--- drivers/net/Kconfig | 2 ++ 1 file changed, 2 insertions(+)drivers/net/Kconfig +2
-1@@ -297,6 +297,8 @@ config MVPP2 bool "Marvell Armada 375/7K/8K network interface support" depends on ARMADA_375 || ARMADA_8K select PHYLIB + select MVMDIO + select DM_MDIO help This driver supports the network interface units in the Marvell ARMADA 375, 7K and 8K SoCs. --
Quoted 2 lines
2.21.0
PATCH v3 7/7 net: mvpp2: MVPP2 now needs MVMDIO
In reply to nhed+uboot at starry.comQuoted 7 lines · On Tue, Aug 6, 2019 at 10:52 AM <[email protected]> wrote:
From: Nevo Hed <[email protected]>
Changes to
mvpp2.crequire the MVMDIO module which in turn usesDM_MDIO.Signed-off-by Nevo Hed <[email protected]>