Merge tag 'efi-2020-07-rc6' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / cmd / ubi.c

diff --git a/cmd/ubi.c b/cmd/ubi.c
index 2b74a9814463f084037fa42c83ba6a6cc2f4b327..171377cc66b547f039e12217e9fd9be1f90bc323 100644 (file)
--- a/cmd/ubi.c
+++ b/cmd/ubi.c
@@ -13,11 +13,14 @@
 
 #include <common.h>
 #include <command.h>
+#include <env.h>
 #include <exports.h>
+#include <malloc.h>
 #include <memalign.h>
 #include <mtd.h>
 #include <nand.h>
 #include <onenand_uboot.h>
+#include <dm/devres.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/err.h>
@@ -101,7 +104,6 @@ static int ubi_check(char *name)
        return 1;
 }
 
-
 static int verify_mkvol_req(const struct ubi_device *ubi,
                            const struct ubi_mkvol_req *req)
 {
@@ -146,7 +148,8 @@ bad:
        return err;
 }
 
-static int ubi_create_vol(char *volume, int64_t size, int dynamic, int vol_id)
+static int ubi_create_vol(char *volume, int64_t size, int dynamic, int vol_id,
+                         bool skipcheck)
 {
        struct ubi_mkvol_req req;
        int err;
@@ -163,7 +166,10 @@ static int ubi_create_vol(char *volume, int64_t size, int dynamic, int vol_id)
        strcpy(req.name, volume);
        req.name_len = strlen(volume);
        req.name[req.name_len] = '\0';
-       req.padding1 = 0;
+       req.flags = 0;
+       if (skipcheck)
+               req.flags |= UBI_VOL_SKIP_CRC_CHECK_FLG;
+
        /* It's duplicated at drivers/mtd/ubi/cdev.c */
        err = verify_mkvol_req(ubi, &req);
        if (err) {
@@ -245,6 +251,39 @@ out_err:
        return err;
 }
 
+static int ubi_rename_vol(char *oldname, char *newname)
+{
+       struct ubi_volume *vol;
+       struct ubi_rename_entry rename;
+       struct ubi_volume_desc desc;
+       struct list_head list;
+
+       vol = ubi_find_volume(oldname);
+       if (!vol) {
+               printf("%s: volume %s doesn't exist\n", __func__, oldname);
+               return ENODEV;
+       }
+
+       printf("Rename UBI volume %s to %s\n", oldname, newname);
+
+       if (ubi->ro_mode) {
+               printf("%s: ubi device is in read-only mode\n", __func__);
+               return EROFS;
+       }
+
+       rename.new_name_len = strlen(newname);
+       strcpy(rename.new_name, newname);
+       rename.remove = 0;
+       desc.vol = vol;
+       desc.mode = 0;
+       rename.desc = &desc;
+       INIT_LIST_HEAD(&rename.list);
+       INIT_LIST_HEAD(&list);
+       list_add(&rename.list, &list);
+
+       return ubi_rename_volumes(ubi, &list);
+}
+
 static int ubi_volume_continue_write(char *volume, void *buf, size_t size)
 {
        int err = 1;
@@ -415,7 +454,31 @@ static int ubi_dev_scan(struct mtd_info *info, const char *vid_header_offset)
        return 0;
 }
 
-int ubi_detach(void)
+static int ubi_set_skip_check(char *volume, bool skip_check)
+{
+       struct ubi_vtbl_record vtbl_rec;
+       struct ubi_volume *vol;
+
+       vol = ubi_find_volume(volume);
+       if (!vol)
+               return ENODEV;
+
+       printf("%sing skip_check on volume %s\n",
+              skip_check ? "Sett" : "Clear", volume);
+
+       vtbl_rec = ubi->vtbl[vol->vol_id];
+       if (skip_check) {
+               vtbl_rec.flags |= UBI_VTBL_SKIP_CRC_CHECK_FLG;
+               vol->skip_check = 1;
+       } else {
+               vtbl_rec.flags &= ~UBI_VTBL_SKIP_CRC_CHECK_FLG;
+               vol->skip_check = 0;
+       }
+
+       return ubi_change_vtbl_record(ubi, vol->vol_id, &vtbl_rec);
+}
+
+static int ubi_detach(void)
 {
 #ifdef CONFIG_CMD_UBIFS
        /*
@@ -465,22 +528,17 @@ int ubi_part(char *part_name, const char *vid_header_offset)
        return 0;
 }
 
-static int do_ubi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_ubi(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        int64_t size = 0;
        ulong addr = 0;
+       bool skipcheck = false;
 
        if (argc < 2)
                return CMD_RET_USAGE;
 
-
-       if (strcmp(argv[1], "detach") == 0) {
-               if (argc < 2)
-                       return CMD_RET_USAGE;
-
+       if (strcmp(argv[1], "detach") == 0)
                return ubi_detach();
-       }
-
 
        if (strcmp(argv[1], "part") == 0) {
                const char *vid_header_offset = NULL;
@@ -533,6 +591,12 @@ static int do_ubi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                /* Use maximum available size */
                size = 0;
 
+               /* E.g., create volume with "skipcheck" bit set */
+               if (argc == 7) {
+                       skipcheck = strncmp(argv[6], "--skipcheck", 11) == 0;
+                       argc--;
+               }
+
                /* E.g., create volume size type vol_id */
                if (argc == 6) {
                        id = simple_strtoull(argv[5], NULL, 16);
@@ -561,8 +625,10 @@ static int do_ubi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        printf("No size specified -> Using max size (%lld)\n", size);
                }
                /* E.g., create volume */
-               if (argc == 3)
-                       return ubi_create_vol(argv[2], size, dynamic, id);
+               if (argc == 3) {
+                       return ubi_create_vol(argv[2], size, dynamic, id,
+                                             skipcheck);
+               }
        }
 
        if (strncmp(argv[1], "remove", 6) == 0) {
@@ -571,6 +637,17 @@ static int do_ubi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        return ubi_remove_vol(argv[2]);
        }
 
+       if (IS_ENABLED(CONFIG_CMD_UBI_RENAME) && !strncmp(argv[1], "rename", 6))
+               return ubi_rename_vol(argv[2], argv[3]);
+
+       if (strncmp(argv[1], "skipcheck", 9) == 0) {
+               /* E.g., change skip_check flag */
+               if (argc == 4) {
+                       skipcheck = strncmp(argv[3], "on", 2) == 0;
+                       return ubi_set_skip_check(argv[2], skipcheck);
+               }
+       }
+
        if (strncmp(argv[1], "write", 5) == 0) {
                int ret;
 
@@ -629,7 +706,7 @@ static int do_ubi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 }
 
 U_BOOT_CMD(
-       ubi, 6, 1, do_ubi,
+       ubi, 7, 1, do_ubi,
        "ubi commands",
        "detach"
                " - detach ubi from a mtd partition\n"
@@ -640,7 +717,7 @@ U_BOOT_CMD(
                " - Display volume and ubi layout information\n"
        "ubi check volumename"
                " - check if volumename exists\n"
-       "ubi create[vol] volume [size] [type] [id]\n"
+       "ubi create[vol] volume [size] [type] [id] [--skipcheck]\n"
                " - create volume name with size ('-' for maximum"
                " available size)\n"
        "ubi write[vol] address volume size"
@@ -651,6 +728,10 @@ U_BOOT_CMD(
                " - Read volume to address with size\n"
        "ubi remove[vol] volume"
                " - Remove volume\n"
+#if IS_ENABLED(CONFIG_CMD_UBI_RENAME)
+       "ubi rename oldname newname\n"
+#endif
+       "ubi skipcheck volume on/off - Set or clear skip_check flag in volume header\n"
        "[Legends]\n"
        " volume: character name\n"
        " size: specified in bytes\n"