From patchwork Thu Jul 8 00:30:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Cernekee X-Patchwork-Id: 58212 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5692CB6EF2 for ; Thu, 8 Jul 2010 10:43:48 +1000 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1OWfC0-00057O-V8; Thu, 08 Jul 2010 00:42:20 +0000 Received: from [69.28.251.93] (helo=b32.net) by bombadil.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1OWfBx-00056C-Nk for linux-mtd@lists.infradead.org; Thu, 08 Jul 2010 00:42:19 +0000 Received: (qmail 22036 invoked from network); 8 Jul 2010 00:42:14 -0000 Received: from unknown (HELO vps-1001064-677.cp.jvds.com) (127.0.0.1) by 127.0.0.1 with (DHE-RSA-AES128-SHA encrypted) SMTP; 8 Jul 2010 00:42:14 -0000 Received: by vps-1001064-677.cp.jvds.com (sSMTP sendmail emulation); Wed, 07 Jul 2010 17:42:08 -0700 From: Kevin Cernekee Date: Wed, 7 Jul 2010 17:30:13 -0700 Subject: [PATCHv2 4/5] libmtd: add support for 64-bit offsets, OOB Message-Id: In-Reply-To: References: To: , , , User-Agent: vim 7.1 MIME-Version: 1.0 Content-Disposition: inline X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100707_204218_124879_19252EC2 X-CRM114-Status: GOOD ( 23.76 ) X-Spam-Score: 2.5 (++) X-Spam-Report: SpamAssassin version 3.3.1 on bombadil.infradead.org summary: Content analysis details: (2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is freemail (cernekee[at]gmail.com) 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is CUSTOM_MED 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS 1.2 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list Cc: linux-mtd@lists.infradead.org X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Change mtd_erase() so that it attempts to use MEMERASE64 first, then falls back to the old <2.6.31 MEMERASE if MEMERASE64 is unsupported. Add mtd_read_oob(), mtd_write_oob() functions to wrap the OOB ioctls. Similar ioctl fallback logic is used in these functions as well. Signed-off-by: Kevin Cernekee --- include/libmtd.h | 36 ++++++++++++++++++++++- lib/libmtd.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 111 insertions(+), 7 deletions(-) diff --git a/include/libmtd.h b/include/libmtd.h index 0aea966..292d8c3 100644 --- a/include/libmtd.h +++ b/include/libmtd.h @@ -66,6 +66,7 @@ struct mtd_info * @region_cnt: count of additional erase regions * @writable: zero if the device is read-only * @bb_allowed: non-zero if the MTD device may have bad eraseblocks + * @legacy_ioctls: non-zero if the kernel lacks MEMERASE64, MEM*OOB64 */ struct mtd_dev_info { @@ -84,6 +85,7 @@ struct mtd_dev_info int region_cnt; unsigned int writable:1; unsigned int bb_allowed:1; + unsigned int legacy_ioctls:1; }; /** @@ -146,7 +148,37 @@ int mtd_get_dev_info1(libmtd_t desc, int mtd_num, struct mtd_dev_info *mtd); * This function erases eraseblock @eb of MTD device described by @fd. Returns * %0 in case of success and %-1 in case of failure. */ -int mtd_erase(const struct mtd_dev_info *mtd, int fd, int eb); +int mtd_erase(struct mtd_dev_info *mtd, int fd, int eb); + +/** + * mtd_read_oob - read OOB bytes + * @mtd: MTD device description object + * @fd: MTD device node file descriptor + * @start: page-aligned start address + * @length: number of OOB bytes to read + * @data: read buffer + * + * This function reads @length OOB bytes starting from address @start on + * MTD device described by @fd. Returns %0 in case of success and %-1 in + * case of failure. + */ +int mtd_read_oob(struct mtd_dev_info *mtd, int fd, uint64_t start, + uint64_t length, void *data); + +/** + * mtd_write_oob - write OOB bytes + * @mtd: MTD device description object + * @fd: MTD device node file descriptor + * @start: page-aligned start address + * @length: number of OOB bytes to write + * @data: write buffer + * + * This function writes @length OOB bytes starting from address @start on + * MTD device described by @fd. Returns %0 in case of success and %-1 in + * case of failure. + */ +int mtd_write_oob(struct mtd_dev_info *mtd, int fd, uint64_t start, + uint64_t length, void *data); /** * mtd_torture - torture an eraseblock. @@ -157,7 +189,7 @@ int mtd_erase(const struct mtd_dev_info *mtd, int fd, int eb); * This function tortures eraseblock @eb. Returns %0 in case of success and %-1 * in case of failure. */ -int mtd_torture(const struct mtd_dev_info *mtd, int fd, int eb); +int mtd_torture(struct mtd_dev_info *mtd, int fd, int eb); /** * mtd_is_bad - check if eraseblock is bad. diff --git a/lib/libmtd.c b/lib/libmtd.c index 3ff031c..66e794a 100644 --- a/lib/libmtd.c +++ b/lib/libmtd.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include "libmtd_int.h" @@ -789,13 +790,84 @@ int mtd_get_dev_info(libmtd_t desc, const char *node, struct mtd_dev_info *mtd) return mtd_get_dev_info1(desc, mtd_num, mtd); } -int mtd_erase(const struct mtd_dev_info *mtd, int fd, int eb) +int mtd_erase(struct mtd_dev_info *mtd, int fd, int eb) { - struct erase_info_user ei; + int ret; + struct erase_info_user64 ei; - ei.start = eb * mtd->eb_size;; + ei.start = (__u64)eb * mtd->eb_size; ei.length = mtd->eb_size; - return ioctl(fd, MEMERASE, &ei); + + if (!mtd->legacy_ioctls) { + ret = ioctl(fd, MEMERASE64, &ei); + if (ret < 0 && errno == ENOTTY) + mtd->legacy_ioctls = 1; + } + + if (mtd->legacy_ioctls) { + struct erase_info_user ei_old; + + ei_old.start = ei.start; + ei_old.length = ei.length; + + if (ei_old.start != ei.start) { + errno = EOVERFLOW; + return -1; + } + + ret = ioctl(fd, MEMERASE, &ei_old); + } + + return ret; +} + +static int mtd_oob_op(int cmd, int cmd_old, struct mtd_dev_info *mtd, int fd, + uint64_t start, uint64_t length, void *data) +{ + int ret; + struct mtd_oob_buf64 oob; + + oob.start = start; + oob.length = length; + oob.usr_ptr = (__u64)(unsigned long)data; + + if (!mtd->legacy_ioctls) { + ret = ioctl(fd, cmd, &oob); + if (ret < 0 && errno == ENOTTY) + mtd->legacy_ioctls = 1; + } + + if (mtd->legacy_ioctls) { + struct mtd_oob_buf oob_old; + + oob_old.start = oob.start; + oob_old.length = oob.length; + oob_old.ptr = data; + + if (oob_old.start != oob.start || + oob_old.length != oob.length) { + errno = EOVERFLOW; + return -1; + } + + ret = ioctl(fd, cmd_old, &oob_old); + } + + return ret; +} + +int mtd_read_oob(struct mtd_dev_info *mtd, int fd, uint64_t start, + uint64_t length, void *data) +{ + return mtd_oob_op(MEMREADOOB64, MEMREADOOB, mtd, fd, start, length, + data); +} + +int mtd_write_oob(struct mtd_dev_info *mtd, int fd, uint64_t start, + uint64_t length, void *data) +{ + return mtd_oob_op(MEMWRITEOOB64, MEMWRITEOOB, mtd, fd, start, length, + data); } /* Patterns to write to a physical eraseblock when torturing it */ @@ -820,7 +892,7 @@ static int check_pattern(const void *buf, uint8_t patt, int size) return 1; } -int mtd_torture(const struct mtd_dev_info *mtd, int fd, int eb) +int mtd_torture(struct mtd_dev_info *mtd, int fd, int eb) { int err, i, patt_count; void *buf;