From patchwork Tue Jun 7 15:52:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 99277 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CB1A0B6F99 for ; Wed, 8 Jun 2011 01:52:37 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QTyZd-0006rq-Ls; Tue, 07 Jun 2011 15:52:09 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QTyZd-0005qR-9B; Tue, 07 Jun 2011 15:52:09 +0000 Received: from smtp.gentoo.org ([140.211.166.183]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QTyZa-0005q6-5m for linux-mtd@lists.infradead.org; Tue, 07 Jun 2011 15:52:07 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 8291C6550A for ; Tue, 7 Jun 2011 15:52:03 +0000 (UTC) From: Mike Frysinger To: linux-mtd@lists.infradead.org Subject: [PATCH v3] libmtd: add helper funcs for getting regioninfo and locked info Date: Tue, 7 Jun 2011 11:52:05 -0400 Message-Id: <1307461925-6420-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.7.5.3 In-Reply-To: <1307460482-3745-1-git-send-email-vapier@gentoo.org> References: <1307460482-3745-1-git-send-email-vapier@gentoo.org> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110607_115206_449289_8798CB92 X-CRM114-Status: GOOD ( 17.84 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [140.211.166.183 listed in list.dnswl.org] -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain 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: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This extends the libmtd with the helper functions: mtd_regioninfo: interface to MEMGETREGIONINFO mtd_islocked: interface to MEMISLOCKED Users of these functions will follow shortly ... Signed-off-by: Mike Frysinger --- v3 - add a "islocked_supported" field to handle older kernels nicely include/libmtd.h | 28 ++++++++++++++++++++++++++++ lib/libmtd.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ lib/libmtd_int.h | 1 + 3 files changed, 76 insertions(+), 0 deletions(-) diff --git a/include/libmtd.h b/include/libmtd.h index e30c8a6..2da12c3 100644 --- a/include/libmtd.h +++ b/include/libmtd.h @@ -35,6 +35,9 @@ extern "C" { /* MTD library descriptor */ typedef void * libmtd_t; +/* Forward decls */ +struct region_info_user; + /** * @mtd_dev_cnt: count of MTD devices in system * @lowest_mtd_num: lowest MTD device number in system @@ -174,6 +177,31 @@ int mtd_unlock(const struct mtd_dev_info *mtd, int fd, int eb); int mtd_erase(libmtd_t desc, const struct mtd_dev_info *mtd, int fd, int eb); /** + * mtd_regioninfo - get information about an erase region. + * @fd: MTD device node file descriptor + * @regidx: index of region to look up + * @reginfo: the region information is returned here + * + * This function gets information about an erase region defined by the + * @regidx index and saves this information in the @reginfo object. + * Returns %0 in case of success and %-1 in case of failure. If the + * @regidx is not valid or unavailable, errno is set to @ENODEV. + */ +int mtd_regioninfo(int fd, int regidx, struct region_info_user *reginfo); + +/** + * mtd_is_locked - see if the specified eraseblock is locked. + * @mtd: MTD device description object + * @fd: MTD device node file descriptor + * @eb: eraseblock to check + * + * This function checks to see if eraseblock @eb of MTD device described + * by @fd is locked. Returns %0 if it is unlocked, %1 if it is locked, and + * %-1 in case of failure. + */ +int mtd_is_locked(libmtd_t desc, const struct mtd_dev_info *mtd, int fd, int eb); + +/** * mtd_torture - torture an eraseblock. * @desc: MTD library descriptor * @mtd: MTD device description object diff --git a/lib/libmtd.c b/lib/libmtd.c index a651808..d6094c1 100644 --- a/lib/libmtd.c +++ b/lib/libmtd.c @@ -557,6 +557,7 @@ libmtd_t libmtd_open(void) lib = xzalloc(sizeof(*lib)); lib->offs64_ioctls = OFFS64_IOCTLS_UNKNOWN; + lib->islocked_ioctl = 1; lib->sysfs_mtd = mkpath("/sys", SYSFS_MTD); if (!lib->sysfs_mtd) @@ -883,6 +884,52 @@ int mtd_erase(libmtd_t desc, const struct mtd_dev_info *mtd, int fd, int eb) return 0; } +int mtd_regioninfo(int fd, int regidx, struct region_info_user *reginfo) +{ + int ret; + + if (regidx < 0) { + errno = ENODEV; + return -1; + } + + ret = ioctl(fd, MEMGETREGIONINFO, reginfo); + if (ret < 0) + return sys_errmsg("%s ioctl failed for erase region %d", + "MEMGETREGIONINFO", regidx); + + return 0; +} + +int mtd_is_locked(libmtd_t desc, const struct mtd_dev_info *mtd, int fd, int eb) +{ + int ret; + struct libmtd *lib = (struct libmtd *)desc; + erase_info_t ei; + + if (lib->islocked_ioctl == 0) + return -1; + + ei.start = eb * mtd->eb_size; + ei.length = mtd->eb_size; + + ret = ioctl(fd, MEMISLOCKED, &ei); + if (ret < 0) { + if (errno == ENOTTY) { + /* An old system w/out MEMISLOCKED */ + lib->islocked_ioctl = 0; + return -1; + } else if (errno == EOPNOTSUPP) { + /* MTD doesn't support locking */ + lib->islocked_ioctl = 0; + return -1; + } + return mtd_ioctl_error(mtd, eb, "MEMISLOCKED"); + } + + return ret; +} + /* Patterns to write to a physical eraseblock when torturing it */ static uint8_t patterns[] = {0xa5, 0x5a, 0x0}; diff --git a/lib/libmtd_int.h b/lib/libmtd_int.h index bb48d35..87e7f12 100644 --- a/lib/libmtd_int.h +++ b/lib/libmtd_int.h @@ -91,6 +91,7 @@ struct libmtd char *mtd_region_cnt; char *mtd_flags; unsigned int sysfs_supported:1; + unsigned int islocked_ioctl:1; unsigned int offs64_ioctls:2; };