env/sf.c: drop private CMD_SAVEENV logic
[oweals/u-boot.git] / env / env.c
index 14324bbdd207945a63c01f297a5feb7dfd4aea8a..9237bb9c742a5242940cd6248751bc5d4eef86fa 100644 (file)
--- a/env/env.c
+++ b/env/env.c
@@ -1,15 +1,38 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017 Google, Inc
  * Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #include <common.h>
-#include <environment.h>
+#include <env.h>
+#include <env_internal.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#if defined(CONFIG_NEEDS_MANUAL_RELOC)
+void env_fix_drivers(void)
+{
+       struct env_driver *drv;
+       const int n_ents = ll_entry_count(struct env_driver, env_driver);
+       struct env_driver *entry;
+
+       drv = ll_entry_start(struct env_driver, env_driver);
+       for (entry = drv; entry != drv + n_ents; entry++) {
+               if (entry->name)
+                       entry->name += gd->reloc_off;
+               if (entry->load)
+                       entry->load += gd->reloc_off;
+               if (entry->save)
+                       entry->save += gd->reloc_off;
+               if (entry->erase)
+                       entry->erase += gd->reloc_off;
+               if (entry->init)
+                       entry->init += gd->reloc_off;
+       }
+}
+#endif
+
 static struct env_driver *_env_driver_lookup(enum env_location loc)
 {
        struct env_driver *drv;
@@ -26,6 +49,62 @@ static struct env_driver *_env_driver_lookup(enum env_location loc)
        return NULL;
 }
 
+static enum env_location env_locations[] = {
+#ifdef CONFIG_ENV_IS_IN_EEPROM
+       ENVL_EEPROM,
+#endif
+#ifdef CONFIG_ENV_IS_IN_EXT4
+       ENVL_EXT4,
+#endif
+#ifdef CONFIG_ENV_IS_IN_FAT
+       ENVL_FAT,
+#endif
+#ifdef CONFIG_ENV_IS_IN_FLASH
+       ENVL_FLASH,
+#endif
+#ifdef CONFIG_ENV_IS_IN_MMC
+       ENVL_MMC,
+#endif
+#ifdef CONFIG_ENV_IS_IN_NAND
+       ENVL_NAND,
+#endif
+#ifdef CONFIG_ENV_IS_IN_NVRAM
+       ENVL_NVRAM,
+#endif
+#ifdef CONFIG_ENV_IS_IN_REMOTE
+       ENVL_REMOTE,
+#endif
+#ifdef CONFIG_ENV_IS_IN_SATA
+       ENVL_ESATA,
+#endif
+#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
+       ENVL_SPI_FLASH,
+#endif
+#ifdef CONFIG_ENV_IS_IN_UBI
+       ENVL_UBI,
+#endif
+#ifdef CONFIG_ENV_IS_NOWHERE
+       ENVL_NOWHERE,
+#endif
+};
+
+static bool env_has_inited(enum env_location location)
+{
+       return gd->env_has_init & BIT(location);
+}
+
+static void env_set_inited(enum env_location location)
+{
+       /*
+        * We're using a 32-bits bitmask stored in gd (env_has_init)
+        * using the above enum value as the bit index. We need to
+        * make sure that we're not overflowing it.
+        */
+       BUILD_BUG_ON(ARRAY_SIZE(env_locations) > BITS_PER_LONG);
+
+       gd->env_has_init |= BIT(location);
+}
+
 /**
  * env_get_location() - Returns the best env location for a board
  * @op: operations performed on the environment
@@ -33,6 +112,7 @@ static struct env_driver *_env_driver_lookup(enum env_location loc)
  *        highest priority
  *
  * This will return the preferred environment for the given priority.
+ * This is overridable by boards if they need to.
  *
  * All implementations are free to use the operation, the priority and
  * any other data relevant to their choice, but must take into account
@@ -43,40 +123,14 @@ static struct env_driver *_env_driver_lookup(enum env_location loc)
  * Returns:
  * an enum env_location value on success, a negative error code otherwise
  */
-static enum env_location env_get_location(enum env_operation op, int prio)
+__weak enum env_location env_get_location(enum env_operation op, int prio)
 {
-       /*
-        * We support a single environment, so any environment asked
-        * with a priority that is not zero is out of our supported
-        * bounds.
-        */
-       if (prio >= 1)
+       if (prio >= ARRAY_SIZE(env_locations))
                return ENVL_UNKNOWN;
 
-       if IS_ENABLED(CONFIG_ENV_IS_IN_EEPROM)
-               return ENVL_EEPROM;
-       else if IS_ENABLED(CONFIG_ENV_IS_IN_FAT)
-               return ENVL_FAT;
-       else if IS_ENABLED(CONFIG_ENV_IS_IN_EXT4)
-               return ENVL_EXT4;
-       else if IS_ENABLED(CONFIG_ENV_IS_IN_FLASH)
-               return ENVL_FLASH;
-       else if IS_ENABLED(CONFIG_ENV_IS_IN_MMC)
-               return ENVL_MMC;
-       else if IS_ENABLED(CONFIG_ENV_IS_IN_NAND)
-               return ENVL_NAND;
-       else if IS_ENABLED(CONFIG_ENV_IS_IN_NVRAM)
-               return ENVL_NVRAM;
-       else if IS_ENABLED(CONFIG_ENV_IS_IN_REMOTE)
-               return ENVL_REMOTE;
-       else if IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)
-               return ENVL_SPI_FLASH;
-       else if IS_ENABLED(CONFIG_ENV_IS_IN_UBI)
-               return ENVL_UBI;
-       else if IS_ENABLED(CONFIG_ENV_IS_NOWHERE)
-               return ENVL_NOWHERE;
-       else
-               return ENVL_UNKNOWN;
+       gd->env_load_prio = prio;
+
+       return env_locations[prio];
 }
 
 
