net: rtl8139: Move functions around
[oweals/u-boot.git] / drivers / net / sh_eth.c
index 5a5c6bc39ebb13ce65d4af7529504314bf0db319..f8e5d05722ab90feabeebeacbf6cdf0cef2a900e 100644 (file)
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * sh_eth.c - Driver for Renesas ethernet controller.
  *
@@ -5,12 +6,12 @@
  * Copyright (c) 2008, 2011, 2014 2014 Nobuhiro Iwamatsu
  * Copyright (c) 2007 Carlos Munoz <carlos@kenati.com>
  * Copyright (C) 2013, 2014 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <config.h>
 #include <common.h>
+#include <cpu_func.h>
+#include <env.h>
 #include <malloc.h>
 #include <net.h>
 #include <netdev.h>
 # error "Please define CONFIG_SH_ETHER_PHY_ADDR"
 #endif
 
-#if defined(CONFIG_SH_ETHER_CACHE_WRITEBACK) && !defined(CONFIG_SYS_DCACHE_OFF)
+#if defined(CONFIG_SH_ETHER_CACHE_WRITEBACK) && \
+       !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
 #define flush_cache_wback(addr, len)    \
-               flush_dcache_range((u32)addr, \
-               (u32)(addr + ALIGN(len, CONFIG_SH_ETHER_ALIGNE_SIZE)))
+               flush_dcache_range((unsigned long)addr, \
+               (unsigned long)(addr + ALIGN(len, CONFIG_SH_ETHER_ALIGNE_SIZE)))
 #else
 #define flush_cache_wback(...)
 #endif
 #if defined(CONFIG_SH_ETHER_CACHE_INVALIDATE) && defined(CONFIG_ARM)
 #define invalidate_cache(addr, len)            \
        {       \
-               u32 line_size = CONFIG_SH_ETHER_ALIGNE_SIZE;    \
-               u32 start, end; \
+               unsigned long line_size = CONFIG_SH_ETHER_ALIGNE_SIZE;  \
+               unsigned long start, end;       \
                \
-               start = (u32)addr;      \
-               end = start + len;      \
+               start = (unsigned long)addr;    \
+               end = start + len;              \
                start &= ~(line_size - 1);      \
                end = ((end + line_size - 1) & ~(line_size - 1));       \
                \
@@ -63,8 +65,8 @@
 
 static int sh_eth_send_common(struct sh_eth_dev *eth, void *packet, int len)
 {
-       int port = eth->port, ret = 0, timeout;
-       struct sh_eth_info *port_info = &eth->port_info[port];
+       int ret = 0, timeout;
+       struct sh_eth_info *port_info = &eth->port_info[eth->port];
 
        if (!packet || len > 0xffff) {
                printf(SHETHER_NAME ": %s: Invalid argument\n", __func__);
@@ -73,7 +75,7 @@ static int sh_eth_send_common(struct sh_eth_dev *eth, void *packet, int len)
        }
 
        /* packet must be a 4 byte boundary */
-       if ((int)packet & 3) {
+       if ((uintptr_t)packet & 3) {
                printf(SHETHER_NAME ": %s: packet not 4 byte aligned\n"
                                , __func__);
                ret = -EFAULT;
@@ -120,8 +122,7 @@ err:
 
 static int sh_eth_recv_start(struct sh_eth_dev *eth)
 {
-       int port = eth->port, len = 0;
-       struct sh_eth_info *port_info = &eth->port_info[port];
+       struct sh_eth_info *port_info = &eth->port_info[eth->port];
 
        /* Check if the rx descriptor is ready */
        invalidate_cache(port_info->rx_desc_cur, sizeof(struct rx_desc_s));
@@ -132,9 +133,7 @@ static int sh_eth_recv_start(struct sh_eth_dev *eth)
        if (port_info->rx_desc_cur->rd0 & RD_RFE)
                return -EINVAL;
 
-       len = port_info->rx_desc_cur->rd1 & 0xffff;
-
-       return len;
+       return port_info->rx_desc_cur->rd1 & 0xffff;
 }
 
 static void sh_eth_recv_finish(struct sh_eth_dev *eth)
@@ -182,7 +181,7 @@ static int sh_eth_reset(struct sh_eth_dev *eth)
        return ret;
 #else
        sh_eth_write(port_info, sh_eth_read(port_info, EDMR) | EDMR_SRST, EDMR);
-       udelay(3000);
+       mdelay(3);
        sh_eth_write(port_info,
                     sh_eth_read(port_info, EDMR) & ~EDMR_SRST, EDMR);
 
@@ -192,9 +191,9 @@ static int sh_eth_reset(struct sh_eth_dev *eth)
 
 static int sh_eth_tx_desc_init(struct sh_eth_dev *eth)
 {
-       int port = eth->port, i, ret = 0;
+       int i, ret = 0;
        u32 alloc_desc_size = NUM_TX_DESC * sizeof(struct tx_desc_s);
-       struct sh_eth_info *port_info = &eth->port_info[port];
+       struct sh_eth_info *port_info = &eth->port_info[eth->port];
        struct tx_desc_s *cur_tx_desc;
 
        /*
@@ -213,7 +212,7 @@ static int sh_eth_tx_desc_init(struct sh_eth_dev *eth)
 
        /* Make sure we use a P2 address (non-cacheable) */
        port_info->tx_desc_base =
-               (struct tx_desc_s *)ADDR_TO_P2((u32)port_info->tx_desc_alloc);
+               (struct tx_desc_s *)ADDR_TO_P2((uintptr_t)port_info->tx_desc_alloc);
        port_info->tx_desc_cur = port_info->tx_desc_base;
 
        /* Initialize all descriptors */
@@ -245,9 +244,9 @@ err:
 
 static int sh_eth_rx_desc_init(struct sh_eth_dev *eth)
 {
-       int port = eth->port, i, ret = 0;
+       int i, ret = 0;
        u32 alloc_desc_size = NUM_RX_DESC * sizeof(struct rx_desc_s);
-       struct sh_eth_info *port_info = &eth->port_info[port];
+       struct sh_eth_info *port_info = &eth->port_info[eth->port];
        struct rx_desc_s *cur_rx_desc;
        u8 *rx_buf;
 
@@ -267,7 +266,7 @@ static int sh_eth_rx_desc_init(struct sh_eth_dev *eth)
 
        /* Make sure we use a P2 address (non-cacheable) */
        port_info->rx_desc_base =
-               (struct rx_desc_s *)ADDR_TO_P2((u32)port_info->rx_desc_alloc);
+               (struct rx_desc_s *)ADDR_TO_P2((uintptr_t)port_info->rx_desc_alloc);
 
        port_info->rx_desc_cur = port_info->rx_desc_base;
 
@@ -283,7 +282,7 @@ static int sh_eth_rx_desc_init(struct sh_eth_dev *eth)
                goto err_buf_alloc;
        }
 
-       port_info->rx_buf_base = (u8 *)ADDR_TO_P2((u32)port_info->rx_buf_alloc);
+       port_info->rx_buf_base = (u8 *)ADDR_TO_P2((uintptr_t)port_info->rx_buf_alloc);
 
        /* Initialize all descriptors */
        for (cur_rx_desc = port_info->rx_desc_base,
@@ -318,8 +317,7 @@ err:
 
 static void sh_eth_tx_desc_free(struct sh_eth_dev *eth)
 {
-       int port = eth->port;
-       struct sh_eth_info *port_info = &eth->port_info[port];
+       struct sh_eth_info *port_info = &eth->port_info[eth->port];
 
        if (port_info->tx_desc_alloc) {
                free(port_info->tx_desc_alloc);
@@ -329,8 +327,7 @@ static void sh_eth_tx_desc_free(struct sh_eth_dev *eth)
 
 static void sh_eth_rx_desc_free(struct sh_eth_dev *eth)
 {
-       int port = eth->port;
-       struct sh_eth_info *port_info = &eth->port_info[port];
+       struct sh_eth_info *port_info = &eth->port_info[eth->port];
 
        if (port_info->rx_desc_alloc) {
                free(port_info->rx_desc_alloc);
@@ -378,10 +375,16 @@ static void sh_eth_write_hwaddr(struct sh_eth_info *port_info,
 static void sh_eth_mac_regs_config(struct sh_eth_dev *eth, unsigned char *mac)
 {
        struct sh_eth_info *port_info = &eth->port_info[eth->port];
+       unsigned long edmr;
 
        /* Configure e-dmac registers */
-       sh_eth_write(port_info, (sh_eth_read(port_info, EDMR) & ~EMDR_DESC_R) |
-                       (EMDR_DESC | EDMR_EL), EDMR);
+       edmr = sh_eth_read(port_info, EDMR);
+       edmr &= ~EMDR_DESC_R;
+       edmr |= EMDR_DESC | EDMR_EL;
+#if defined(CONFIG_R8A77980)
+       edmr |= EDMR_NBST;
+#endif
+       sh_eth_write(port_info, edmr, EDMR);
 
        sh_eth_write(port_info, 0, EESIPR);
        sh_eth_write(port_info, 0, TRSCER);
@@ -411,7 +414,7 @@ static void sh_eth_mac_regs_config(struct sh_eth_dev *eth, unsigned char *mac)
 
 #if defined(CONFIG_CPU_SH7734) || defined(CONFIG_R8A7740)
        sh_eth_write(port_info, CONFIG_SH_ETHER_SH7734_MII, RMII_MII);
-#elif defined(CONFIG_RCAR_GEN2)
+#elif defined(CONFIG_RCAR_GEN2) || defined(CONFIG_R8A77980)
        sh_eth_write(port_info, sh_eth_read(port_info, RMIIMR) | 0x1, RMIIMR);
 #endif
 }
@@ -430,7 +433,7 @@ static int sh_eth_phy_regs_config(struct sh_eth_dev *eth)
                sh_eth_write(port_info, GECMR_100B, GECMR);
 #elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752)
                sh_eth_write(port_info, 1, RTRATE);
-#elif defined(CONFIG_CPU_SH7724) || defined(CONFIG_RCAR_GEN2)
+#elif defined(CONFIG_RCAR_GEN2) || defined(CONFIG_R8A77980)
                val = ECMR_RTM;
 #endif
        } else if (phy->speed == 10) {
@@ -522,8 +525,8 @@ static int sh_eth_start_common(struct sh_eth_dev *eth)
 #ifndef CONFIG_DM_ETH
 static int sh_eth_phy_config_legacy(struct sh_eth_dev *eth)
 {
-       int port = eth->port, ret = 0;
-       struct sh_eth_info *port_info = &eth->port_info[port];
+       int ret = 0;
+       struct sh_eth_info *port_info = &eth->port_info[eth->port];
        struct eth_device *dev = port_info->dev;
        struct phy_device *phydev;
 
@@ -545,8 +548,8 @@ static int sh_eth_send_legacy(struct eth_device *dev, void *packet, int len)
 
 static int sh_eth_recv_common(struct sh_eth_dev *eth)
 {
-       int port = eth->port, len = 0;
-       struct sh_eth_info *port_info = &eth->port_info[port];
+       int len = 0;
+       struct sh_eth_info *port_info = &eth->port_info[eth->port];
        uchar *packet = (uchar *)ADDR_TO_P2(port_info->rx_desc_cur->rd2);
 
        len = sh_eth_recv_start(eth);
@@ -680,7 +683,7 @@ struct sh_ether_priv {
        struct sh_eth_dev       shdev;
 
        struct mii_dev          *bus;
-       void __iomem            *iobase;
+       phys_addr_t             iobase;
        struct clk              clk;
        struct gpio_desc        reset_gpio;
 };
@@ -698,7 +701,7 @@ static int sh_ether_recv(struct udevice *dev, int flags, uchar **packetp)
        struct sh_ether_priv *priv = dev_get_priv(dev);
        struct sh_eth_dev *eth = &priv->shdev;
        struct sh_eth_info *port_info = &eth->port_info[eth->port];
-       uchar *packet = (uchar *)ADDR_TO_P2(port_info->rx_desc_cur->rd2);
+       uchar *packet = (uchar *)ADDR_TO_P2((uintptr_t)port_info->rx_desc_cur->rd2);
        int len;
 
        len = sh_eth_recv_start(eth);
@@ -750,8 +753,8 @@ static int sh_eth_phy_config(struct udevice *dev)
        struct sh_ether_priv *priv = dev_get_priv(dev);
        struct eth_pdata *pdata = dev_get_platdata(dev);
        struct sh_eth_dev *eth = &priv->shdev;
-       int port = eth->port, ret = 0;
-       struct sh_eth_info *port_info = &eth->port_info[port];
+       int ret = 0;
+       struct sh_eth_info *port_info = &eth->port_info[eth->port];
        struct phy_device *phydev;
        int mask = 0xffffffff;
 
@@ -774,19 +777,9 @@ static int sh_ether_start(struct udevice *dev)
        struct sh_eth_dev *eth = &priv->shdev;
        int ret;
 
-       ret = clk_enable(&priv->clk);
-       if (ret)
-               return ret;
-
        ret = sh_eth_init_common(eth, pdata->enetaddr);
        if (ret)
-               goto err_clk;
-
-       ret = sh_eth_phy_config(dev);
-       if (ret) {
-               printf(SHETHER_NAME ": phy config timeout\n");
-               goto err_start;
-       }
+               return ret;
 
        ret = sh_eth_start_common(eth);
        if (ret)
@@ -797,17 +790,17 @@ static int sh_ether_start(struct udevice *dev)
 err_start:
        sh_eth_tx_desc_free(eth);
        sh_eth_rx_desc_free(eth);
-err_clk:
-       clk_disable(&priv->clk);
        return ret;
 }
 
 static void sh_ether_stop(struct udevice *dev)
 {
        struct sh_ether_priv *priv = dev_get_priv(dev);
+       struct sh_eth_dev *eth = &priv->shdev;
+       struct sh_eth_info *port_info = &eth->port_info[eth->port];
 
+       phy_shutdown(port_info->phydev);
        sh_eth_stop(&priv->shdev);
-       clk_disable(&priv->clk);
 }
 
 static int sh_ether_probe(struct udevice *udev)
@@ -815,24 +808,33 @@ static int sh_ether_probe(struct udevice *udev)
        struct eth_pdata *pdata = dev_get_platdata(udev);
        struct sh_ether_priv *priv = dev_get_priv(udev);
        struct sh_eth_dev *eth = &priv->shdev;
+       struct ofnode_phandle_args phandle_args;
        struct mii_dev *mdiodev;
-       void __iomem *iobase;
        int ret;
 
-       iobase = map_physmem(pdata->iobase, 0x1000, MAP_NOCACHE);
-       priv->iobase = iobase;
+       priv->iobase = pdata->iobase;
 
+#if CONFIG_IS_ENABLED(CLK)
        ret = clk_get_by_index(udev, 0, &priv->clk);
        if (ret < 0)
-               goto err_mdio_alloc;
+               return ret;
+#endif
+
+       ret = dev_read_phandle_with_args(udev, "phy-handle", NULL, 0, 0, &phandle_args);
+       if (!ret) {
+               gpio_request_by_name_nodev(phandle_args.node, "reset-gpios", 0,
+                                          &priv->reset_gpio, GPIOD_IS_OUT);
+       }
 
-       gpio_request_by_name(udev, "reset-gpios", 0, &priv->reset_gpio,
-                            GPIOD_IS_OUT);
+       if (!dm_gpio_is_valid(&priv->reset_gpio)) {
+               gpio_request_by_name(udev, "reset-gpios", 0, &priv->reset_gpio,
+                                    GPIOD_IS_OUT);
+       }
 
        mdiodev = mdio_alloc();
        if (!mdiodev) {
                ret = -ENOMEM;
-               goto err_mdio_alloc;
+               return ret;
        }
 
        mdiodev->read = bb_miiphy_read;
@@ -849,14 +851,32 @@ static int sh_ether_probe(struct udevice *udev)
        eth->port = CONFIG_SH_ETHER_USE_PORT;
        eth->port_info[eth->port].phy_addr = CONFIG_SH_ETHER_PHY_ADDR;
        eth->port_info[eth->port].iobase =
-               (void __iomem *)(BASE_IO_ADDR + 0x800 * eth->port);
+               (void __iomem *)(uintptr_t)(BASE_IO_ADDR + 0x800 * eth->port);
+
+#if CONFIG_IS_ENABLED(CLK)
+       ret = clk_enable(&priv->clk);
+       if (ret)
+               goto err_mdio_register;
+#endif
+
+       ret = sh_eth_init_common(eth, pdata->enetaddr);
+       if (ret)
+               goto err_phy_config;
+
+       ret = sh_eth_phy_config(udev);
+       if (ret) {
+               printf(SHETHER_NAME ": phy config timeout\n");
+               goto err_phy_config;
+       }
 
        return 0;
 
+err_phy_config:
+#if CONFIG_IS_ENABLED(CLK)
+       clk_disable(&priv->clk);
+#endif
 err_mdio_register:
        mdio_free(mdiodev);
-err_mdio_alloc:
-       unmap_physmem(priv->iobase, MAP_NOCACHE);
        return ret;
 }
 
@@ -866,6 +886,9 @@ static int sh_ether_remove(struct udevice *udev)
        struct sh_eth_dev *eth = &priv->shdev;
        struct sh_eth_info *port_info = &eth->port_info[eth->port];
 
+#if CONFIG_IS_ENABLED(CLK)
+       clk_disable(&priv->clk);
+#endif
        free(port_info->phydev);
        mdio_unregister(priv->bus);
        mdio_free(priv->bus);
@@ -873,8 +896,6 @@ static int sh_ether_remove(struct udevice *udev)
        if (dm_gpio_is_valid(&priv->reset_gpio))
                dm_gpio_free(udev, &priv->reset_gpio);
 
-       unmap_physmem(priv->iobase, MAP_NOCACHE);
-
        return 0;
 }
 
@@ -916,7 +937,12 @@ int sh_ether_ofdata_to_platdata(struct udevice *dev)
 }
 
 static const struct udevice_id sh_ether_ids[] = {
+       { .compatible = "renesas,ether-r7s72100" },
+       { .compatible = "renesas,ether-r8a7790" },
        { .compatible = "renesas,ether-r8a7791" },
+       { .compatible = "renesas,ether-r8a7793" },
+       { .compatible = "renesas,ether-r8a7794" },
+       { .compatible = "renesas,gether-r8a77980" },
        { }
 };