summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-04-08 10:08:32 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-04-12 09:54:56 +0200
commit027db60302e337aa52e33973d647935eb74723b0 (patch)
treefe20b834621a3b8358954897113efafecd6989d8 /commands
parent5386d6d77ce685ccc1e4f020c204902dd4499fb1 (diff)
downloadbarebox-027db60302e337aa52e33973d647935eb74723b0.tar.gz
barebox-027db60302e337aa52e33973d647935eb74723b0.tar.xz
nand: move bb handling code to drivers/mtd/nand
It's good to seperate the code which others can use from commands. This way other users do not depend on the command being compiled in. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands')
-rw-r--r--commands/nand.c248
1 files changed, 0 insertions, 248 deletions
diff --git a/commands/nand.c b/commands/nand.c
index dc8fd9ba88..9a72780fe9 100644
--- a/commands/nand.c
+++ b/commands/nand.c
@@ -32,254 +32,6 @@
#include <fcntl.h>
#include <libgen.h>
-struct nand_bb {
- char *devname;
- char *name;
- int open;
- int needs_write;
-
- struct mtd_info_user info;
-
- size_t raw_size;
- size_t size;
- int fd;
- off_t offset;
- void *writebuf;
-
- struct cdev cdev;
-};
-
-static ssize_t nand_bb_read(struct cdev *cdev, void *buf, size_t count,
- unsigned long offset, ulong flags)
-{
- struct nand_bb *bb = cdev->priv;
- int ret, bytes = 0, now;
-
- debug("%s %d %d\n", __func__, offset, count);
-
- while(count) {
- ret = ioctl(bb->fd, MEMGETBADBLOCK, (void *)bb->offset);
- if (ret < 0)
- return ret;
-
- if (ret) {
- printf("skipping bad block at 0x%08lx\n", bb->offset);
- bb->offset += bb->info.erasesize;
- continue;
- }
-
- now = min(count, (size_t)(bb->info.erasesize -
- (bb->offset % bb->info.erasesize)));
- lseek(bb->fd, bb->offset, SEEK_SET);
- ret = read(bb->fd, buf, now);
- if (ret < 0)
- return ret;
- buf += now;
- count -= now;
- bb->offset += now;
- bytes += now;
- };
-
- return bytes;
-}
-
-/* Must be a multiple of the largest NAND page size */
-#define BB_WRITEBUF_SIZE 4096
-
-#ifdef CONFIG_NAND_WRITE
-static int nand_bb_write_buf(struct nand_bb *bb, size_t count)
-{
- int ret, now;
- void *buf = bb->writebuf;
- int cur_ofs = bb->offset & ~(BB_WRITEBUF_SIZE - 1);
-
- while (count) {
- ret = ioctl(bb->fd, MEMGETBADBLOCK, (void *)cur_ofs);
- if (ret < 0)
- return ret;
-
- if (ret) {
- debug("skipping bad block at 0x%08x\n", cur_ofs);
- bb->offset += bb->info.erasesize;
- cur_ofs += bb->info.erasesize;
- continue;
- }
-
- now = min(count, (size_t)(bb->info.erasesize));
- lseek(bb->fd, cur_ofs, SEEK_SET);
- ret = write(bb->fd, buf, now);
- if (ret < 0)
- return ret;
- buf += now;
- count -= now;
- cur_ofs += now;
- };
-
- return 0;
-}
-
-static ssize_t nand_bb_write(struct cdev *cdev, const void *buf, size_t count,
- unsigned long offset, ulong flags)
-{
- struct nand_bb *bb = cdev->priv;
- int bytes = count, now, wroffs, ret;
-
- debug("%s offset: 0x%08x count: 0x%08x\n", __func__, offset, count);
-
- while (count) {
- wroffs = bb->offset % BB_WRITEBUF_SIZE;
- now = min((int)count, BB_WRITEBUF_SIZE - wroffs);
- memcpy(bb->writebuf + wroffs, buf, now);
-
- if (wroffs + now == BB_WRITEBUF_SIZE) {
- bb->needs_write = 0;
- ret = nand_bb_write_buf(bb, BB_WRITEBUF_SIZE);
- if (ret)
- return ret;
- } else {
- bb->needs_write = 1;
- }
-
- bb->offset += now;
- count -= now;
- buf += now;
- }
-
- return bytes;
-}
-
-static int nand_bb_erase(struct cdev *cdev, size_t count, unsigned long offset)
-{
- struct nand_bb *bb = cdev->priv;
-
- if (offset != 0) {
- printf("can only erase from beginning of device\n");
- return -EINVAL;
- }
-
- lseek(bb->fd, 0, SEEK_SET);
-
- return erase(bb->fd, bb->raw_size, 0);
-}
-#endif
-
-static int nand_bb_open(struct cdev *cdev)
-{
- struct nand_bb *bb = cdev->priv;
-
- if (bb->open)
- return -EBUSY;
-
- bb->open = 1;
- bb->offset = 0;
- bb->needs_write = 0;
- bb->writebuf = xmalloc(BB_WRITEBUF_SIZE);
-
- return 0;
-}
-
-static int nand_bb_close(struct cdev *cdev)
-{
- struct nand_bb *bb = cdev->priv;
-
-#ifdef CONFIG_NAND_WRITE
- if (bb->needs_write)
- nand_bb_write_buf(bb, bb->offset % BB_WRITEBUF_SIZE);
-#endif
- bb->open = 0;
- free(bb->writebuf);
-
- return 0;
-}
-
-static int nand_bb_calc_size(struct nand_bb *bb)
-{
- ulong pos = 0;
- int ret;
-
- while (pos < bb->raw_size) {
- ret = ioctl(bb->fd, MEMGETBADBLOCK, (void *)pos);
- if (ret < 0)
- return ret;
- if (!ret)
- bb->cdev.size += bb->info.erasesize;
-
- pos += bb->info.erasesize;
- }
-
- return 0;
-}
-
-static struct file_operations nand_bb_ops = {
- .open = nand_bb_open,
- .close = nand_bb_close,
- .read = nand_bb_read,
-#ifdef CONFIG_NAND_WRITE
- .write = nand_bb_write,
- .erase = nand_bb_erase,
-#endif
-};
-
-/**
- * Add a bad block aware device ontop of another (NAND) device
- * @param[in] dev The device to add a partition on
- * @param[in] name Partition name (can be obtained with devinfo command)
- * @return The device representing the new partition.
- */
-int dev_add_bb_dev(char *path, const char *name)
-{
- struct nand_bb *bb;
- int ret = -ENOMEM;
- struct stat s;
-
- bb = xzalloc(sizeof(*bb));
- bb->devname = asprintf("/dev/%s", basename(path));
- if (!bb->devname)
- goto out1;
-
- if (name)
- bb->cdev.name = strdup(name);
- else
- bb->cdev.name = asprintf("%s.bb", basename(path));
-
- if (!bb->cdev.name)
- goto out2;
-
- ret = stat(bb->devname, &s);
- if (ret)
- goto out3;
-
- bb->raw_size = s.st_size;
-
- bb->fd = open(bb->devname, O_RDWR);
- if (bb->fd < 0) {
- ret = -ENODEV;
- goto out3;
- }
-
- ret = ioctl(bb->fd, MEMGETINFO, &bb->info);
- if (ret)
- goto out4;
-
- nand_bb_calc_size(bb);
- bb->cdev.ops = &nand_bb_ops;
- bb->cdev.priv = bb;
-
- devfs_create(&bb->cdev);
-
- return 0;
-
-out4:
- close(bb->fd);
-out3:
- free(bb->cdev.name);
-out2:
- free(bb->devname);
-out1:
- free(bb);
- return ret;
-}
-
#define NAND_ADD (1 << 0)
#define NAND_DEL (1 << 1)
#define NAND_MARKBAD (1 << 2)