mtd: add MEMERASE64 ioctl for >4GiB devices
Subsystems (2)
PATCH 6/14 mtd: add MEMERASE64 ioctl for >4GiB devices
From: Kevin Cernekee <[email protected]>
New MEMERASE/MEMREADOOB/MEMWRITEOOB ioctls are needed in order to support 64-bit offsets into large NAND flash devices.
Signed-off-by Kevin Cernekee <[email protected]>
Cc David Woodhouse <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/mtd/mtdchar.c | 29 +++++++++++++++++++++-------- fs/compat_ioctl.c | 1 + include/mtd/mtd-abi.h | 6 ++++++ 3 files changed, 28 insertions(+), 8 deletions(-)
drivers/mtd/mtdchar.c renamed from drivers/mtd/mtdchar.c~mtd-add-memerase64-ioctl-for-4gib-devices +21 -8
@@ -417,6 +417,7 @@ static int mtd_ioctl(struct inode *inodebreak ;case MEMERASE : +case MEMERASE64 : {struct erase_info *erase;
@@ -427,20 +428,32 @@ static int mtd_ioctl(struct inode *inodeif (!erase) ret = -ENOMEM ;else { -struct erase_info_user einfo; -wait_queue_head_t waitq;DECLARE_WAITQUEUE (wait, current);init_waitqueue_head (&waitq); -if (copy_from_user (&einfo, argp, -sizeof (struct erase_info_user ))) { -kfree (erase); -return -EFAULT ; +if (cmd ==MEMERASE64 ) { +struct erase_info_user64 einfo64; + +if (copy_from_user (&einfo64, argp, +sizeof (struct erase_info_user64 ))) { +kfree (erase); +return -EFAULT ; + } + erase->addr = einfo64.start; + erase->len = einfo64.length; + }else { +struct erase_info_user einfo32; + +if (copy_from_user (&einfo32, argp, +sizeof (struct erase_info_user ))) { +kfree (erase); +return -EFAULT ; + } + erase->addr = einfo32.start; + erase->len = einfo32.length; } - erase->addr = einfo.start; - erase->len = einfo.length; erase->mtd = mtd; erase->callback = mtdchar_erase_callback; erase->priv = (unsigned long )&waitq;
fs/compat_ioctl.c renamed from fs/compat_ioctl.c~mtd-add-memerase64-ioctl-for-4gib-devices +1 -0
@@ -2441,6 +2441,7 @@ COMPATIBLE_IOCTL(MEMGETREGIONCOUNT) COMPATIBLE_IOCTL(MEMGETREGIONINFO) COMPATIBLE_IOCTL(MEMGETBADBLOCK) COMPATIBLE_IOCTL(MEMSETBADBLOCK) +COMPATIBLE_IOCTL(MEMERASE64) /* NBD */ ULONG_IOCTL(NBD_SET_SOCK) ULONG_IOCTL(NBD_SET_BLKSIZE)
include/mtd/mtd-abi.h renamed from include/mtd/mtd-abi.h~mtd-add-memerase64-ioctl-for-4gib-devices +6 -0
@@ -12,6 +12,11 @@ struct erase_info_user {__u32 length; }; +struct erase_info_user64 { +__u64 start; +__u64 length; +}; +struct mtd_oob_buf {__u32 start;__u32 length;
@@ -95,6 +100,7 @@ struct otp_info {#define ECCGETLAYOUT _IOR('M', 17, struct nand_ecclayout)#define ECCGETSTATS _IOR('M', 18, struct mtd_ecc_stats)#define MTDFILEMODE _IO('M', 19) +#define MEMERASE64 _IOW('M', 20, struct erase_info_user64)/* * Obsolete legacy interface. Keep it in order not to break userspace
_