Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932746Ab2HPOwo (ORCPT ); Thu, 16 Aug 2012 10:52:44 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:54146 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932706Ab2HPOwl (ORCPT ); Thu, 16 Aug 2012 10:52:41 -0400 From: Richard Genoud To: Artem Bityutskiy Cc: linux-mtd@lists.infradead.org, Shmulik Ladkani , David Woodhouse , linux-kernel@vger.kernel.org, Richard Genoud Subject: [PATCH 2/2] UBI: add ioctl for max_beb_per1024 Date: Thu, 16 Aug 2012 16:52:03 +0200 Message-Id: <1345128723-13582-3-git-send-email-richard.genoud@gmail.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1345042639.3393.150.camel@sauron.fi.intel.com> References: <1345042639.3393.150.camel@sauron.fi.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3470 Lines: 97 This patch provides the possibility to adjust the "maximum expected number of bad blocks per 1024 blocks" (max_beb_per1024) for each mtd device from UBI_IOCATT ioctl. The majority of NAND devices have their max_beb_per1024 equal to 20, but sometimes it's more. We already could adjust that via a kernel parameter, now we can also use UBI_IOCATT ioctl: struct ubi_attach_req { __s32 ubi_num; __s32 mtd_num; __s32 vid_hdr_offset; __u8 max_beb_per1024; __s8 padding[11]; }; Signed-off-by: Richard Genoud --- drivers/mtd/ubi/cdev.c | 9 ++++++++- include/mtd/ubi-user.h | 19 ++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c index e0027e7..d268b42 100644 --- a/drivers/mtd/ubi/cdev.c +++ b/drivers/mtd/ubi/cdev.c @@ -1006,12 +1006,19 @@ static long ctrl_cdev_ioctl(struct file *file, unsigned int cmd, } /* + * For compatibility with older user-space tools, + * a zero value should be treated like a default value + */ + if (!req.max_beb_per1024) + req.max_beb_per1024 = MTD_UBI_DEFAULT_BEB_LIMIT; + + /* * Note, further request verification is done by * 'ubi_attach_mtd_dev()'. */ mutex_lock(&ubi_devices_mutex); err = ubi_attach_mtd_dev(mtd, req.ubi_num, req.vid_hdr_offset, - MTD_UBI_DEFAULT_BEB_LIMIT); + req.max_beb_per1024); mutex_unlock(&ubi_devices_mutex); if (err < 0) put_mtd_device(mtd); diff --git a/include/mtd/ubi-user.h b/include/mtd/ubi-user.h index 8787349..77cd0d1 100644 --- a/include/mtd/ubi-user.h +++ b/include/mtd/ubi-user.h @@ -222,6 +222,7 @@ enum { * @ubi_num: UBI device number to create * @mtd_num: MTD device number to attach * @vid_hdr_offset: VID header offset (use defaults if %0) + * @max_beb_per1024: Maximum expected bad eraseblocks per 1024 eraseblocks * @padding: reserved for future, not used, has to be zeroed * * This data structure is used to specify MTD device UBI has to attach and the @@ -245,12 +246,28 @@ enum { * be 2KiB-64 bytes = 1984. Note, that this position is not even 512-bytes * aligned, which is OK, as UBI is clever enough to realize this is 4th * sub-page of the first page and add needed padding. + * + * The @max_beb_per1024 is the maximum bad eraseblocks UBI expects on the ubi + * device per 1024 eraseblocks. + * This value is often given in an other form in the NAND datasheet (min NVB + * i.e. minimal number of valid blocks). The maximum expected bad eraseblocks + * per 1024 is then: + * 1024 * (1 - MinNVB / MaxNVB) + * Which gives 20 for most NAND devices. + * This limit is used in order to derive amount of eraseblock UBI reserves for + * handling new bad blocks. + * If the device has more bad eraseblocks than this limit, UBI does not reserve + * any physical eraseblocks for new bad eraseblocks, but attempts to use + * available eraseblocks (if any). + * The accepted range is 0-255. If 0 is given, the default value + * MTD_UBI_DEFAULT_BEB_LIMIT will be used for compatibility. */ struct ubi_attach_req { __s32 ubi_num; __s32 mtd_num; __s32 vid_hdr_offset; - __s8 padding[12]; + __u8 max_beb_per1024; + __s8 padding[11]; }; /** -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/