[MTD] update internal API to support 64-bit device size

MTD internal API presently uses 32-bit values to represent
device size.  This patch updates them to 64-bits but leaves
the external API unchanged.  Extending the external API
is a separate issue for several reasons.  First, no one
needs it at the moment.  Secondly, whether the implementation
is done with IOCTLs, sysfs or both is still debated.  Thirdly
external API changes require the internal API to be accepted
first.

Note that although the MTD API will be able to support 64-bit
device sizes, existing drivers do not and are not required
to do so, although NAND base has been updated.

In general, changing from 32-bit to 64-bit values cause little
or no changes to the majority of the code with the following
exceptions:
    	- printk message formats
    	- division and modulus of 64-bit values
    	- NAND base support
	- 32-bit local variables used by mtdpart and mtdconcat
	- naughtily assuming one structure maps to another
	in MEMERASE ioctl

Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

1 files changed, 12 insertions, 11 deletions

diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c
index e538c0a72abb..490b4742ce3a 100644
--- a/drivers/mtd/rfd_ftl.c
+++ b/drivers/mtd/rfd_ftl.c
@@ -156,7 +156,7 @@ static int scan_header(struct partition *part)
         size_t retlen;
 
         sectors_per_block = part->block_size / SECTOR_SIZE;
-        part->total_blocks = part->mbd.mtd->size / part->block_size;
+        part->total_blocks = (u32)part->mbd.mtd->size / part->block_size;
 
         if (part->total_blocks < 2)
                 return -ENOENT;
@@ -276,16 +276,17 @@ static void erase_callback(struct erase_info *erase)
 
         part = (struct partition*)erase->priv;
 
-        i = erase->addr / part->block_size;
-        if (i >= part->total_blocks || part->blocks[i].offset != erase->addr) {
-                printk(KERN_ERR PREFIX "erase callback for unknown offset %x "
-                                "on '%s'\n", erase->addr, part->mbd.mtd->name);
+        i = (u32)erase->addr / part->block_size;
+        if (i >= part->total_blocks || part->blocks[i].offset != erase->addr ||
+            erase->addr > UINT_MAX) {
+                printk(KERN_ERR PREFIX "erase callback for unknown offset %llx "
+                                "on '%s'\n", (unsigned long long)erase->addr, part->mbd.mtd->name);
                 return;
         }
 
         if (erase->state != MTD_ERASE_DONE) {
-                printk(KERN_WARNING PREFIX "erase failed at 0x%x on '%s', "
-                                "state %d\n", erase->addr,
+                printk(KERN_WARNING PREFIX "erase failed at 0x%llx on '%s', "
+                                "state %d\n", (unsigned long long)erase->addr,
                                 part->mbd.mtd->name, erase->state);
 
                 part->blocks[i].state = BLOCK_FAILED;
@@ -345,9 +346,9 @@ static int erase_block(struct partition *part, int block)
         rc = part->mbd.mtd->erase(part->mbd.mtd, erase);
 
         if (rc) {
-                printk(KERN_ERR PREFIX "erase of region %x,%x on '%s' "
-                                "failed\n", erase->addr, erase->len,
-                                part->mbd.mtd->name);
+                printk(KERN_ERR PREFIX "erase of region %llx,%llx on '%s' "
+                                "failed\n", (unsigned long long)erase->addr,
+                                (unsigned long long)erase->len, part->mbd.mtd->name);
                 kfree(erase);
         }
 
@@ -763,7 +764,7 @@ static void rfd_ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
 {
         struct partition *part;
 
-        if (mtd->type != MTD_NORFLASH)
+        if (mtd->type != MTD_NORFLASH || mtd->size > UINT_MAX)
                 return;
 
         part = kzalloc(sizeof(struct partition), GFP_KERNEL);