X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/6c1223e18923b55896f7ab30bec5374343ba04ef..c3dc4ee20f2a3e58203249281c13105f9aa65b1a:/package/mtd/src/mtd.c diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c index f3a13efd2..752547656 100644 --- a/package/mtd/src/mtd.c +++ b/package/mtd/src/mtd.c @@ -1,13 +1,12 @@ /* * mtd - simple memory technology device manipulation tool * - * Copyright (C) 2005 Waldemar Brodkorb , - * Felix Fietkau + * Copyright (C) 2005 Waldemar Brodkorb , + * Copyright (C) 2005-2009 Felix Fietkau * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * modify it under the terms of the GNU General Public License v2 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,7 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id$ * * The code is based on the linux-mtd examples. */ @@ -43,21 +41,13 @@ #include #include #include - #include "mtd-api.h" +#include "fis.h" +#include "mtd.h" -#define TRX_MAGIC 0x30524448 /* "HDR0" */ -#define BUFSIZE (16 * 1024) #define MAX_ARGS 8 - -#define DEBUG - #define JFFS2_DEFAULT_DIR "" /* directory name without /, empty means root dir */ -#define SYSTYPE_UNKNOWN 0 -#define SYSTYPE_BROADCOM 1 -/* to be continued */ - struct trx_header { uint32_t magic; /* "HDR0" */ uint32_t len; /* Length of file including header */ @@ -66,14 +56,15 @@ struct trx_header { uint32_t offsets[3]; /* Offsets of partitions from start of header */ }; -static char buf[BUFSIZE]; -static char *imagefile; -static int buflen; +static char *buf = NULL; +static char *imagefile = NULL; +static char *jffs2file = NULL, *jffs2dir = JFFS2_DEFAULT_DIR; +static int buflen = 0; int quiet; int mtdsize = 0; int erasesize = 0; -int mtd_open(const char *mtd) +int mtd_open(const char *mtd, bool block) { FILE *fp; char dev[PATH_MAX]; @@ -84,9 +75,9 @@ int mtd_open(const char *mtd) if ((fp = fopen("/proc/mtd", "r"))) { while (fgets(dev, sizeof(dev), fp)) { if (sscanf(dev, "mtd%d:", &i) && strstr(dev, mtd)) { - snprintf(dev, sizeof(dev), "/dev/mtd/%d", i); + snprintf(dev, sizeof(dev), "/dev/mtd%s/%d", (block ? "block" : ""), i); if ((ret=open(dev, flags))<0) { - snprintf(dev, sizeof(dev), "/dev/mtd%d", i); + snprintf(dev, sizeof(dev), "/dev/mtd%s%d", (block ? "block" : ""), i); ret=open(dev, flags); } fclose(fp); @@ -104,16 +95,16 @@ int mtd_check_open(const char *mtd) struct mtd_info_user mtdInfo; int fd; - fd = mtd_open(mtd); + fd = mtd_open(mtd, false); if(fd < 0) { fprintf(stderr, "Could not open mtd device: %s\n", mtd); - return 0; + return -1; } if(ioctl(fd, MEMGETINFO, &mtdInfo)) { fprintf(stderr, "Could not get MTD device info from %s\n", mtd); close(fd); - return 0; + return -1; } mtdsize = mtdInfo.size; erasesize = mtdInfo.erasesize; @@ -128,110 +119,104 @@ int mtd_erase_block(int fd, int offset) mtdEraseInfo.start = offset; mtdEraseInfo.length = erasesize; ioctl(fd, MEMUNLOCK, &mtdEraseInfo); - if (ioctl (fd, MEMERASE, &mtdEraseInfo) < 0) { - fprintf(stderr, "Erasing mtd failed.\n"); - exit(1); - } + if (ioctl (fd, MEMERASE, &mtdEraseInfo) < 0) + return -1; + + return 0; } -int mtd_write_buffer(int fd, char *buf, int offset, int length) +int mtd_write_buffer(int fd, const char *buf, int offset, int length) { lseek(fd, offset, SEEK_SET); write(fd, buf, length); + return 0; } -#ifdef target_brcm -static int -image_check_brcm(int imagefd, const char *mtd) -{ - struct trx_header *trx = (struct trx_header *) buf; - int fd; - - if (strcmp(mtd, "linux") != 0) - return 1; - - buflen = read(imagefd, buf, 32); - if (buflen < 32) { - fprintf(stdout, "Could not get image header, file too small (%ld bytes)\n", buflen); - return 0; - } - - if (trx->magic != TRX_MAGIC || trx->len < sizeof(struct trx_header)) { - if (quiet < 2) { - fprintf(stderr, "Bad trx header\n"); - fprintf(stderr, "This is not the correct file format; refusing to flash.\n" - "Please specify the correct file or use -f to force.\n"); - } - return 0; - } - - /* check if image fits to mtd device */ - fd = mtd_check_open(mtd); - if(fd < 0) { - fprintf(stderr, "Could not open mtd device: %s\n", mtd); - exit(1); - } - - if(mtdsize < trx->len) { - fprintf(stderr, "Image too big for partition: %s\n", mtd); - close(fd); - return 0; - } - - close(fd); - return 1; -} -#endif /* target_brcm */ - static int image_check(int imagefd, const char *mtd) { - int fd, systype; - size_t count; - char *c; - FILE *f; - + int ret = 1; #ifdef target_brcm - return image_check_brcm(imagefd, mtd); + ret = trx_check(imagefd, mtd, buf, &buflen); #endif + return ret; } static int mtd_check(const char *mtd) { + char *next = NULL; + char *str = NULL; int fd; - fd = mtd_check_open(mtd); - if (!fd) - return 0; + if (strchr(mtd, ':')) { + str = strdup(mtd); + mtd = str; + } + + do { + next = strchr(mtd, ':'); + if (next) { + *next = 0; + next++; + } + + fd = mtd_check_open(mtd); + if (fd < 0) + return 0; + + if (!buf) + buf = malloc(erasesize); + + close(fd); + mtd = next; + } while (next); + + if (str) + free(str); - close(fd); return 1; } static int mtd_unlock(const char *mtd) { - int fd; struct erase_info_user mtdLockInfo; + char *next = NULL; + char *str = NULL; + int fd; - fd = mtd_check_open(mtd); - if(fd <= 0) { - fprintf(stderr, "Could not open mtd device: %s\n", mtd); - exit(1); + if (strchr(mtd, ':')) { + str = strdup(mtd); + mtd = str; } - if (quiet < 2) - fprintf(stderr, "Unlocking %s ...\n", mtd); + do { + next = strchr(mtd, ':'); + if (next) { + *next = 0; + next++; + } + + fd = mtd_check_open(mtd); + if(fd < 0) { + fprintf(stderr, "Could not open mtd device: %s\n", mtd); + exit(1); + } - mtdLockInfo.start = 0; - mtdLockInfo.length = mtdsize; - if(ioctl(fd, MEMUNLOCK, &mtdLockInfo)) { + if (quiet < 2) + fprintf(stderr, "Unlocking %s ...\n", mtd); + + mtdLockInfo.start = 0; + mtdLockInfo.length = mtdsize; + ioctl(fd, MEMUNLOCK, &mtdLockInfo); close(fd); - return 0; - } - - close(fd); + mtd = next; + } while (next); + + if (str) + free(str); + return 0; } @@ -245,7 +230,7 @@ mtd_erase(const char *mtd) fprintf(stderr, "Erasing %s ...\n", mtd); fd = mtd_check_open(mtd); - if(fd <= 0) { + if(fd < 0) { fprintf(stderr, "Could not open mtd device: %s\n", mtd); exit(1); } @@ -255,11 +240,11 @@ mtd_erase(const char *mtd) for (mtdEraseInfo.start = 0; mtdEraseInfo.start < mtdsize; mtdEraseInfo.start += erasesize) { - + ioctl(fd, MEMUNLOCK, &mtdEraseInfo); if(ioctl(fd, MEMERASE, &mtdEraseInfo)) fprintf(stderr, "Failed to erase block on %s at 0x%x\n", mtd, mtdEraseInfo.start); - } + } close(fd); return 0; @@ -275,7 +260,7 @@ mtd_refresh(const char *mtd) fprintf(stderr, "Refreshing mtd partition %s ... ", mtd); fd = mtd_check_open(mtd); - if(fd <= 0) { + if(fd < 0) { fprintf(stderr, "Could not open mtd device: %s\n", mtd); exit(1); } @@ -294,50 +279,165 @@ mtd_refresh(const char *mtd) } static int -mtd_write(int imagefd, const char *mtd) +mtd_write(int imagefd, const char *mtd, char *fis_layout) { - int fd, i, result; - size_t r, w, e; - struct erase_info_user mtdEraseInfo; - int ret = 0; + char *next = NULL; + char *str = NULL; + int fd, result; + ssize_t r, w, e; + uint32_t offset = 0; + +#ifdef FIS_SUPPORT + static struct fis_part new_parts[MAX_ARGS]; + static struct fis_part old_parts[MAX_ARGS]; + int n_new = 0, n_old = 0; + + if (fis_layout) { + const char *tmp = mtd; + char *word, *brkt; + int ret; + + memset(&old_parts, 0, sizeof(old_parts)); + memset(&new_parts, 0, sizeof(new_parts)); + + do { + next = strchr(tmp, ':'); + if (!next) + next = (char *) tmp + strlen(tmp); + + memcpy(old_parts[n_old].name, tmp, next - tmp); + + n_old++; + tmp = next + 1; + } while(*next); + + for (word = strtok_r(fis_layout, ",", &brkt); + word; + word = strtok_r(NULL, ",", &brkt)) { + + tmp = strtok(word, ":"); + strncpy((char *) new_parts[n_new].name, tmp, sizeof(new_parts[n_new].name) - 1); + + tmp = strtok(NULL, ":"); + if (!tmp) + goto next; + + new_parts[n_new].size = strtoul(tmp, NULL, 0); + + tmp = strtok(NULL, ":"); + if (!tmp) + goto next; + + new_parts[n_new].loadaddr = strtoul(tmp, NULL, 16); +next: + n_new++; + } + ret = fis_validate(old_parts, n_old, new_parts, n_new); + if (ret < 0) { + fprintf(stderr, "Failed to validate the new FIS partition table\n"); + exit(1); + } + if (ret == 0) + fis_layout = NULL; + } +#endif + + if (strchr(mtd, ':')) { + str = strdup(mtd); + mtd = str; + } + + r = 0; + +resume: + next = strchr(mtd, ':'); + if (next) { + *next = 0; + next++; + } fd = mtd_check_open(mtd); if(fd < 0) { fprintf(stderr, "Could not open mtd device: %s\n", mtd); exit(1); } - + if (quiet < 2) fprintf(stderr, "Writing from %s to %s ... ", imagefile, mtd); - r = w = e = 0; + w = e = 0; if (!quiet) fprintf(stderr, " [ ]"); for (;;) { - /* buffer may contain data already (from trx check) */ - r = buflen; - r += read(imagefd, buf + buflen, BUFSIZE - buflen); - w += r; + /* buffer may contain data already (from trx check or last mtd partition write attempt) */ + while (buflen < erasesize) { + r = read(imagefd, buf + buflen, erasesize - buflen); + if (r < 0) { + if ((errno == EINTR) || (errno == EAGAIN)) + continue; + else { + perror("read"); + break; + } + } + + if (r == 0) + break; + + buflen += r; + } + + if (buflen == 0) + break; - /* EOF */ - if (r <= 0) break; + if (jffs2file) { + if (memcmp(buf, JFFS2_EOF, sizeof(JFFS2_EOF) - 1) == 0) { + if (!quiet) + fprintf(stderr, "\b\b\b "); + if (quiet < 2) + fprintf(stderr, "\nAppending jffs2 data from %s to %s...", jffs2file, mtd); + /* got an EOF marker - this is the place to add some jffs2 data */ + mtd_replace_jffs2(mtd, fd, e, jffs2file); + goto done; + } + /* no EOF marker, make sure we figure out the last inode number + * before appending some data */ + mtd_parse_jffs2data(buf, jffs2dir); + } /* need to erase the next block before writing data to it */ - while (w > e) { + while (w + buflen > e) { if (!quiet) fprintf(stderr, "\b\b\b[e]"); - mtd_erase_block(fd, e); + + if (mtd_erase_block(fd, e) < 0) { + if (next) { + if (w < e) { + write(fd, buf + offset, e - w); + offset = e - w; + } + w = 0; + e = 0; + close(fd); + mtd = next; + fprintf(stderr, "\b\b\b \n"); + goto resume; + } else { + fprintf(stderr, "Failed to erase block\n"); + exit(1); + } + } /* erase the chunk */ e += erasesize; } - + if (!quiet) fprintf(stderr, "\b\b\b[w]"); - - if ((result = write(fd, buf, r)) < r) { + + if ((result = write(fd, buf + offset, buflen)) < buflen) { if (result < 0) { fprintf(stderr, "Error writing image.\n"); exit(1); @@ -346,22 +446,33 @@ mtd_write(int imagefd, const char *mtd) exit(1); } } - + w += buflen; + buflen = 0; + offset = 0; } + if (!quiet) - fprintf(stderr, "\b\b\b\b"); + fprintf(stderr, "\b\b\b\b "); +done: if (quiet < 2) fprintf(stderr, "\n"); +#ifdef FIS_SUPPORT + if (fis_layout) { + if (fis_remap(old_parts, n_old, new_parts, n_new) < 0) + fprintf(stderr, "Failed to update the FIS partition table\n"); + } +#endif + close(fd); return 0; } static void usage(void) { - fprintf(stderr, "Usage: mtd [ ...] [ ...] \n\n" + fprintf(stderr, "Usage: mtd [ ...] [ ...] [:...]\n\n" "The device is in the format of mtdX (eg: mtd4) or its label.\n" "mtd recognizes these commands:\n" " unlock unlock the device\n" @@ -376,6 +487,13 @@ static void usage(void) " -f force write without trx checks\n" " -e erase before executing the command\n" " -d directory for jffs2write, defaults to \"tmp\"\n" + " -j integrate into jffs2 data when writing an image\n" +#ifdef FIS_SUPPORT + " -F [:[:]][,...]\n" + " alter the fis partition table to create new partitions replacing\n" + " the partitions provided as argument to the write command\n" + " (only valid together with the write command)\n" +#endif "\n" "Example: To write linux.trx to mtd4 labeled as linux and reboot afterwards\n" " mtd -r write linux.trx linux\n\n"); @@ -397,24 +515,28 @@ static void do_reboot(void) int main (int argc, char **argv) { - int ch, i, boot, unlock, imagefd, force, unlocked; - char *erase[MAX_ARGS], *device; - char *jffs2dir = JFFS2_DEFAULT_DIR; + int ch, i, boot, imagefd = 0, force, unlocked; + char *erase[MAX_ARGS], *device = NULL; + char *fis_layout = NULL; enum { CMD_ERASE, CMD_WRITE, CMD_UNLOCK, CMD_REFRESH, CMD_JFFS2WRITE - } cmd; - + } cmd = -1; + erase[0] = NULL; boot = 0; force = 0; buflen = 0; quiet = 0; - while ((ch = getopt(argc, argv, "frqe:d:")) != -1) + while ((ch = getopt(argc, argv, +#ifdef FIS_SUPPORT + "F:" +#endif + "frqe:d:j:")) != -1) switch (ch) { case 'f': force = 1; @@ -422,6 +544,9 @@ int main (int argc, char **argv) case 'r': boot = 1; break; + case 'j': + jffs2file = optarg; + break; case 'q': quiet++; break; @@ -429,20 +554,25 @@ int main (int argc, char **argv) i = 0; while ((erase[i] != NULL) && ((i + 1) < MAX_ARGS)) i++; - + erase[i++] = optarg; erase[i] = NULL; break; case 'd': jffs2dir = optarg; break; +#ifdef FIS_SUPPORT + case 'F': + fis_layout = optarg; + break; +#endif case '?': default: usage(); } argc -= optind; argv += optind; - + if (argc < 2) usage(); @@ -458,7 +588,7 @@ int main (int argc, char **argv) } else if ((strcmp(argv[0], "write") == 0) && (argc == 3)) { cmd = CMD_WRITE; device = argv[2]; - + if (strcmp(argv[1], "-") == 0) { imagefile = ""; imagefd = 0; @@ -469,23 +599,20 @@ int main (int argc, char **argv) exit(1); } } - + + if (!mtd_check(device)) { + fprintf(stderr, "Can't open device for writing!\n"); + exit(1); + } /* check trx file before erasing or writing anything */ - if (!image_check(imagefd, device)) { - if (!force) { - fprintf(stderr, "Image check failed.\n"); - exit(1); - } - } else { - if (!mtd_check(device)) { - fprintf(stderr, "Can't open device for writing!\n"); - exit(1); - } + if (!image_check(imagefd, device) && !force) { + fprintf(stderr, "Image check failed.\n"); + exit(1); } } else if ((strcmp(argv[0], "jffs2write") == 0) && (argc == 3)) { cmd = CMD_JFFS2WRITE; device = argv[2]; - + imagefile = argv[1]; if (!mtd_check(device)) { fprintf(stderr, "Can't open device for writing!\n"); @@ -496,7 +623,7 @@ int main (int argc, char **argv) } sync(); - + i = 0; unlocked = 0; while (erase[i] != NULL) { @@ -506,8 +633,7 @@ int main (int argc, char **argv) unlocked = 1; i++; } - - + switch (cmd) { case CMD_UNLOCK: if (!unlocked) @@ -521,7 +647,7 @@ int main (int argc, char **argv) case CMD_WRITE: if (!unlocked) mtd_unlock(device); - mtd_write(imagefd, device); + mtd_write(imagefd, device, fis_layout); break; case CMD_JFFS2WRITE: if (!unlocked) @@ -534,7 +660,7 @@ int main (int argc, char **argv) } sync(); - + if (boot) do_reboot();