brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

mtd: Update MTD infrastructure to support 64bit device size

Browse Source 
This patch brings the U-Boot MTD infrastructure in sync with the current
Linux MTD version (2.6.30-rc3). Biggest change is the 64bit device size
support and a resync of the mtdpart.c file which has seen multiple fixes
meanwhile.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Kyungmin Park <kmpark@infradead.org>
This commit is contained in:
Stefan Roese 2009-05-11 16:03:55 +02:00 committed by Wolfgang Denk
parent 0a57265533
commit 8d2effea23
6 changed files with 256 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/cmd_onenand.c
View File

@ -19,6 +19,10 @@
#include <asm/io.h> #include <asm/io.h>
#if !defined(CONFIG_SYS_64BIT_VSPRINTF)
#warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output!
#endif
static struct mtd_info *mtd; static struct mtd_info *mtd;
static loff_t next_ofs; static loff_t next_ofs;
@ -53,7 +57,7 @@ static int arg_off_size(int argc, char *argv[], ulong *off, size_t *size)
} }
if ((*off + *size) > mtd->size) { if ((*off + *size) > mtd->size) {
printf("total chip size (0x%x) exceeded!\n", mtd->size); printf("total chip size (0x%llx) exceeded!\n", mtd->size);
return -1; return -1;
} }

2
common/env_onenand.c
View File

@ -109,7 +109,7 @@ int saveenv(void)
if (onenand_write(&onenand_mtd, env_addr, onenand_mtd.writesize, &retlen, if (onenand_write(&onenand_mtd, env_addr, onenand_mtd.writesize, &retlen,
(u_char *) env_ptr)) { (u_char *) env_ptr)) {
printf("OneNAND: write failed at 0x%08x\n", instr.addr); printf("OneNAND: write failed at 0x%llx\n", instr.addr);
return 2; return 2;
} }

4
drivers/mtd/cfi_mtd.c
View File

