X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=common%2Fcmd_ubi.c;h=6c8570377e31d4726424eea67b4e53e417a08469;hb=c2c5b94f8959cd9e05be9e187dc597c6b6e2e786;hp=b486ca8fefa0c625fcfbd545a7c407d5426668b2;hpb=f61f59da0fdcec37046680de3972709fe65282ac;p=karo-tx-uboot.git diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c index b486ca8fef..6c8570377e 100644 --- a/common/cmd_ubi.c +++ b/common/cmd_ubi.c @@ -19,10 +19,14 @@ #include #include #include +#include #include #include #include +#undef ubi_msg +#define ubi_msg(fmt, ...) printf("UBI: " fmt "\n", ##__VA_ARGS__) + #define DEV_TYPE_NONE 0 #define DEV_TYPE_NAND 1 #define DEV_TYPE_ONENAND 2 @@ -47,33 +51,6 @@ int ubifs_is_mounted(void); void cmd_ubifs_umount(void); #endif -static void ubi_dump_vol_info(const struct ubi_volume *vol) -{ - ubi_msg("volume information dump:"); - ubi_msg("vol_id %d", vol->vol_id); - ubi_msg("reserved_pebs %d", vol->reserved_pebs); - ubi_msg("alignment %d", vol->alignment); - ubi_msg("data_pad %d", vol->data_pad); - ubi_msg("vol_type %d", vol->vol_type); - ubi_msg("name_len %d", vol->name_len); - ubi_msg("usable_leb_size %d", vol->usable_leb_size); - ubi_msg("used_ebs %d", vol->used_ebs); - ubi_msg("used_bytes %lld", vol->used_bytes); - ubi_msg("last_eb_bytes %d", vol->last_eb_bytes); - ubi_msg("corrupted %d", vol->corrupted); - ubi_msg("upd_marker %d", vol->upd_marker); - - if (vol->name_len <= UBI_VOL_NAME_MAX && - strnlen(vol->name, vol->name_len + 1) == vol->name_len) { - ubi_msg("name %s", vol->name); - } else { - ubi_msg("the 1st 5 characters of the name: %c%c%c%c%c", - vol->name[0], vol->name[1], vol->name[2], - vol->name[3], vol->name[4]); - } - printf("\n"); -} - static void display_volume_info(struct ubi_device *ubi) { int i; @@ -120,10 +97,31 @@ static int ubi_info(int layout) return 0; } +static int ubi_check_volumename(const struct ubi_volume *vol, char *name) +{ + return strcmp(vol->name, name); +} + +static int ubi_check(char *name) +{ + int i; + + for (i = 0; i < (ubi->vtbl_slots + 1); i++) { + if (!ubi->volumes[i]) + continue; /* Empty record */ + + if (!ubi_check_volumename(ubi->volumes[i], name)) + return 0; + } + + return -EEXIST; +} + + static int verify_mkvol_req(const struct ubi_device *ubi, const struct ubi_mkvol_req *req) { - int n, err = -EINVAL; + int n, err = EINVAL; if (req->bytes < 0 || req->alignment < 0 || req->vol_type < 0 || req->name_len < 0) @@ -136,8 +134,11 @@ static int verify_mkvol_req(const struct ubi_device *ubi, if (req->alignment == 0) goto bad; - if (req->bytes == 0) + if (req->bytes == 0) { + printf("No space left in UBI device!\n"); + err = ENOMEM; goto bad; + } if (req->vol_type != UBI_DYNAMIC_VOLUME && req->vol_type != UBI_STATIC_VOLUME) @@ -151,17 +152,17 @@ static int verify_mkvol_req(const struct ubi_device *ubi, goto bad; if (req->name_len > UBI_VOL_NAME_MAX) { - err = -ENAMETOOLONG; + printf("Name too long!\n"); + err = ENAMETOOLONG; goto bad; } return 0; bad: - printf("bad volume creation request"); return err; } -static int ubi_create_vol(char *volume, int size, int dynamic) +static int ubi_create_vol(char *volume, int64_t size, int dynamic) { struct ubi_mkvol_req req; int err; @@ -185,40 +186,45 @@ static int ubi_create_vol(char *volume, int size, int dynamic) printf("verify_mkvol_req failed %d\n", err); return err; } - printf("Creating %s volume %s of size %d\n", + printf("Creating %s volume %s of size %lld\n", dynamic ? "dynamic" : "static", volume, size); /* Call real ubi create volume */ return ubi_create_volume(ubi, &req); } -static int ubi_remove_vol(char *volume) +static struct ubi_volume *ubi_find_volume(char *volume) { - int i, err, reserved_pebs; - int found = 0, vol_id = 0; struct ubi_volume *vol = NULL; + int i; for (i = 0; i < ubi->vtbl_slots; i++) { vol = ubi->volumes[i]; - if (vol && !strcmp(vol->name, volume)) { - printf("Volume %s found at valid %d\n", volume, i); - vol_id = i; - found = 1; - break; - } + if (vol && !strcmp(vol->name, volume)) + return vol; } - if (!found) { - printf("%s volume not found\n", volume); - return -ENODEV; - } - printf("remove UBI volume %s (id %d)\n", vol->name, vol->vol_id); + + printf("Volume %s not found!\n", volume); + return NULL; +} + +static int ubi_remove_vol(char *volume) +{ + int err, reserved_pebs, i; + struct ubi_volume *vol; + + vol = ubi_find_volume(volume); + if (vol == NULL) + return ENODEV; + + printf("Remove UBI volume %s (id %d)\n", vol->name, vol->vol_id); if (ubi->ro_mode) { printf("It's read-only mode\n"); - err = -EROFS; + err = EROFS; goto out_err; } - err = ubi_change_vtbl_record(ubi, vol_id, NULL); + err = ubi_change_vtbl_record(ubi, vol->vol_id, NULL); if (err) { printf("Error changing Vol tabel record err=%x\n", err); goto out_err; @@ -231,8 +237,8 @@ static int ubi_remove_vol(char *volume) } kfree(vol->eba_tbl); - ubi->volumes[vol_id]->eba_tbl = NULL; - ubi->volumes[vol_id] = NULL; + ubi->volumes[vol->vol_id]->eba_tbl = NULL; + ubi->volumes[vol->vol_id] = NULL; ubi->rsvd_pebs -= reserved_pebs; ubi->avail_pebs += reserved_pebs; @@ -249,56 +255,33 @@ static int ubi_remove_vol(char *volume) return 0; out_err: - ubi_err("cannot remove volume %d, error %d", vol_id, err); + ubi_err("cannot remove volume %s, error %d", volume, err); + if (err < 0) + err = -err; return err; } -static int ubi_volume_write(char *volume, void *buf, size_t size) +static int ubi_volume_continue_write(char *volume, void *buf, size_t size) { - int i = 0, err = -1; - int rsvd_bytes = 0; - int found = 0; + int err = 1; struct ubi_volume *vol; - for (i = 0; i < ubi->vtbl_slots; i++) { - vol = ubi->volumes[i]; - if (vol && !strcmp(vol->name, volume)) { - printf("Volume \"%s\" found at volume id %d\n", volume, i); - found = 1; - break; - } - } - if (!found) { - printf("%s volume not found\n", volume); - return 1; - } - rsvd_bytes = vol->reserved_pebs * (ubi->leb_size - vol->data_pad); - if (size < 0 || size > rsvd_bytes) { - printf("rsvd_bytes=%d vol->reserved_pebs=%d ubi->leb_size=%d\n", - rsvd_bytes, vol->reserved_pebs, ubi->leb_size); - printf("vol->data_pad=%d\n", vol->data_pad); - printf("Size > volume size !!\n"); - return 1; - } - - err = ubi_start_update(ubi, vol, size); - if (err < 0) { - printf("Cannot start volume update\n"); - return err; - } + vol = ubi_find_volume(volume); + if (vol == NULL) + return ENODEV; err = ubi_more_update_data(ubi, vol, buf, size); if (err < 0) { - printf("Couldnt or partially wrote data \n"); - return err; + printf("Couldnt or partially wrote data\n"); + return -err; } if (err) { size = err; err = ubi_check_volume(ubi, vol->vol_id); - if ( err < 0 ) - return err; + if (err < 0) + return -err; if (err) { ubi_warn("volume %d on UBI device %d is corrupted", @@ -313,51 +296,69 @@ static int ubi_volume_write(char *volume, void *buf, size_t size) return 0; } -static int ubi_volume_read(char *volume, char *buf, size_t size) +int ubi_volume_begin_write(char *volume, void *buf, size_t size, + size_t full_size) { - int err, lnum, off, len, tbuf_size, i = 0; - size_t count_save = size; - void *tbuf; - unsigned long long tmp; - struct ubi_volume *vol = NULL; - loff_t offp = 0; + int err = 1; + int rsvd_bytes = 0; + struct ubi_volume *vol; - for (i = 0; i < ubi->vtbl_slots; i++) { - vol = ubi->volumes[i]; - if (vol && !strcmp(vol->name, volume)) { - printf("Volume %s found at volume id %d\n", - volume, vol->vol_id); - break; - } + vol = ubi_find_volume(volume); + if (vol == NULL) + return ENODEV; + + rsvd_bytes = vol->reserved_pebs * (ubi->leb_size - vol->data_pad); + if (size < 0 || size > rsvd_bytes) { + printf("size > volume size! Aborting!\n"); + return EINVAL; } - if (i == ubi->vtbl_slots) { - printf("%s volume not found\n", volume); - return -ENODEV; + + err = ubi_start_update(ubi, vol, full_size); + if (err < 0) { + printf("Cannot start volume update\n"); + return -err; } - printf("read %i bytes from volume %d to %x(buf address)\n", - (int) size, vol->vol_id, (unsigned)buf); + return ubi_volume_continue_write(volume, buf, size); +} + +int ubi_volume_write(char *volume, void *buf, size_t size) +{ + return ubi_volume_begin_write(volume, buf, size, size); +} + +int ubi_volume_read(char *volume, char *buf, size_t size) +{ + int err, lnum, off, len, tbuf_size; + void *tbuf; + unsigned long long tmp; + struct ubi_volume *vol; + loff_t offp = 0; + + vol = ubi_find_volume(volume); + if (vol == NULL) + return ENODEV; if (vol->updating) { printf("updating"); - return -EBUSY; + return EBUSY; } if (vol->upd_marker) { printf("damaged volume, update marker is set"); - return -EBADF; + return EBADF; } if (offp == vol->used_bytes) return 0; if (size == 0) { - printf("Read [%lu] bytes\n", (unsigned long) vol->used_bytes); + printf("No size specified -> Using max size (%lld)\n", vol->used_bytes); size = vol->used_bytes; } if (vol->corrupted) printf("read from corrupted volume %d", vol->vol_id); if (offp + size > vol->used_bytes) - count_save = size = vol->used_bytes - offp; + size = vol->used_bytes - offp; tbuf_size = vol->usable_leb_size; if (size < tbuf_size) @@ -365,7 +366,7 @@ static int ubi_volume_read(char *volume, char *buf, size_t size) tbuf = malloc(tbuf_size); if (!tbuf) { printf("NO MEM\n"); - return -ENOMEM; + return ENOMEM; } len = size > tbuf_size ? tbuf_size : size; @@ -379,6 +380,7 @@ static int ubi_volume_read(char *volume, char *buf, size_t size) err = ubi_eba_read_leb(ubi, vol, lnum, tbuf, off, len, 0); if (err) { printf("read err %x\n", err); + err = -err; break; } off += len; @@ -397,7 +399,7 @@ static int ubi_volume_read(char *volume, char *buf, size_t size) } while (size); free(tbuf); - return err ? err : count_save - size; + return err; } static int ubi_dev_scan(struct mtd_info *info, char *ubidev, @@ -427,13 +429,13 @@ static int ubi_dev_scan(struct mtd_info *info, char *ubidev, err = ubi_mtd_param_parse(ubi_mtd_param_buffer, NULL); if (err) { del_mtd_partitions(info); - return err; + return -err; } err = ubi_init(); if (err) { del_mtd_partitions(info); - return err; + return -err; } ubi_initialized = 1; @@ -441,26 +443,82 @@ static int ubi_dev_scan(struct mtd_info *info, char *ubidev, return 0; } -static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) +int ubi_part(char *part_name, const char *vid_header_offset) { - size_t size = 0; - ulong addr = 0; int err = 0; - - if (argc < 2) - return cmd_usage(cmdtp); + char mtd_dev[16]; + struct mtd_device *dev; + struct part_info *part; + u8 pnum; if (mtdparts_init() != 0) { printf("Error initializing mtdparts!\n"); return 1; } +#ifdef CONFIG_CMD_UBIFS + /* + * Automatically unmount UBIFS partition when user + * changes the UBI device. Otherwise the following + * UBIFS commands will crash. + */ + if (ubifs_is_mounted()) + cmd_ubifs_umount(); +#endif + + /* todo: get dev number for NAND... */ + ubi_dev.nr = 0; + + /* + * Call ubi_exit() before re-initializing the UBI subsystem + */ + if (ubi_initialized) { + ubi_exit(); + del_mtd_partitions(ubi_dev.mtd_info); + } + + /* + * Search the mtd device number where this partition + * is located + */ + if (find_dev_and_part(part_name, &dev, &pnum, &part)) { + printf("Partition %s not found!\n", part_name); + return 1; + } + sprintf(mtd_dev, "%s%d", MTD_DEV_TYPE(dev->id->type), dev->id->num); + ubi_dev.mtd_info = get_mtd_device_nm(mtd_dev); + if (IS_ERR(ubi_dev.mtd_info)) { + printf("Partition %s not found on device %s!\n", part_name, + mtd_dev); + return 1; + } + + ubi_dev.selected = 1; + + strcpy(ubi_dev.part_name, part_name); + err = ubi_dev_scan(ubi_dev.mtd_info, ubi_dev.part_name, + vid_header_offset); + if (err) { + printf("UBI init error %d\n", err); + ubi_dev.selected = 0; + return err; + } + + ubi = ubi_devices[0]; + + return 0; +} + +static int do_ubi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + int64_t size = 0; + ulong addr = 0; + + if (argc < 2) + return CMD_RET_USAGE; + if (strcmp(argv[1], "part") == 0) { - char mtd_dev[16]; - struct mtd_device *dev; - struct part_info *part; const char *vid_header_offset = NULL; - u8 pnum; /* Print current partition */ if (argc == 2) { @@ -475,60 +533,12 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) } if (argc < 3) - return cmd_usage(cmdtp); - -#ifdef CONFIG_CMD_UBIFS - /* - * Automatically unmount UBIFS partition when user - * changes the UBI device. Otherwise the following - * UBIFS commands will crash. - */ - if (ubifs_is_mounted()) - cmd_ubifs_umount(); -#endif - - /* todo: get dev number for NAND... */ - ubi_dev.nr = 0; - - /* - * Call ubi_exit() before re-initializing the UBI subsystem - */ - if (ubi_initialized) { - ubi_exit(); - del_mtd_partitions(ubi_dev.mtd_info); - } - - /* - * Search the mtd device number where this partition - * is located - */ - if (find_dev_and_part(argv[2], &dev, &pnum, &part)) { - printf("Partition %s not found!\n", argv[2]); - return 1; - } - sprintf(mtd_dev, "%s%d", MTD_DEV_TYPE(dev->id->type), dev->id->num); - ubi_dev.mtd_info = get_mtd_device_nm(mtd_dev); - if (IS_ERR(ubi_dev.mtd_info)) { - printf("Partition %s not found on device %s!\n", argv[2], mtd_dev); - return 1; - } - - ubi_dev.selected = 1; + return CMD_RET_USAGE; if (argc > 3) vid_header_offset = argv[3]; - strcpy(ubi_dev.part_name, argv[2]); - err = ubi_dev_scan(ubi_dev.mtd_info, ubi_dev.part_name, - vid_header_offset); - if (err) { - printf("UBI init error %d\n", err); - ubi_dev.selected = 0; - return err; - } - - ubi = ubi_devices[0]; - return 0; + return ubi_part(argv[2], vid_header_offset); } if ((strcmp(argv[1], "part") != 0) && (!ubi_dev.selected)) { @@ -543,6 +553,14 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) return ubi_info(layout); } + if (strcmp(argv[1], "check") == 0) { + if (argc > 2) + return ubi_check(argv[2]); + + printf("Error, no volume name passed\n"); + return 1; + } + if (strncmp(argv[1], "create", 6) == 0) { int dynamic = 1; /* default: dynamic volume */ @@ -561,12 +579,14 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) } /* E.g., create volume size */ if (argc == 4) { - size = simple_strtoul(argv[3], NULL, 16); + size = simple_strtoull(argv[3], NULL, 16); argc--; } /* Use maximum available size */ - if (!size) - size = ubi->avail_pebs * ubi->leb_size; + if (!size) { + size = (int64_t)ubi->avail_pebs * ubi->leb_size; + 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); @@ -579,6 +599,8 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) } if (strncmp(argv[1], "write", 5) == 0) { + int ret; + if (argc < 5) { printf("Please see usage\n"); return 1; @@ -587,7 +609,26 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) addr = simple_strtoul(argv[2], NULL, 16); size = simple_strtoul(argv[4], NULL, 16); - return ubi_volume_write(argv[3], (void *)addr, size); + if (strlen(argv[1]) == 10 && + strncmp(argv[1] + 5, ".part", 5) == 0) { + if (argc < 6) { + ret = ubi_volume_continue_write(argv[3], + (void *)addr, size); + } else { + size_t full_size; + full_size = simple_strtoul(argv[5], NULL, 16); + ret = ubi_volume_begin_write(argv[3], + (void *)addr, size, full_size); + } + } else { + ret = ubi_volume_write(argv[3], (void *)addr, size); + } + if (!ret) { + printf("%lld bytes written to volume %s\n", size, + argv[3]); + } + + return ret; } if (strncmp(argv[1], "read", 4) == 0) { @@ -605,12 +646,16 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) argc--; } - if (argc == 3) + if (argc == 3) { + printf("Read %lld bytes from volume %s to %lx\n", size, + argv[3], addr); + return ubi_volume_read(argv[3], (char *)addr, size); + } } printf("Please see usage\n"); - return -1; + return 1; } U_BOOT_CMD( @@ -621,10 +666,14 @@ U_BOOT_CMD( " header offset)\n" "ubi info [l[ayout]]" " - Display volume and ubi layout information\n" + "ubi check volumename" + " - check if volumename exists\n" "ubi create[vol] volume [size] [type]" " - create volume name with size\n" "ubi write[vol] address volume size" " - Write volume from address with size\n" + "ubi write.part address volume size [fullsize]\n" + " - Write part of a volume from address\n" "ubi read[vol] address volume [size]" " - Read volume to address with size\n" "ubi remove[vol] volume"