net: mdio-uclass: rename arguments of dm_mdio_phy_connect for clarity

[oweals/u-boot.git] / net / eth_common.c

diff --git a/net/eth_common.c b/net/eth_common.c
index 3fa6d83c70b1696b6a6069bb2e0ef6c67f9330ff..ed26b1b69359aae191481f058db7e99fa8c329b5 100644 (file)
--- a/net/eth_common.c
+++ b/net/eth_common.c
@@ -1,56 +1,31 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001-2015
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  * Joe Hershberger, National Instruments
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <dm.h>
+#include <env.h>
 #include <miiphy.h>
+#include <net.h>
 #include "eth_internal.h"
 
-void eth_parse_enetaddr(const char *addr, uchar *enetaddr)
-{
-       char *end;
-       int i;
-
-       for (i = 0; i < 6; ++i) {
-               enetaddr[i] = addr ? simple_strtoul(addr, &end, 16) : 0;
-               if (addr)
-                       addr = (*end) ? end + 1 : end;
-       }
-}
-
-int eth_getenv_enetaddr(const char *name, uchar *enetaddr)
-{
-       eth_parse_enetaddr(getenv(name), enetaddr);
-       return is_valid_ethaddr(enetaddr);
-}
-
-int eth_setenv_enetaddr(const char *name, const uchar *enetaddr)
-{
-       char buf[20];
-
-       sprintf(buf, "%pM", enetaddr);
-
-       return setenv(name, buf);
-}
-
-int eth_getenv_enetaddr_by_index(const char *base_name, int index,
+int eth_env_get_enetaddr_by_index(const char *base_name, int index,
                                 uchar *enetaddr)
 {
        char enetvar[32];
        sprintf(enetvar, index ? "%s%daddr" : "%saddr", base_name, index);
-       return eth_getenv_enetaddr(enetvar, enetaddr);
+       return eth_env_get_enetaddr(enetvar, enetaddr);
 }
 
-int eth_setenv_enetaddr_by_index(const char *base_name, int index,
+int eth_env_set_enetaddr_by_index(const char *base_name, int index,
                                 uchar *enetaddr)
 {
        char enetvar[32];
        sprintf(enetvar, index ? "%s%daddr" : "%saddr", base_name, index);
-       return eth_setenv_enetaddr(enetvar, enetaddr);
+       return eth_env_set_enetaddr(enetvar, enetaddr);
 }
 
 void eth_common_init(void)
@@ -64,3 +39,101 @@ void eth_common_init(void)
        phy_init();
 #endif
 }
+
+int eth_mac_skip(int index)
+{
+       char enetvar[15];
+       char *skip_state;
+
+       sprintf(enetvar, index ? "eth%dmacskip" : "ethmacskip", index);
+       skip_state = env_get(enetvar);
+       return skip_state != NULL;
+}
+
+void eth_current_changed(void)
+{
+       char *act = env_get("ethact");
+       char *ethrotate;
+
+       /*
+        * The call to eth_get_dev() below has a side effect of rotating
+        * ethernet device if uc_priv->current == NULL. This is not what
+        * we want when 'ethrotate' variable is 'no'.
+        */
+       ethrotate = env_get("ethrotate");
+       if ((ethrotate != NULL) && (strcmp(ethrotate, "no") == 0))
+               return;
+
+       /* update current ethernet name */
+       if (eth_get_dev()) {
+               if (act == NULL || strcmp(act, eth_get_name()) != 0)
+                       env_set("ethact", eth_get_name());
+       }
+       /*
+        * remove the variable completely if there is no active
+        * interface
+        */
+       else if (act != NULL)
+               env_set("ethact", NULL);
+}
+
+void eth_try_another(int first_restart)
+{
+       static void *first_failed;
+       char *ethrotate;
+
+       /*
+        * Do not rotate between network interfaces when
+        * 'ethrotate' variable is set to 'no'.
+        */
+       ethrotate = env_get("ethrotate");
+       if ((ethrotate != NULL) && (strcmp(ethrotate, "no") == 0))
+               return;
+
+       if (!eth_get_dev())
+               return;
+
+       if (first_restart)
+               first_failed = eth_get_dev();
+
+       eth_set_current_to_next();
+
+       eth_current_changed();
+
+       if (first_failed == eth_get_dev())
+               net_restart_wrap = 1;
+}
+
+void eth_set_current(void)
+{
+       static char *act;
+       static int  env_changed_id;
+       int     env_id;
+
+       env_id = env_get_id();
+       if ((act == NULL) || (env_changed_id != env_id)) {
+               act = env_get("ethact");
+               env_changed_id = env_id;
+       }
+
+       if (act == NULL) {
+               char *ethprime = env_get("ethprime");
+               void *dev = NULL;
+
+               if (ethprime)
+                       dev = eth_get_dev_by_name(ethprime);
+               if (dev)
+                       eth_set_dev(dev);
+               else
+                       eth_set_dev(NULL);
+       } else {
+               eth_set_dev(eth_get_dev_by_name(act));
+       }
+
+       eth_current_changed();
+}
+
+const char *eth_get_name(void)
+{
+       return eth_get_dev() ? eth_get_dev()->name : "unknown";
+}