@ -123,7 +123,7 @@ static void cfi_mtd_sync(struct mtd_info *mtd)
*/ */
} }
static int cfi_mtd_lock(struct mtd_info *mtd, loff_t ofs, size_t len) static int cfi_mtd_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
{ {
flash_info_t *fi = mtd->priv; flash_info_t *fi = mtd->priv;
@ -135,7 +135,7 @@ static int cfi_mtd_lock(struct mtd_info *mtd, loff_t ofs, size_t len)
return 0; return 0;
} }
static int cfi_mtd_unlock(struct mtd_info *mtd, loff_t ofs, size_t len) static int cfi_mtd_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
{ {
flash_info_t *fi = mtd->priv; flash_info_t *fi = mtd->priv;

254
drivers/mtd/mtdpart.c
View File

@ -26,7 +26,7 @@ struct list_head mtd_partitions;
struct mtd_part { struct mtd_part {
struct mtd_info mtd; struct mtd_info mtd;
struct mtd_info *master; struct mtd_info *master;
u_int32_t offset; uint64_t offset;
int index; int index;
struct list_head list; struct list_head list;
int registered; int registered;
@ -48,8 +48,11 @@ static int part_read (struct mtd_info *mtd, loff_t from, size_t len,
size_t *retlen, u_char *buf) size_t *retlen, u_char *buf)
{ {
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);
struct mtd_ecc_stats stats;
int res; int res;
stats = part->master->ecc_stats;
if (from >= mtd->size) if (from >= mtd->size)
len = 0; len = 0;
else if (from + len > mtd->size) else if (from + len > mtd->size)
@ -58,34 +61,13 @@ static int part_read (struct mtd_info *mtd, loff_t from, size_t len,
len, retlen, buf); len, retlen, buf);
if (unlikely(res)) { if (unlikely(res)) {
if (res == -EUCLEAN) if (res == -EUCLEAN)
mtd->ecc_stats.corrected++; mtd->ecc_stats.corrected += part->master->ecc_stats.corrected - stats.corrected;
if (res == -EBADMSG) if (res == -EBADMSG)
mtd->ecc_stats.failed++; mtd->ecc_stats.failed += part->master->ecc_stats.failed - stats.failed;
} }
return res; return res;
} }
#ifdef MTD_LINUX
static int part_point (struct mtd_info *mtd, loff_t from, size_t len,
size_t *retlen, void **virt, resource_size_t *phys)
{
struct mtd_part *part = PART(mtd);
if (from >= mtd->size)
len = 0;
else if (from + len > mtd->size)
len = mtd->size - from;
return part->master->point (part->master, from + part->offset,
len, retlen, virt, phys);
}
static void part_unpoint(struct mtd_info *mtd, loff_t from, size_t len)
{
struct mtd_part *part = PART(mtd);
part->master->unpoint(part->master, from + part->offset, len);
}
#endif
static int part_read_oob(struct mtd_info *mtd, loff_t from, static int part_read_oob(struct mtd_info *mtd, loff_t from,
struct mtd_oob_ops *ops) struct mtd_oob_ops *ops)
{ {
@ -107,8 +89,8 @@ static int part_read_oob(struct mtd_info *mtd, loff_t from,
return res; return res;
} }
static int part_read_user_prot_reg (struct mtd_info *mtd, loff_t from, size_t len, static int part_read_user_prot_reg(struct mtd_info *mtd, loff_t from,
size_t *retlen, u_char *buf) size_t len, size_t *retlen, u_char *buf)
{ {
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);
return part->master->read_user_prot_reg(part->master, from, return part->master->read_user_prot_reg(part->master, from,
@ -122,16 +104,16 @@ static int part_get_user_prot_info (struct mtd_info *mtd,
return part->master->get_user_prot_info(part->master, buf, len); return part->master->get_user_prot_info(part->master, buf, len);
} }
static int part_read_fact_prot_reg (struct mtd_info *mtd, loff_t from, size_t len, static int part_read_fact_prot_reg(struct mtd_info *mtd, loff_t from,
size_t *retlen, u_char *buf) size_t len, size_t *retlen, u_char *buf)
{ {
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);
return part->master->read_fact_prot_reg(part->master, from, return part->master->read_fact_prot_reg(part->master, from,
len, retlen, buf); len, retlen, buf);
} }
static int part_get_fact_prot_info (struct mtd_info *mtd, static int part_get_fact_prot_info(struct mtd_info *mtd, struct otp_info *buf,
struct otp_info *buf, size_t len) size_t len)
{ {
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);
return part->master->get_fact_prot_info(part->master, buf, len); return part->master->get_fact_prot_info(part->master, buf, len);
@ -151,7 +133,6 @@ static int part_write (struct mtd_info *mtd, loff_t to, size_t len,
len, retlen, buf); len, retlen, buf);
} }
#ifdef MTD_LINUX
static int part_panic_write(struct mtd_info *mtd, loff_t to, size_t len, static int part_panic_write(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const u_char *buf) size_t *retlen, const u_char *buf)
{ {
@ -165,7 +146,6 @@ static int part_panic_write (struct mtd_info *mtd, loff_t to, size_t len,
return part->master->panic_write(part->master, to + part->offset, return part->master->panic_write(part->master, to + part->offset,
len, retlen, buf); len, retlen, buf);
} }
#endif
static int part_write_oob(struct mtd_info *mtd, loff_t to, static int part_write_oob(struct mtd_info *mtd, loff_t to,
struct mtd_oob_ops *ops) struct mtd_oob_ops *ops)
@ -182,32 +162,21 @@ static int part_write_oob(struct mtd_info *mtd, loff_t to,
return part->master->write_oob(part->master, to + part->offset, ops); return part->master->write_oob(part->master, to + part->offset, ops);
} }
static int part_write_user_prot_reg (struct mtd_info *mtd, loff_t from, size_t len, static int part_write_user_prot_reg(struct mtd_info *mtd, loff_t from,
size_t *retlen, u_char *buf) size_t len, size_t *retlen, u_char *buf)
{ {
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);
return part->master->write_user_prot_reg(part->master, from, return part->master->write_user_prot_reg(part->master, from,
len, retlen, buf); len, retlen, buf);
} }
static int part_lock_user_prot_reg (struct mtd_info *mtd, loff_t from, size_t len) static int part_lock_user_prot_reg(struct mtd_info *mtd, loff_t from,
size_t len)
{ {
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);
return part->master->lock_user_prot_reg(part->master, from, len); return part->master->lock_user_prot_reg(part->master, from, len);
} }
#ifdef MTD_LINUX
static int part_writev (struct mtd_info *mtd, const struct kvec *vecs,
unsigned long count, loff_t to, size_t *retlen)
{
struct mtd_part *part = PART(mtd);
if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS;
return part->master->writev (part->master, vecs, count,
to + part->offset, retlen);
}
#endif
static int part_erase(struct mtd_info *mtd, struct erase_info *instr) static int part_erase(struct mtd_info *mtd, struct erase_info *instr)
{ {
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);
@ -219,7 +188,7 @@ static int part_erase (struct mtd_info *mtd, struct erase_info *instr)
instr->addr += part->offset; instr->addr += part->offset;
ret = part->master->erase(part->master, instr); ret = part->master->erase(part->master, instr);
if (ret) { if (ret) {
if (instr->fail_addr != 0xffffffff) if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
instr->fail_addr -= part->offset; instr->fail_addr -= part->offset;
instr->addr -= part->offset; instr->addr -= part->offset;
} }
@ -231,19 +200,15 @@ void mtd_erase_callback(struct erase_info *instr)
if (instr->mtd->erase == part_erase) { if (instr->mtd->erase == part_erase) {
struct mtd_part *part = PART(instr->mtd); struct mtd_part *part = PART(instr->mtd);
if (instr->fail_addr != 0xffffffff) if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
instr->fail_addr -= part->offset; instr->fail_addr -= part->offset;
instr->addr -= part->offset; instr->addr -= part->offset;
} }
if (instr->callback) if (instr->callback)
instr->callback(instr); instr->callback(instr);
} }
#ifdef MTD_LINUX
EXPORT_SYMBOL_GPL(mtd_erase_callback);
#endif
#ifdef MTD_LINUX static int part_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
static int part_lock (struct mtd_info *mtd, loff_t ofs, size_t len)
{ {
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);
if ((len + ofs) > mtd->size) if ((len + ofs) > mtd->size)
@ -251,14 +216,13 @@ static int part_lock (struct mtd_info *mtd, loff_t ofs, size_t len)
return part->master->lock(part->master, ofs + part->offset, len); return part->master->lock(part->master, ofs + part->offset, len);
} }
static int part_unlock (struct mtd_info *mtd, loff_t ofs, size_t len) static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
{ {
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);
if ((len + ofs) > mtd->size) if ((len + ofs) > mtd->size)
return -EINVAL; return -EINVAL;
return part->master->unlock(part->master, ofs + part->offset, len); return part->master->unlock(part->master, ofs + part->offset, len);
} }
#endif
static void part_sync(struct mtd_info *mtd) static void part_sync(struct mtd_info *mtd)
{ {
@ -266,7 +230,6 @@ static void part_sync(struct mtd_info *mtd)
part->master->sync(part->master); part->master->sync(part->master);
} }
#ifdef MTD_LINUX
static int part_suspend(struct mtd_info *mtd) static int part_suspend(struct mtd_info *mtd)
{ {
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);
@ -278,7 +241,6 @@ static void part_resume(struct mtd_info *mtd)
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);
part->master->resume(part->master); part->master->resume(part->master);
} }
#endif
static int part_block_isbad(struct mtd_info *mtd, loff_t ofs) static int part_block_isbad(struct mtd_info *mtd, loff_t ofs)
{ {
@ -300,10 +262,8 @@ static int part_block_markbad (struct mtd_info *mtd, loff_t ofs)
return -EINVAL; return -EINVAL;
ofs += part->offset; ofs += part->offset;
res = part->master->block_markbad(part->master, ofs); res = part->master->block_markbad(part->master, ofs);
#ifdef MTD_LINUX
if (!res) if (!res)
mtd->ecc_stats.badblocks++; mtd->ecc_stats.badblocks++;
#endif
return res; return res;
} }
@ -314,88 +274,53 @@ static int part_block_markbad (struct mtd_info *mtd, loff_t ofs)
int del_mtd_partitions(struct mtd_info *master) int del_mtd_partitions(struct mtd_info *master)
{ {
struct list_head *node; struct mtd_part *slave, *next;
struct mtd_part *slave;
for (node = mtd_partitions.next; list_for_each_entry_safe(slave, next, &mtd_partitions, list)
node != &mtd_partitions;
node = node->next) {
slave = list_entry(node, struct mtd_part, list);
if (slave->master == master) { if (slave->master == master) {
struct list_head *prev = node->prev; list_del(&slave->list);
__list_del(prev, node->next);
if (slave->registered) if (slave->registered)
del_mtd_device(&slave->mtd); del_mtd_device(&slave->mtd);
kfree(slave); kfree(slave);
node = prev;
}
} }
return 0; return 0;
} }
/* static struct mtd_part *add_one_partition(struct mtd_info *master,
* This function, given a master MTD object and a partition table, creates const struct mtd_partition *part, int partno,
* and registers slave MTD objects which are bound to the master according to uint64_t cur_offset)
* the partition definitions.
* (Q: should we register the master MTD object as well?)
*/
int add_mtd_partitions(struct mtd_info *master,
const struct mtd_partition *parts,
int nbparts)
{ {
struct mtd_part *slave; struct mtd_part *slave;
u_int32_t cur_offset = 0;
int i;
/*
* Need to init the list here, since LIST_INIT() does not
* work on platforms where relocation has problems (like MIPS
* & PPC).
*/
if (mtd_partitions.next == NULL)
INIT_LIST_HEAD(&mtd_partitions);
printk (KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
for (i = 0; i < nbparts; i++) {
/* allocate the partition structure */ /* allocate the partition structure */
slave = kzalloc(sizeof(*slave), GFP_KERNEL); slave = kzalloc(sizeof(*slave), GFP_KERNEL);
if (!slave) { if (!slave) {
printk ("memory allocation error while creating partitions for \"%s\"\n", printk(KERN_ERR"memory allocation error while creating partitions for \"%s\"\n",
master->name); master->name);
del_mtd_partitions(master); del_mtd_partitions(master);
return -ENOMEM; return NULL;
} }
list_add(&slave->list, &mtd_partitions); list_add(&slave->list, &mtd_partitions);
/* set up the MTD object for this partition */ /* set up the MTD object for this partition */
slave->mtd.type = master->type; slave->mtd.type = master->type;
slave->mtd.flags = master->flags & ~parts[i].mask_flags; slave->mtd.flags = master->flags & ~part->mask_flags;
slave->mtd.size = parts[i].size; slave->mtd.size = part->size;
slave->mtd.writesize = master->writesize; slave->mtd.writesize = master->writesize;
slave->mtd.oobsize = master->oobsize; slave->mtd.oobsize = master->oobsize;
slave->mtd.oobavail = master->oobavail; slave->mtd.oobavail = master->oobavail;
slave->mtd.subpage_sft = master->subpage_sft; slave->mtd.subpage_sft = master->subpage_sft;
slave->mtd.name = parts[i].name; slave->mtd.name = part->name;
slave->mtd.owner = master->owner; slave->mtd.owner = master->owner;
slave->mtd.read = part_read; slave->mtd.read = part_read;
slave->mtd.write = part_write; slave->mtd.write = part_write;
#ifdef MTD_LINUX
if (master->panic_write) if (master->panic_write)
slave->mtd.panic_write = part_panic_write; slave->mtd.panic_write = part_panic_write;
if(master->point && master->unpoint){
slave->mtd.point = part_point;
slave->mtd.unpoint = part_unpoint;
}
#endif
if (master->read_oob) if (master->read_oob)
slave->mtd.read_oob = part_read_oob; slave->mtd.read_oob = part_read_oob;
if (master->write_oob) if (master->write_oob)
@ -414,96 +339,99 @@ int add_mtd_partitions(struct mtd_info *master,
slave->mtd.get_fact_prot_info = part_get_fact_prot_info; slave->mtd.get_fact_prot_info = part_get_fact_prot_info;
if (master->sync) if (master->sync)
slave->mtd.sync = part_sync; slave->mtd.sync = part_sync;
#ifdef MTD_LINUX if (!partno && master->suspend && master->resume) {
if (!i && master->suspend && master->resume) {
slave->mtd.suspend = part_suspend; slave->mtd.suspend = part_suspend;
slave->mtd.resume = part_resume; slave->mtd.resume = part_resume;
} }
if (master->writev)
slave->mtd.writev = part_writev;
if (master->lock) if (master->lock)
slave->mtd.lock = part_lock; slave->mtd.lock = part_lock;
if (master->unlock) if (master->unlock)
slave->mtd.unlock = part_unlock; slave->mtd.unlock = part_unlock;
#endif
if (master->block_isbad) if (master->block_isbad)
slave->mtd.block_isbad = part_block_isbad; slave->mtd.block_isbad = part_block_isbad;
if (master->block_markbad) if (master->block_markbad)
slave->mtd.block_markbad = part_block_markbad; slave->mtd.block_markbad = part_block_markbad;
slave->mtd.erase = part_erase; slave->mtd.erase = part_erase;
slave->master = master; slave->master = master;
slave->offset = parts[i].offset; slave->offset = part->offset;
slave->index = i; slave->index = partno;
if (slave->offset == MTDPART_OFS_APPEND) if (slave->offset == MTDPART_OFS_APPEND)
slave->offset = cur_offset; slave->offset = cur_offset;
if (slave->offset == MTDPART_OFS_NXTBLK) { if (slave->offset == MTDPART_OFS_NXTBLK) {
slave->offset = cur_offset; slave->offset = cur_offset;
if ((cur_offset % master->erasesize) != 0) { if (mtd_mod_by_eb(cur_offset, master) != 0) {
/* Round up to next erasesize */ /* Round up to next erasesize */
slave->offset = ((cur_offset / master->erasesize) + 1) * master->erasesize; slave->offset = (mtd_div_by_eb(cur_offset, master) + 1) * master->erasesize;
printk(KERN_NOTICE "Moving partition %d: " printk(KERN_NOTICE "Moving partition %d: "
"0x%08x -> 0x%08x\n", i, "0x%012llx -> 0x%012llx\n", partno,
cur_offset, slave->offset); (unsigned long long)cur_offset, (unsigned long long)slave->offset);
} }
} }
if (slave->mtd.size == MTDPART_SIZ_FULL) if (slave->mtd.size == MTDPART_SIZ_FULL)
slave->mtd.size = master->size - slave->offset; slave->mtd.size = master->size - slave->offset;
cur_offset = slave->offset + slave->mtd.size;
printk (KERN_NOTICE "0x%08x-0x%08x : \"%s\"\n", slave->offset, printk(KERN_NOTICE "0x%012llx-0x%012llx : \"%s\"\n", (unsigned long long)slave->offset,
slave->offset + slave->mtd.size, slave->mtd.name); (unsigned long long)(slave->offset + slave->mtd.size), slave->mtd.name);
/* let's do some sanity checks */ /* let's do some sanity checks */
if (slave->offset >= master->size) { if (slave->offset >= master->size) {
/* let's register it anyway to preserve ordering */ /* let's register it anyway to preserve ordering */
slave->offset = 0; slave->offset = 0;
slave->mtd.size = 0; slave->mtd.size = 0;
printk ("mtd: partition \"%s\" is out of reach -- disabled\n", printk(KERN_ERR"mtd: partition \"%s\" is out of reach -- disabled\n",
parts[i].name); part->name);
goto out_register;
} }
if (slave->offset + slave->mtd.size > master->size) { if (slave->offset + slave->mtd.size > master->size) {
slave->mtd.size = master->size - slave->offset; slave->mtd.size = master->size - slave->offset;
printk ("mtd: partition \"%s\" extends beyond the end of device \"%s\" -- size truncated to %#x\n", printk(KERN_WARNING"mtd: partition \"%s\" extends beyond the end of device \"%s\" -- size truncated to %#llx\n",
parts[i].name, master->name, slave->mtd.size); part->name, master->name, (unsigned long long)slave->mtd.size);
} }
if (master->numeraseregions > 1) { if (master->numeraseregions > 1) {
/* Deal with variable erase size stuff */ /* Deal with variable erase size stuff */
int i; int i, max = master->numeraseregions;
u64 end = slave->offset + slave->mtd.size;
struct mtd_erase_region_info *regions = master->eraseregions; struct mtd_erase_region_info *regions = master->eraseregions;
/* Find the first erase regions which is part of this partition. */ /* Find the first erase regions which is part of this
for (i=0; i < master->numeraseregions && slave->offset >= regions[i].offset; i++) * partition. */
for (i = 0; i < max && regions[i].offset <= slave->offset; i++)
; ;
/* The loop searched for the region _behind_ the first one */
i--;
for (i--; i < master->numeraseregions && slave->offset + slave->mtd.size > regions[i].offset; i++) { /* Pick biggest erasesize */
for (; i < max && regions[i].offset < end; i++) {
if (slave->mtd.erasesize < regions[i].erasesize) { if (slave->mtd.erasesize < regions[i].erasesize) {
slave->mtd.erasesize = regions[i].erasesize; slave->mtd.erasesize = regions[i].erasesize;
} }
} }
BUG_ON(slave->mtd.erasesize == 0);
} else { } else {
/* Single erase size */ /* Single erase size */
slave->mtd.erasesize = master->erasesize; slave->mtd.erasesize = master->erasesize;
} }
if ((slave->mtd.flags & MTD_WRITEABLE) && if ((slave->mtd.flags & MTD_WRITEABLE) &&
(slave->offset % slave->mtd.erasesize)) { mtd_mod_by_eb(slave->offset, &slave->mtd)) {
/* Doesn't start on a boundary of major erase size */ /* Doesn't start on a boundary of major erase size */
/* FIXME: Let it be writable if it is on a boundary of _minor_ erase size though */ /* FIXME: Let it be writable if it is on a boundary of
* _minor_ erase size though */
slave->mtd.flags &= ~MTD_WRITEABLE; slave->mtd.flags &= ~MTD_WRITEABLE;
printk ("mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n", printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
parts[i].name); part->name);
} }
if ((slave->mtd.flags & MTD_WRITEABLE) && if ((slave->mtd.flags & MTD_WRITEABLE) &&
(slave->mtd.size % slave->mtd.erasesize)) { mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
slave->mtd.flags &= ~MTD_WRITEABLE; slave->mtd.flags &= ~MTD_WRITEABLE;
printk ("mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n", printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
parts[i].name); part->name);
} }
slave->mtd.ecclayout = master->ecclayout; slave->mtd.ecclayout = master->ecclayout;
if (master->block_isbad) { if (master->block_isbad) {
uint32_t offs = 0; uint64_t offs = 0;
while (offs < slave->mtd.size) { while (offs < slave->mtd.size) {
if (master->block_isbad(master, if (master->block_isbad(master,
@ -513,28 +441,52 @@ int add_mtd_partitions(struct mtd_info *master,
} }
} }
#ifdef MTD_LINUX out_register:
if (parts[i].mtdp) { if (part->mtdp) {
/* store the object pointer /* store the object pointer (caller may or may not register it*/
* (caller may or may not register it */ *part->mtdp = &slave->mtd;
*parts[i].mtdp = &slave->mtd;
slave->registered = 0; slave->registered = 0;
} else { } else {
/* register our partition */ /* register our partition */
add_mtd_device(&slave->mtd); add_mtd_device(&slave->mtd);
slave->registered = 1; slave->registered = 1;
} }
#else return slave;
/* register our partition */ }
add_mtd_device(&slave->mtd);
slave->registered = 1; /*
#endif * This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to
* the partition definitions.
*
* We don't register the master, or expect the caller to have done so,
* for reasons of data integrity.
*/
int add_mtd_partitions(struct mtd_info *master,
const struct mtd_partition *parts,
int nbparts)
{
struct mtd_part *slave;
uint64_t cur_offset = 0;
int i;
/*
* Need to init the list here, since LIST_INIT() does not
* work on platforms where relocation has problems (like MIPS
* & PPC).
*/
if (mtd_partitions.next == NULL)
INIT_LIST_HEAD(&mtd_partitions);
printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
for (i = 0; i < nbparts; i++) {
slave = add_one_partition(master, parts + i, i, cur_offset);
if (!slave)
return -ENOMEM;
cur_offset = slave->offset + slave->mtd.size;
} }
return 0; return 0;
} }
#ifdef MTD_LINUX
EXPORT_SYMBOL(add_mtd_partitions);
EXPORT_SYMBOL(del_mtd_partitions);
#endif

11
drivers/mtd/nand/nand_util.c
View File

@ -36,12 +36,15 @@
#include <malloc.h> #include <malloc.h>
#include <div64.h> #include <div64.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <nand.h> #include <nand.h>
#include <jffs2/jffs2.h> #include <jffs2/jffs2.h>
#if !defined(CONFIG_SYS_64BIT_VSPRINTF)
#warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output!
#endif
typedef struct erase_info erase_info_t; typedef struct erase_info erase_info_t;
typedef struct mtd_info mtd_info_t; typedef struct mtd_info mtd_info_t;
@ -127,7 +130,7 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
if (ret > 0) { if (ret > 0) {
if (!opts->quiet) if (!opts->quiet)
printf("\rSkipping bad block at " printf("\rSkipping bad block at "
"0x%08x " "0x%08llx "
" \n", " \n",
erase.addr); erase.addr);
continue; continue;
@ -181,11 +184,11 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
if (percent != percent_complete) { if (percent != percent_complete) {
percent_complete = percent; percent_complete = percent;
printf("\rErasing at 0x%x -- %3d%% complete.", printf("\rErasing at 0x%llx -- %3d%% complete.",
erase.addr, percent); erase.addr, percent);
if (opts->jffs2 && result == 0) if (opts->jffs2 && result == 0)
printf(" Cleanmarker written at 0x%x.", printf(" Cleanmarker written at 0x%llx.",
erase.addr); erase.addr);
} }
} }

29
include/linux/mtd/mtd.h
View File

@ -8,6 +8,7 @@
#define __MTD_MTD_H__ #define __MTD_MTD_H__
#include <linux/types.h> #include <linux/types.h>
#include <div64.h>
#include <linux/mtd/mtd-abi.h> #include <linux/mtd/mtd-abi.h>
#define MTD_CHAR_MAJOR 90 #define MTD_CHAR_MAJOR 90
@ -20,6 +21,8 @@
#define MTD_ERASE_DONE 0x08 #define MTD_ERASE_DONE 0x08
#define MTD_ERASE_FAILED 0x10 #define MTD_ERASE_FAILED 0x10
#define MTD_FAIL_ADDR_UNKNOWN -1LL
/* /*
* Enumeration for NAND/OneNAND flash chip state * Enumeration for NAND/OneNAND flash chip state
*/ */
@ -37,13 +40,13 @@ enum {
}; };
/* If the erase fails, fail_addr might indicate exactly which block failed. If /* If the erase fails, fail_addr might indicate exactly which block failed. If
fail_addr = 0xffffffff, the failure was not at the device level or was not fail_addr = MTD_FAIL_ADDR_UNKNOWN, the failure was not at the device level or was not
specific to any particular block. */ specific to any particular block. */
struct erase_info { struct erase_info {
struct mtd_info *mtd; struct mtd_info *mtd;
u_int32_t addr; uint64_t addr;
u_int32_t len; uint64_t len;
u_int32_t fail_addr; uint64_t fail_addr;
u_long time; u_long time;
u_long retries; u_long retries;
u_int dev; u_int dev;
@ -55,7 +58,7 @@ struct erase_info {
}; };
struct mtd_erase_region_info { struct mtd_erase_region_info {
u_int32_t offset; /* At which this region starts, from the beginning of the MTD */ uint64_t offset; /* At which this region starts, from the beginning of the MTD */
u_int32_t erasesize; /* For this region */ u_int32_t erasesize; /* For this region */
u_int32_t numblocks; /* Number of blocks of erasesize in this region */ u_int32_t numblocks; /* Number of blocks of erasesize in this region */
unsigned long *lockmap; /* If keeping bitmap of locks */ unsigned long *lockmap; /* If keeping bitmap of locks */
@ -110,7 +113,7 @@ struct mtd_oob_ops {
struct mtd_info { struct mtd_info {
u_char type; u_char type;
u_int32_t flags; u_int32_t flags;
u_int32_t size; /* Total size of the MTD */ uint64_t size; // Total size of the MTD
/* "Major" erase size for the device. Naïve users may take this /* "Major" erase size for the device. Naïve users may take this
* to be the only erase size available, or may use the more detailed * to be the only erase size available, or may use the more detailed
@ -202,8 +205,8 @@ struct mtd_info {
void (*sync) (struct mtd_info *mtd); void (*sync) (struct mtd_info *mtd);
/* Chip-supported device locking */ /* Chip-supported device locking */
int (*lock) (struct mtd_info *mtd, loff_t ofs, size_t len); int (*lock) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
int (*unlock) (struct mtd_info *mtd, loff_t ofs, size_t len); int (*unlock) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
/* Power Management functions */ /* Power Management functions */
int (*suspend) (struct mtd_info *mtd); int (*suspend) (struct mtd_info *mtd);
@ -236,6 +239,16 @@ struct mtd_info {
void (*put_device) (struct mtd_info *mtd); void (*put_device) (struct mtd_info *mtd);
}; };
static inline uint32_t mtd_div_by_eb(uint64_t sz, struct mtd_info *mtd)
{
do_div(sz, mtd->erasesize);
return sz;
}
static inline uint32_t mtd_mod_by_eb(uint64_t sz, struct mtd_info *mtd)
{
return do_div(sz, mtd->erasesize);
}
/* Kernel-side ioctl definitions */ /* Kernel-side ioctl definitions */