common: Drop asm/global_data.h from common header

[u-boot.git] / drivers / net / sandbox-raw.c

diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c
index 590ae0c0fcdec98e6e245c16bd1e31011b26b929..ce66ff781ffe833a630e7e8d51f07d1dc9e704b2 100644 (file)
--- a/drivers/net/sandbox-raw.c
+++ b/drivers/net/sandbox-raw.c
@@ -1,17 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2015 National Instruments
  *
  * (C) Copyright 2015
  * Joe Hershberger <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0
  */
 
+#include <log.h>
 #include <asm/eth-raw-os.h>
 #include <common.h>
 #include <dm.h>
+#include <env.h>
 #include <malloc.h>
 #include <net.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -21,22 +23,19 @@ static struct in_addr arp_ip;
 static int sb_eth_raw_start(struct udevice *dev)
 {
        struct eth_sandbox_raw_priv *priv = dev_get_priv(dev);
-       struct eth_pdata *pdata = dev_get_platdata(dev);
-       const char *interface;
+       struct eth_pdata *pdata = dev_get_plat(dev);
+       int ret;
 
        debug("eth_sandbox_raw: Start\n");
 
-       interface = fdt_getprop(gd->fdt_blob, dev_of_offset(dev),
-                                           "host-raw-interface", NULL);
-       if (interface == NULL)
-               return -EINVAL;
-
-       if (strcmp(interface, "lo") == 0) {
-               priv->local = 1;
+       ret = sandbox_eth_raw_os_start(priv, pdata->enetaddr);
+       if (priv->local) {
                env_set("ipaddr", "127.0.0.1");
                env_set("serverip", "127.0.0.1");
+               net_ip = string_to_ip("127.0.0.1");
+               net_server_ip = net_ip;
        }
-       return sandbox_eth_raw_os_start(interface, pdata->enetaddr, priv);
+       return ret;
 }
 
 static int sb_eth_raw_send(struct udevice *dev, void *packet, int length)
@@ -67,7 +66,7 @@ static int sb_eth_raw_send(struct udevice *dev, void *packet, int length)
 
 static int sb_eth_raw_recv(struct udevice *dev, int flags, uchar **packetp)
 {
-       struct eth_pdata *pdata = dev_get_platdata(dev);
+       struct eth_pdata *pdata = dev_get_plat(dev);
        struct eth_sandbox_raw_priv *priv = dev_get_priv(dev);
        int retval = 0;
        int length;
@@ -134,18 +133,53 @@ static void sb_eth_raw_stop(struct udevice *dev)
        sandbox_eth_raw_os_stop(priv);
 }
 
+static int sb_eth_raw_read_rom_hwaddr(struct udevice *dev)
+{
+       struct eth_pdata *pdata = dev_get_plat(dev);
+
+       net_random_ethaddr(pdata->enetaddr);
+
+       return 0;
+}
+
 static const struct eth_ops sb_eth_raw_ops = {
        .start                  = sb_eth_raw_start,
        .send                   = sb_eth_raw_send,
        .recv                   = sb_eth_raw_recv,
        .stop                   = sb_eth_raw_stop,
+       .read_rom_hwaddr        = sb_eth_raw_read_rom_hwaddr,
 };
 
-static int sb_eth_raw_ofdata_to_platdata(struct udevice *dev)
+static int sb_eth_raw_of_to_plat(struct udevice *dev)
 {
-       struct eth_pdata *pdata = dev_get_platdata(dev);
+       struct eth_pdata *pdata = dev_get_plat(dev);
+       struct eth_sandbox_raw_priv *priv = dev_get_priv(dev);
+       const char *ifname;
+       int ret;
+
+       pdata->iobase = dev_read_addr(dev);
+
+       ifname = dev_read_string(dev, "host-raw-interface");
+       if (ifname) {
+               strncpy(priv->host_ifname, ifname, IFNAMSIZ);
+               printf(": Using %s from DT\n", priv->host_ifname);
+       }
+       if (dev_read_u32(dev, "host-raw-interface-idx",
+                        &priv->host_ifindex) < 0) {
+               priv->host_ifindex = 0;
+       } else {
+               ret = sandbox_eth_raw_os_idx_to_name(priv);
+               if (ret < 0)
+                       return ret;
+               printf(": Using interface index %d from DT (%s)\n",
+                      priv->host_ifindex, priv->host_ifname);
+       }
+
+       ret = sandbox_eth_raw_os_is_local(priv->host_ifname);
+       if (ret < 0)
+               return ret;
+       priv->local = ret;
 
-       pdata->iobase = devfdt_get_addr(dev);
        return 0;
 }
 
@@ -158,8 +192,8 @@ U_BOOT_DRIVER(eth_sandbox_raw) = {
        .name   = "eth_sandbox_raw",
        .id     = UCLASS_ETH,
        .of_match = sb_eth_raw_ids,
-       .ofdata_to_platdata = sb_eth_raw_ofdata_to_platdata,
+       .of_to_plat = sb_eth_raw_of_to_plat,
        .ops    = &sb_eth_raw_ops,
-       .priv_auto_alloc_size = sizeof(struct eth_sandbox_raw_priv),
-       .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+       .priv_auto      = sizeof(struct eth_sandbox_raw_priv),
+       .plat_auto      = sizeof(struct eth_pdata),
 };