@@ -110,44 +164,87 @@ static struct env_driver *env_driver_lookup(enum env_operation op, int prio)
        return drv;
 }
 
-int env_get_char(int index)
+__weak int env_get_char_spec(int index)
 {
-       struct env_driver *drv;
-       int prio;
+       return *(uchar *)(gd->env_addr + index);
+}
 
+int env_get_char(int index)
+{
        if (gd->env_valid == ENV_INVALID)
                return default_environment[index];
+       else
+               return env_get_char_spec(index);
+}
+
+int env_load(void)
+{
+       struct env_driver *drv;
+       int best_prio = -1;
+       int prio;
 
-       for (prio = 0; (drv = env_driver_lookup(ENVOP_GET_CHAR, prio)); prio++) {
+       for (prio = 0; (drv = env_driver_lookup(ENVOP_LOAD, prio)); prio++) {
                int ret;
 
-               if (!drv->get_char)
+               if (!drv->load)
                        continue;
 
-               ret = drv->get_char(index);
-               if (!ret)
-                       return 0;
+               if (!env_has_inited(drv->location))
+                       continue;
 
-               debug("%s: Environment %s failed to load (err=%d)\n", __func__,
-                     drv->name, ret);
+               printf("Loading Environment from %s... ", drv->name);
+               /*
+                * In error case, the error message must be printed during
+                * drv->load() in some underlying API, and it must be exactly
+                * one message.
+                */
+               ret = drv->load();
+               if (!ret) {
+                       printf("OK\n");
+                       return 0;
+               } else if (ret == -ENOMSG) {
+                       /* Handle "bad CRC" case */
+                       if (best_prio == -1)
+                               best_prio = prio;
+               } else {
+                       debug("Failed (%d)\n", ret);
+               }
        }
 
+       /*
+        * In case of invalid environment, we set the 'default' env location
+        * to the best choice, i.e.:
+        *   1. Environment location with bad CRC, if such location was found
+        *   2. Otherwise use the location with highest priority
+        *
+        * This way, next calls to env_save() will restore the environment
+        * at the right place.
+        */
+       if (best_prio >= 0)
+               debug("Selecting environment with bad CRC\n");
+       else
+               best_prio = 0;
+       env_get_location(ENVOP_LOAD, best_prio);
+
        return -ENODEV;
 }
 
-int env_load(void)
+int env_save(void)
 {
        struct env_driver *drv;
-       int prio;
 
-       for (prio = 0; (drv = env_driver_lookup(ENVOP_LOAD, prio)); prio++) {
+       drv = env_driver_lookup(ENVOP_SAVE, gd->env_load_prio);
+       if (drv) {
                int ret;
 
-               if (!drv->load)
-                       continue;
+               if (!drv->save)
+                       return -ENODEV;
 
-               printf("Loading Environment from %s... ", drv->name);
-               ret = drv->load();
+               if (!env_has_inited(drv->location))
+                       return -ENODEV;
+
+               printf("Saving Environment to %s... ", drv->name);
+               ret = drv->save();
                if (ret)
                        printf("Failed (%d)\n", ret);
                else
@@ -160,19 +257,22 @@ int env_load(void)
        return -ENODEV;
 }
 
-int env_save(void)
+int env_erase(void)
 {
        struct env_driver *drv;
-       int prio;
 
-       for (prio = 0; (drv = env_driver_lookup(ENVOP_SAVE, prio)); prio++) {
+       drv = env_driver_lookup(ENVOP_ERASE, gd->env_load_prio);
+       if (drv) {
                int ret;
 
-               if (!drv->save)
-                       continue;
+               if (!drv->erase)
+                       return -ENODEV;
 
-               printf("Saving Environment to %s... ", drv->name);
-               ret = drv->save();
+               if (!env_has_inited(drv->location))
+                       return -ENODEV;
+
+               printf("Erasing Environment on %s... ", drv->name);
+               ret = drv->erase();
                if (ret)
                        printf("Failed (%d)\n", ret);
                else
@@ -192,14 +292,10 @@ int env_init(void)
        int prio;
 
        for (prio = 0; (drv = env_driver_lookup(ENVOP_INIT, prio)); prio++) {
-               if (!drv->init)
-                       continue;
-
-               ret = drv->init();
-               if (!ret)
-                       return 0;
+               if (!drv->init || !(ret = drv->init()))
+                       env_set_inited(drv->location);
 
-               debug("%s: Environment %s failed to init (err=%d)\n", __func__,
+               debug("%s: Environment %s init done (ret=%d)\n", __func__,
                      drv->name, ret);
        }