X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/91c63e98223fcc68fd6c4c3b4406e853f311f2d9..8114ef99e3071e1871d1680cf77063be52bbaf0a:/package/mtd/src/mtd.c diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c index 23e99160a..6e430f4b5 100644 --- a/package/mtd/src/mtd.c +++ b/package/mtd/src/mtd.c @@ -28,29 +28,26 @@ #include #include #include +#include +#include +#include #include #include #include #include +#include #include #include #include #include #include #include -#include +#include +#include "mtd-api.h" +#include "mtd.h" -#include - -#define TRX_MAGIC 0x30524448 /* "HDR0" */ -#define BUFSIZE (16 * 1024) #define MAX_ARGS 8 - -#define DEBUG - -#define SYSTYPE_UNKNOWN 0 -#define SYSTYPE_BROADCOM 1 -/* to be continued */ +#define JFFS2_DEFAULT_DIR "" /* directory name without /, empty means root dir */ struct trx_header { uint32_t magic; /* "HDR0" */ @@ -60,132 +57,124 @@ struct trx_header { uint32_t offsets[3]; /* Offsets of partitions from start of header */ }; -char buf[BUFSIZE]; -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 -image_check_bcom(int imagefd, const char *mtd) +int mtd_open(const char *mtd, bool block) { - struct trx_header *trx = (struct trx_header *) buf; - struct mtd_info_user mtdInfo; - int fd; + FILE *fp; + char dev[PATH_MAX]; + int i; + int ret; + int flags = O_RDWR | O_SYNC; - 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 ((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%s/%d", (block ? "block" : ""), i); + if ((ret=open(dev, flags))<0) { + snprintf(dev, sizeof(dev), "/dev/mtd%s%d", (block ? "block" : ""), i); + ret=open(dev, flags); + } + fclose(fp); + return ret; + } + } + fclose(fp); } - switch(trx->magic) { - case 0x47343557: /* W54G */ - case 0x53343557: /* W54S */ - case 0x73343557: /* W54s */ - case 0x46343557: /* W54F */ - case 0x55343557: /* W54U */ - /* ignore the first 32 bytes */ - buflen = read(imagefd, buf, sizeof(struct trx_header)); - break; - } - - if (trx->magic != TRX_MAGIC || trx->len < sizeof(struct trx_header)) { - fprintf(stderr, "Bad trx header\n"); - fprintf(stderr, "If this is a firmware in bin format, like some of the\n" - "original firmware files are, use following command to convert to trx:\n" - "dd if=firmware.bin of=firmware.trx bs=32 skip=1\n"); - return 0; - } + return open(mtd, flags); +} + +int mtd_check_open(const char *mtd) +{ + struct mtd_info_user mtdInfo; + int fd; - /* check if image fits to mtd device */ - fd = mtd_open(mtd, O_RDWR | O_SYNC); + fd = mtd_open(mtd, false); if(fd < 0) { fprintf(stderr, "Could not open mtd device: %s\n", mtd); - exit(1); + return 0; } if(ioctl(fd, MEMGETINFO, &mtdInfo)) { fprintf(stderr, "Could not get MTD device info from %s\n", mtd); - exit(1); - } - - if(mtdInfo.size < trx->len) { - fprintf(stderr, "Image too big for partition: %s\n", mtd); close(fd); return 0; - } - - close(fd); - return 1; + } + mtdsize = mtdInfo.size; + erasesize = mtdInfo.erasesize; + + return fd; } -int -image_check(int imagefd, const char *mtd) +int mtd_erase_block(int fd, int offset) { - int fd, systype; - size_t count; - char *c; - FILE *f; - - systype = SYSTYPE_UNKNOWN; - f = fopen("/proc/cpuinfo", "r"); - while (!feof(f) && (fgets(buf, BUFSIZE - 1, f) != NULL)) { - if ((strncmp(buf, "system type", 11) == 0) && (c = strchr(buf, ':'))) { - c += 2; - if (strncmp(c, "Broadcom BCM947XX", 17) == 0) - systype = SYSTYPE_BROADCOM; - } - } - fclose(f); - - switch(systype) { - case SYSTYPE_BROADCOM: - return image_check_bcom(imagefd, mtd); - default: - return 1; + struct erase_info_user mtdEraseInfo; + + mtdEraseInfo.start = offset; + mtdEraseInfo.length = erasesize; + ioctl(fd, MEMUNLOCK, &mtdEraseInfo); + if (ioctl (fd, MEMERASE, &mtdEraseInfo) < 0) { + fprintf(stderr, "Erasing mtd failed.\n"); + exit(1); } + return 0; } -int mtd_check(char *mtd) +int mtd_write_buffer(int fd, const char *buf, int offset, int length) +{ + lseek(fd, offset, SEEK_SET); + write(fd, buf, length); + return 0; +} + + +static int +image_check(int imagefd, const char *mtd) +{ +#ifdef target_brcm + return trx_check(imagefd, mtd, buf, &buflen); +#endif +} + +static int mtd_check(const char *mtd) { - struct mtd_info_user mtdInfo; int fd; - fd = mtd_open(mtd, O_RDWR | O_SYNC); - if(fd < 0) { - fprintf(stderr, "Could not open mtd device: %s\n", mtd); + fd = mtd_check_open(mtd); + if (!fd) return 0; - } - if(ioctl(fd, MEMGETINFO, &mtdInfo)) { - fprintf(stderr, "Could not get MTD device info from %s\n", mtd); - close(fd); - return 0; - } + if (!buf) + buf = malloc(erasesize); close(fd); return 1; } -int +static int mtd_unlock(const char *mtd) { int fd; - struct mtd_info_user mtdInfo; struct erase_info_user mtdLockInfo; - fd = mtd_open(mtd, O_RDWR | O_SYNC); - if(fd < 0) { + fd = mtd_check_open(mtd); + if(fd <= 0) { fprintf(stderr, "Could not open mtd device: %s\n", mtd); exit(1); } - if(ioctl(fd, MEMGETINFO, &mtdInfo)) { - fprintf(stderr, "Could not get MTD device info from %s\n", mtd); - close(fd); - exit(1); - } + if (quiet < 2) + fprintf(stderr, "Unlocking %s ...\n", mtd); mtdLockInfo.start = 0; - mtdLockInfo.length = mtdInfo.size; + mtdLockInfo.length = mtdsize; if(ioctl(fd, MEMUNLOCK, &mtdLockInfo)) { close(fd); return 0; @@ -195,58 +184,30 @@ mtd_unlock(const char *mtd) return 0; } -int -mtd_open(const char *mtd, int flags) -{ - FILE *fp; - char dev[PATH_MAX]; - int i; - - 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); - fclose(fp); - return open(dev, flags); - } - } - fclose(fp); - } - - return open(mtd, flags); -} - -int +static int mtd_erase(const char *mtd) { int fd; - struct mtd_info_user mtdInfo; struct erase_info_user mtdEraseInfo; - fd = mtd_open(mtd, O_RDWR | O_SYNC); - if(fd < 0) { - fprintf(stderr, "Could not open mtd device: %s\n", mtd); - exit(1); - } + if (quiet < 2) + fprintf(stderr, "Erasing %s ...\n", mtd); - if(ioctl(fd, MEMGETINFO, &mtdInfo)) { - fprintf(stderr, "Could not get MTD device info from %s\n", mtd); - close(fd); + fd = mtd_check_open(mtd); + if(fd <= 0) { + fprintf(stderr, "Could not open mtd device: %s\n", mtd); exit(1); } - mtdEraseInfo.length = mtdInfo.erasesize; + mtdEraseInfo.length = erasesize; for (mtdEraseInfo.start = 0; - mtdEraseInfo.start < mtdInfo.size; - mtdEraseInfo.start += mtdInfo.erasesize) { + mtdEraseInfo.start < mtdsize; + mtdEraseInfo.start += erasesize) { ioctl(fd, MEMUNLOCK, &mtdEraseInfo); - if(ioctl(fd, MEMERASE, &mtdEraseInfo)) { - fprintf(stderr, "Could not erase MTD device: %s\n", mtd); - close(fd); - exit(1); - } + if(ioctl(fd, MEMERASE, &mtdEraseInfo)) + fprintf(stderr, "Failed to erase block on %s at 0x%x\n", mtd, mtdEraseInfo.start); } close(fd); @@ -254,59 +215,106 @@ mtd_erase(const char *mtd) } -int -mtd_write(int imagefd, const char *mtd, int quiet) +static int +mtd_refresh(const char *mtd) { - int fd, i, result; - size_t r, w, e; - struct mtd_info_user mtdInfo; - struct erase_info_user mtdEraseInfo; - int ret = 0; + int fd; - fd = mtd_open(mtd, O_RDWR | O_SYNC); - if(fd < 0) { + if (quiet < 2) + fprintf(stderr, "Refreshing mtd partition %s ... ", mtd); + + fd = mtd_check_open(mtd); + if(fd <= 0) { fprintf(stderr, "Could not open mtd device: %s\n", mtd); exit(1); } - if(ioctl(fd, MEMGETINFO, &mtdInfo)) { - fprintf(stderr, "Could not get MTD device info from %s\n", mtd); + if (ioctl(fd, MTDREFRESH, NULL)) { + fprintf(stderr, "Failed to refresh the MTD device\n"); close(fd); exit(1); } + close(fd); + + if (quiet < 2) + fprintf(stderr, "\n"); + + return 0; +} + +static int +mtd_write(int imagefd, const char *mtd) +{ + int fd, result; + ssize_t r, w, e; + + 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; if (!quiet) fprintf(stderr, " [ ]"); for (;;) { /* buffer may contain data already (from trx check) */ - r = buflen; - r += read(imagefd, buf + buflen, BUFSIZE - buflen); - w += r; + do { + r = read(imagefd, buf + buflen, erasesize - buflen); + if (r < 0) { + if ((errno == EINTR) || (errno == EAGAIN)) + continue; + else { + perror("read"); + break; + } + } - /* EOF */ - if (r <= 0) break; + if (r == 0) { + fprintf(stderr, "No more data left\n"); + break; + } - /* need to erase the next block before writing data to it */ - while (w > e) { - mtdEraseInfo.start = e; - mtdEraseInfo.length = mtdInfo.erasesize; + buflen += r; + } while (buflen < erasesize); + + if (buflen == 0) + break; + + if (jffs2file) { + if (memcmp(buf, JFFS2_EOF, sizeof(JFFS2_EOF)) == 0) { + if (!quiet) + fprintf(stderr, "\b\b\b "); + if (quiet < 2) + fprintf(stderr, "\nAppending jffs2 data to 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 + buflen > e) { if (!quiet) fprintf(stderr, "\b\b\b[e]"); + + mtd_erase_block(fd, e); + /* erase the chunk */ - if (ioctl (fd,MEMERASE,&mtdEraseInfo) < 0) { - fprintf(stderr, "Erasing mtd failed: %s\n", mtd); - exit(1); - } - e += mtdInfo.erasesize; + e += erasesize; } if (!quiet) fprintf(stderr, "\b\b\b[w]"); - if ((result = write(fd, buf, r)) < r) { + if ((result = write(fd, buf, buflen)) < buflen) { if (result < 0) { fprintf(stderr, "Error writing image.\n"); exit(1); @@ -315,44 +323,69 @@ mtd_write(int imagefd, const char *mtd, int quiet) exit(1); } } - + w += buflen; + buflen = 0; } if (!quiet) fprintf(stderr, "\b\b\b\b"); +done: + if (quiet < 2) + fprintf(stderr, "\n"); + close(fd); return 0; } -void usage(void) +static void usage(void) { 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" + " refresh refresh mtd partition\n" " erase erase all data on device\n" " write |- write (use - for stdin) to device\n" + " jffs2write append to the jffs2 partition on the device\n" "Following options are available:\n" " -q quiet mode (once: no [w] on writing,\n" " twice: no status messages)\n" " -r reboot after successful command\n" " -f force write without trx checks\n" - " -e erase before executing the command\n\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" + "\n" "Example: To write linux.trx to mtd4 labeled as linux and reboot afterwards\n" " mtd -r write linux.trx linux\n\n"); exit(1); } +static void do_reboot(void) +{ + fprintf(stderr, "Rebooting ...\n"); + fflush(stderr); + + /* try regular reboot method first */ + system("/sbin/reboot"); + sleep(2); + + /* if we're still alive at this point, force the kernel to reboot */ + syscall(SYS_reboot,LINUX_REBOOT_MAGIC1,LINUX_REBOOT_MAGIC2,LINUX_REBOOT_CMD_RESTART,NULL); +} + int main (int argc, char **argv) { - int ch, i, boot, unlock, imagefd, force, quiet, unlocked; - char *erase[MAX_ARGS], *device, *imagefile; + int ch, i, boot, imagefd = 0, force, unlocked; + char *erase[MAX_ARGS], *device = NULL; enum { CMD_ERASE, CMD_WRITE, - CMD_UNLOCK - } cmd; + CMD_UNLOCK, + CMD_REFRESH, + CMD_JFFS2WRITE + } cmd = -1; erase[0] = NULL; boot = 0; @@ -360,7 +393,7 @@ int main (int argc, char **argv) buflen = 0; quiet = 0; - while ((ch = getopt(argc, argv, "frqe:")) != -1) + while ((ch = getopt(argc, argv, "frqe:d:j:")) != -1) switch (ch) { case 'f': force = 1; @@ -368,6 +401,9 @@ int main (int argc, char **argv) case 'r': boot = 1; break; + case 'j': + jffs2file = optarg; + break; case 'q': quiet++; break; @@ -379,7 +415,9 @@ int main (int argc, char **argv) erase[i++] = optarg; erase[i] = NULL; break; - + case 'd': + jffs2dir = optarg; + break; case '?': default: usage(); @@ -393,6 +431,9 @@ int main (int argc, char **argv) if ((strcmp(argv[0], "unlock") == 0) && (argc == 2)) { cmd = CMD_UNLOCK; device = argv[1]; + } else if ((strcmp(argv[0], "refresh") == 0) && (argc == 2)) { + cmd = CMD_REFRESH; + device = argv[1]; } else if ((strcmp(argv[0], "erase") == 0) && (argc == 2)) { cmd = CMD_ERASE; device = argv[1]; @@ -411,17 +452,23 @@ int main (int argc, char **argv) } } + 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 ((quiet < 2) || !force) - fprintf(stderr, "TRX check failed!\n"); - if (!force) - 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"); + exit(1); } } else { usage(); @@ -432,44 +479,43 @@ int main (int argc, char **argv) i = 0; unlocked = 0; while (erase[i] != NULL) { - if (quiet < 2) - fprintf(stderr, "Unlocking %s ...\n", erase[i]); mtd_unlock(erase[i]); - if (quiet < 2) - fprintf(stderr, "Erasing %s ...\n", erase[i]); mtd_erase(erase[i]); if (strcmp(erase[i], device) == 0) unlocked = 1; i++; } - if (!unlocked) { - if (quiet < 2) - fprintf(stderr, "Unlocking %s ...\n", device); - mtd_unlock(device); - } switch (cmd) { case CMD_UNLOCK: + if (!unlocked) + mtd_unlock(device); break; case CMD_ERASE: - if (quiet < 2) - fprintf(stderr, "Erasing %s ...\n", device); + if (!unlocked) + mtd_unlock(device); mtd_erase(device); break; case CMD_WRITE: - if (quiet < 2) - fprintf(stderr, "Writing from %s to %s ... ", imagefile, device); - mtd_write(imagefd, device, quiet); - if (quiet < 2) - fprintf(stderr, "\n"); + if (!unlocked) + mtd_unlock(device); + mtd_write(imagefd, device); + break; + case CMD_JFFS2WRITE: + if (!unlocked) + mtd_unlock(device); + mtd_write_jffs2(device, imagefile, jffs2dir); + break; + case CMD_REFRESH: + mtd_refresh(device); break; } sync(); if (boot) - kill(1, 15); // send SIGTERM to init for reboot + do_reboot(); return 0; }