Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69423d99 authored by Adrian Hunter's avatar Adrian Hunter Committed by David Woodhouse
Browse files

[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: default avatarAdrian Hunter <ext-adrian.hunter@nokia.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 8a4c2495

drivers/mtd/chips/cfi_cmdset_0001.c

+6 −6
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ static int cfi_intelext_write_buffers(struct mtd_info *, loff_t, size_t, size_t 
static int cfi_intelext_writev(struct mtd_info *, const struct kvec *, unsigned long, loff_t, size_t *);

static int cfi_intelext_erase_varsize(struct mtd_info *, struct erase_info *);

static void cfi_intelext_sync (struct mtd_info *);

static int cfi_intelext_lock(struct mtd_info *mtd, loff_t ofs, size_t len);

static int cfi_intelext_unlock(struct mtd_info *mtd, loff_t ofs, size_t len);

static int cfi_intelext_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len);

static int cfi_intelext_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len);

#ifdef CONFIG_MTD_OTP

static int cfi_intelext_read_fact_prot_reg (struct mtd_info *, loff_t, size_t, size_t *, u_char *);

static int cfi_intelext_read_user_prot_reg (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
@@ -558,8 +558,8 @@ static struct mtd_info *cfi_intelext_setup(struct mtd_info *mtd) 
	}



	for (i=0; i<mtd->numeraseregions;i++){

		printk(KERN_DEBUG "erase region %d: offset=0x%x,size=0x%x,blocks=%d\n",

		       i,mtd->eraseregions[i].offset,

		printk(KERN_DEBUG "erase region %d: offset=0x%llx,size=0x%x,blocks=%d\n",

		       i,(unsigned long long)mtd->eraseregions[i].offset,

		       mtd->eraseregions[i].erasesize,

		       mtd->eraseregions[i].numblocks);

	}
@@ -2058,7 +2058,7 @@ out: put_chip(map, chip, adr); 
	return ret;

}



static int cfi_intelext_lock(struct mtd_info *mtd, loff_t ofs, size_t len)

static int cfi_intelext_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)

{

	int ret;
@@ -2082,7 +2082,7 @@ static int cfi_intelext_lock(struct mtd_info *mtd, loff_t ofs, size_t len) 
	return ret;

}



static int cfi_intelext_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)

static int cfi_intelext_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)

{

	int ret;

drivers/mtd/chips/cfi_cmdset_0002.c

+4 −4
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr 
static void put_chip(struct map_info *map, struct flchip *chip, unsigned long adr);

#include "fwh_lock.h"



static int cfi_atmel_lock(struct mtd_info *mtd, loff_t ofs, size_t len);

static int cfi_atmel_unlock(struct mtd_info *mtd, loff_t ofs, size_t len);

static int cfi_atmel_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len);

static int cfi_atmel_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len);



static struct mtd_chip_driver cfi_amdstd_chipdrv = {

	.probe		= NULL, /* Not usable directly */
@@ -1774,12 +1774,12 @@ static int do_atmel_unlock(struct map_info *map, struct flchip *chip, 
	return ret;

}



static int cfi_atmel_lock(struct mtd_info *mtd, loff_t ofs, size_t len)

static int cfi_atmel_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)

{

	return cfi_varsize_frob(mtd, do_atmel_lock, ofs, len, NULL);

}



static int cfi_atmel_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)

static int cfi_atmel_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)

{

	return cfi_varsize_frob(mtd, do_atmel_unlock, ofs, len, NULL);

}

drivers/mtd/chips/cfi_cmdset_0020.c

+7 −7
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ static int cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs, 
		unsigned long count, loff_t to, size_t *retlen);

static int cfi_staa_erase_varsize(struct mtd_info *, struct erase_info *);

static void cfi_staa_sync (struct mtd_info *);

static int cfi_staa_lock(struct mtd_info *mtd, loff_t ofs, size_t len);

static int cfi_staa_unlock(struct mtd_info *mtd, loff_t ofs, size_t len);

static int cfi_staa_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len);

static int cfi_staa_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len);

static int cfi_staa_suspend (struct mtd_info *);

static void cfi_staa_resume (struct mtd_info *);
@@ -221,8 +221,8 @@ static struct mtd_info *cfi_staa_setup(struct map_info *map) 
		}



		for (i=0; i<mtd->numeraseregions;i++){

			printk(KERN_DEBUG "%d: offset=0x%x,size=0x%x,blocks=%d\n",

			       i,mtd->eraseregions[i].offset,

			printk(KERN_DEBUG "%d: offset=0x%llx,size=0x%x,blocks=%d\n",

			       i, (unsigned long long)mtd->eraseregions[i].offset,

			       mtd->eraseregions[i].erasesize,

			       mtd->eraseregions[i].numblocks);

		}
@@ -964,7 +964,7 @@ static int cfi_staa_erase_varsize(struct mtd_info *mtd, 
		adr += regions[i].erasesize;

		len -= regions[i].erasesize;



		if (adr % (1<< cfi->chipshift) == ((regions[i].offset + (regions[i].erasesize * regions[i].numblocks)) %( 1<< cfi->chipshift)))

		if (adr % (1<< cfi->chipshift) == (((unsigned long)regions[i].offset + (regions[i].erasesize * regions[i].numblocks)) %( 1<< cfi->chipshift)))

			i++;



		if (adr >> cfi->chipshift) {
@@ -1135,7 +1135,7 @@ static inline int do_lock_oneblock(struct map_info *map, struct flchip *chip, un 
	spin_unlock_bh(chip->mutex);

	return 0;

}

static int cfi_staa_lock(struct mtd_info *mtd, loff_t ofs, size_t len)

static int cfi_staa_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)

{

	struct map_info *map = mtd->priv;

	struct cfi_private *cfi = map->fldrv_priv;
@@ -1284,7 +1284,7 @@ static inline int do_unlock_oneblock(struct map_info *map, struct flchip *chip, 
	spin_unlock_bh(chip->mutex);

	return 0;

}

static int cfi_staa_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)

static int cfi_staa_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)

{

	struct map_info *map = mtd->priv;

	struct cfi_private *cfi = map->fldrv_priv;

drivers/mtd/chips/fwh_lock.h

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int fwh_xxlock_oneblock(struct map_info *map, struct flchip *chip, 
}





static int fwh_lock_varsize(struct mtd_info *mtd, loff_t ofs, size_t len)

static int fwh_lock_varsize(struct mtd_info *mtd, loff_t ofs, uint64_t len)

{

	int ret;
@@ -88,7 +88,7 @@ static int fwh_lock_varsize(struct mtd_info *mtd, loff_t ofs, size_t len) 
}





static int fwh_unlock_varsize(struct mtd_info *mtd, loff_t ofs, size_t len)

static int fwh_unlock_varsize(struct mtd_info *mtd, loff_t ofs, uint64_t len)

{

	int ret;

drivers/mtd/inftlcore.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void inftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd) 
	struct INFTLrecord *inftl;

	unsigned long temp;



	if (mtd->type != MTD_NANDFLASH)

	if (mtd->type != MTD_NANDFLASH || mtd->size > UINT_MAX)

		return;

	/* OK, this is moderately ugly.  But probably safe.  Alternatives? */

	if (memcmp(mtd->name, "DiskOnChip", 10))