dwc2 USB controller hangs with lan78xx

[u-boot] / drivers / net / mvneta.c

diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 8881cc77fe2aef99bd037f93a18e11d21be22040..45e5eda95522c0f588e4878ee2e46e1fd59be854 100644 (file)
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Driver for Marvell NETA network card for Armada XP and Armada 370 SoCs.
  *
@@ -9,8 +10,6 @@
  *
  * Rami Rosen <rosenr@marvell.com>
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- *
- * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <common.h>
@@ -540,7 +539,7 @@ static void mvneta_txq_pend_desc_add(struct mvneta_port *pp,
        u32 val;
 
        /* Only 255 descriptors can be added at once ; Assume caller
-        * process TX desriptors in quanta less than 256
+        * process TX descriptors in quanta less than 256
         */
        val = pend_desc;
        mvreg_write(pp, MVNETA_TXQ_UPDATE_REG(txq->id), val);
@@ -890,6 +889,15 @@ static void mvneta_mac_addr_set(struct mvneta_port *pp, unsigned char *addr,
        mvneta_set_ucast_addr(pp, addr[5], queue);
 }
 
+static int mvneta_write_hwaddr(struct udevice *dev)
+{
+       mvneta_mac_addr_set(dev_get_priv(dev),
+               ((struct eth_pdata *)dev_get_platdata(dev))->enetaddr,
+               rxq_def);
+
+       return 0;
+}
+
 /* Handle rx descriptor fill by setting buf_cookie and buf_phys_addr */
 static void mvneta_rx_desc_fill(struct mvneta_rx_desc *rx_desc,
                                u32 phys_addr, u32 cookie)
@@ -1017,6 +1025,8 @@ static int mvneta_rxq_init(struct mvneta_port *pp,
        if (rxq->descs == NULL)
                return -ENOMEM;
 
+       WARN_ON(rxq->descs != PTR_ALIGN(rxq->descs, ARCH_DMA_MINALIGN));
+
        rxq->last_desc = rxq->size - 1;
 
        /* Set Rx descriptors queue starting address */
@@ -1053,6 +1063,8 @@ static int mvneta_txq_init(struct mvneta_port *pp,
        if (txq->descs == NULL)
                return -ENOMEM;
 
+       WARN_ON(txq->descs != PTR_ALIGN(txq->descs, ARCH_DMA_MINALIGN));
+
        txq->last_desc = txq->size - 1;
 
        /* Set maximum bandwidth for enabled TXQs */
@@ -1554,6 +1566,10 @@ static int mvneta_start(struct udevice *dev)
 
                        phydev = phy_connect(pp->bus, pp->phyaddr, dev,
                                             pp->phy_interface);
+                       if (!phydev) {
+                               printf("phy_connect failed\n");
+                               return -ENODEV;
+                       }
 
                        pp->phydev = phydev;
                        phy_config(phydev);
@@ -1654,7 +1670,11 @@ static int mvneta_recv(struct udevice *dev, int flags, uchar **packetp)
                 */
                *packetp = data;
 
-               mvneta_rxq_desc_num_update(pp, rxq, rx_done, rx_done);
+               /*
+                * Only mark one descriptor as free
+                * since only one was processed
+                */
+               mvneta_rxq_desc_num_update(pp, rxq, 1, 1);
        }
 
        return rx_bytes;
@@ -1678,24 +1698,26 @@ static int mvneta_probe(struct udevice *dev)
         * be active. Make this area DMA safe by disabling the D-cache
         */
        if (!buffer_loc.tx_descs) {
+               u32 size;
+
                /* Align buffer area for descs and rx_buffers to 1MiB */
                bd_space = memalign(1 << MMU_SECTION_SHIFT, BD_SPACE);
                mmu_set_region_dcache_behaviour((phys_addr_t)bd_space, BD_SPACE,
                                                DCACHE_OFF);
                buffer_loc.tx_descs = (struct mvneta_tx_desc *)bd_space;
+               size = roundup(MVNETA_MAX_TXD * sizeof(struct mvneta_tx_desc),
+                               ARCH_DMA_MINALIGN);
                buffer_loc.rx_descs = (struct mvneta_rx_desc *)
-                       ((phys_addr_t)bd_space +
-                        MVNETA_MAX_TXD * sizeof(struct mvneta_tx_desc));
-               buffer_loc.rx_buffers = (phys_addr_t)
-                       (bd_space +
-                        MVNETA_MAX_TXD * sizeof(struct mvneta_tx_desc) +
-                        MVNETA_MAX_RXD * sizeof(struct mvneta_rx_desc));
+                       ((phys_addr_t)bd_space + size);
+               size += roundup(MVNETA_MAX_RXD * sizeof(struct mvneta_rx_desc),
+                               ARCH_DMA_MINALIGN);
+               buffer_loc.rx_buffers = (phys_addr_t)(bd_space + size);
        }
 
        pp->base = (void __iomem *)pdata->iobase;
 
        /* Configure MBUS address windows */
-       if (of_device_is_compatible(dev, "marvell,armada-3700-neta"))
+       if (device_is_compatible(dev, "marvell,armada-3700-neta"))
                mvneta_bypass_mbus_windows(pp);
        else
                mvneta_conf_mbus_windows(pp);
@@ -1749,6 +1771,7 @@ static const struct eth_ops mvneta_ops = {
        .send           = mvneta_send,
        .recv           = mvneta_recv,
        .stop           = mvneta_stop,
+       .write_hwaddr   = mvneta_write_hwaddr,
 };
 
 static int mvneta_ofdata_to_platdata(struct udevice *dev)
@@ -1756,7 +1779,7 @@ static int mvneta_ofdata_to_platdata(struct udevice *dev)
        struct eth_pdata *pdata = dev_get_platdata(dev);
        const char *phy_mode;
 
-       pdata->iobase = dev_get_addr(dev);
+       pdata->iobase = devfdt_get_addr(dev);
 
        /* Get phy-mode / phy_interface from DT */
        pdata->phy_interface = -1;