Prepare v2023.10

[platform/kernel/u-boot.git] / env / ext4.c

diff --git a/env/ext4.c b/env/ext4.c
index 9cdf28e..47e05a4 100644 (file)
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (c) Copyright 2016 by VRT Technology
  *
@@ -15,14 +16,14 @@
  * EXT4 filesystem implementation in Uboot by
  * Uma Shankar <uma.shankar@samsung.com>
  * Manjunatha C Achar <a.manjunatha@samsung.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <part.h>
 
 #include <command.h>
-#include <environment.h>
+#include <env.h>
+#include <env_internal.h>
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <memalign.h>
@@ -30,24 +31,45 @@
 #include <errno.h>
 #include <ext4fs.h>
 #include <mmc.h>
+#include <scsi.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_CMD_SAVEENV
-static int env_ext4_save(void)
+__weak const char *env_ext4_get_intf(void)
+{
+       return (const char *)CONFIG_ENV_EXT4_INTERFACE;
+}
+
+__weak const char *env_ext4_get_dev_part(void)
+{
+#ifdef CONFIG_MMC
+       static char *part_str;
+
+       if (!part_str) {
+               part_str = CONFIG_ENV_EXT4_DEVICE_AND_PART;
+               if (!strcmp(CONFIG_ENV_EXT4_INTERFACE, "mmc") && part_str[0] == ':') {
+                       part_str = "0" CONFIG_ENV_EXT4_DEVICE_AND_PART;
+                       part_str[0] += mmc_get_env_dev();
+               }
+       }
+
+       return part_str;
+#else
+       return (const char *)CONFIG_ENV_EXT4_DEVICE_AND_PART;
+#endif
+}
+
+static int env_ext4_save_buffer(env_t *env_new)
 {
-       env_t   env_new;
        struct blk_desc *dev_desc = NULL;
-       disk_partition_t info;
+       struct disk_partition info;
        int dev, part;
        int err;
+       const char *ifname = env_ext4_get_intf();
+       const char *dev_and_part = env_ext4_get_dev_part();
 
-       err = env_export(&env_new);
-       if (err)
-               return err;
-
-       part = blk_get_device_part_str(CONFIG_ENV_EXT4_INTERFACE,
-                                      CONFIG_ENV_EXT4_DEVICE_AND_PART,
+       part = blk_get_device_part_str(ifname, dev_and_part,
                                       &dev_desc, &info, 1);
        if (part < 0)
                return 1;
@@ -57,38 +79,80 @@ static int env_ext4_save(void)
 
        if (!ext4fs_mount(info.size)) {
                printf("\n** Unable to use %s %s for saveenv **\n",
-                      CONFIG_ENV_EXT4_INTERFACE,
-                      CONFIG_ENV_EXT4_DEVICE_AND_PART);
+                      ifname, dev_and_part);
                return 1;
        }
 
-       err = ext4fs_write(CONFIG_ENV_EXT4_FILE, (void *)&env_new,
-                          sizeof(env_t));
+       err = ext4fs_write(CONFIG_ENV_EXT4_FILE, (void *)env_new,
+                          sizeof(env_t), FILETYPE_REG);
        ext4fs_close();
 
        if (err == -1) {
                printf("\n** Unable to write \"%s\" from %s%d:%d **\n",
-                       CONFIG_ENV_EXT4_FILE, CONFIG_ENV_EXT4_INTERFACE, dev,
-                       part);
+                       CONFIG_ENV_EXT4_FILE, ifname, dev, part);
                return 1;
        }
 
+       return 0;
+}
+
+static int env_ext4_save(void)
+{
+       env_t env_new;
+       int err;
+
+       err = env_export(&env_new);
+       if (err)
+               return err;
+
+       err = env_ext4_save_buffer(&env_new);
+       if (err)
+               return err;
+
+       gd->env_valid = ENV_VALID;
+       puts("done\n");
+
+       return 0;
+}
+
+static int env_ext4_erase(void)
+{
+       env_t env_new;
+       int err;
+
+       memset(&env_new, 0, sizeof(env_t));
+
+       err = env_ext4_save_buffer(&env_new);
+       if (err)
+               return err;
+
+       gd->env_valid = ENV_INVALID;
        puts("done\n");
+
        return 0;
 }
-#endif /* CONFIG_CMD_SAVEENV */
 
 static int env_ext4_load(void)
 {
        ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
        struct blk_desc *dev_desc = NULL;
-       disk_partition_t info;
+       struct disk_partition info;
        int dev, part;
        int err;
        loff_t off;
-
-       part = blk_get_device_part_str(CONFIG_ENV_EXT4_INTERFACE,
-                                      CONFIG_ENV_EXT4_DEVICE_AND_PART,
+       const char *ifname = env_ext4_get_intf();
+       const char *dev_and_part = env_ext4_get_dev_part();
+
+#ifdef CONFIG_MMC
+       if (!strcmp(ifname, "mmc"))
+               mmc_initialize(NULL);
+#endif
+#if defined(CONFIG_AHCI) || defined(CONFIG_SCSI)
+       if (!strcmp(ifname, "scsi"))
+               scsi_scan(true);
+#endif
+
+       part = blk_get_device_part_str(ifname, dev_and_part,
                                       &dev_desc, &info, 1);
        if (part < 0)
                goto err_env_relocate;
@@ -98,8 +162,7 @@ static int env_ext4_load(void)
 
        if (!ext4fs_mount(info.size)) {
                printf("\n** Unable to use %s %s for loading the env **\n",
-                      CONFIG_ENV_EXT4_INTERFACE,
-                      CONFIG_ENV_EXT4_DEVICE_AND_PART);
+                      ifname, dev_and_part);
                goto err_env_relocate;
        }
 
@@ -109,16 +172,18 @@ static int env_ext4_load(void)
 
        if (err == -1) {
                printf("\n** Unable to read \"%s\" from %s%d:%d **\n",
-                       CONFIG_ENV_EXT4_FILE, CONFIG_ENV_EXT4_INTERFACE, dev,
-                       part);
+                       CONFIG_ENV_EXT4_FILE, ifname, dev, part);
                goto err_env_relocate;
        }
 
-       env_import(buf, 1);
-       return 0;
+       err = env_import(buf, 1, H_EXTERNAL);
+       if (!err)
+               gd->env_valid = ENV_VALID;
+
+       return err;
 
 err_env_relocate:
-       set_default_env(NULL);
+       env_set_default(NULL, 0);
 
        return -EIO;
 }
@@ -127,5 +192,6 @@ U_BOOT_ENV_LOCATION(ext4) = {
        .location       = ENVL_EXT4,
        ENV_NAME("EXT4")
        .load           = env_ext4_load,
-       .save           = env_save_ptr(env_ext4_save),
+       .save           = ENV_SAVE_PTR(env_ext4_save),
+       .erase          = ENV_ERASE_PTR(env_ext4_erase),
 };