UBI: allow specifying bad PEBs limit using module parameter (edac493d) · Commits · 戴 / test

drivers/mtd/ubi/Kconfig

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -51,6 +51,8 @@ config MTD_UBI_BEB_LIMIT
	MTD partitions of the same size, UBI will reserve 40 eraseblocks when		MTD partitions of the same size, UBI will reserve 40 eraseblocks when
	attaching a partition.		attaching a partition.

			This option can be overridden by the "mtd=" UBI module parameter.

	Leave the default value if unsure.		Leave the default value if unsure.

	config MTD_UBI_GLUEBI		config MTD_UBI_GLUEBI

drivers/mtd/ubi/build.c

+25 −15

Original line number	Original line	Diff line number	Diff line
	@@ -47,7 +47,7 @@
	#define MTD_PARAM_LEN_MAX 64		#define MTD_PARAM_LEN_MAX 64

	/* Maximum number of comma-separated items in the 'mtd=' parameter */		/* Maximum number of comma-separated items in the 'mtd=' parameter */
	#define MTD_PARAM_MAX_COUNT 2		#define MTD_PARAM_MAX_COUNT 3

	/* Maximum value for the number of bad PEBs per 1024 PEBs */		/* Maximum value for the number of bad PEBs per 1024 PEBs */
	#define MAX_MTD_UBI_BEB_LIMIT 768		#define MAX_MTD_UBI_BEB_LIMIT 768
	@@ -63,10 +63,12 @@
	* @name: MTD character device node path, MTD device name, or MTD device number		* @name: MTD character device node path, MTD device name, or MTD device number
	* string		* string
	* @vid_hdr_offs: VID header offset		* @vid_hdr_offs: VID header offset
			* @max_beb_per1024: maximum expected number of bad PEBs per 1024 PEBs
	*/		*/
	struct mtd_dev_param {		struct mtd_dev_param {
	char name[MTD_PARAM_LEN_MAX];		char name[MTD_PARAM_LEN_MAX];
	int vid_hdr_offs;		int vid_hdr_offs;
			int max_beb_per1024;
	};		};

	/* Numbers of elements set in the @mtd_dev_param array */		/* Numbers of elements set in the @mtd_dev_param array */
	@@ -838,7 +840,7 @@ static int autoresize(struct ubi_device *ubi, int vol_id)
	* @mtd: MTD device description object		* @mtd: MTD device description object
	* @ubi_num: number to assign to the new UBI device		* @ubi_num: number to assign to the new UBI device
	* @vid_hdr_offset: VID header offset		* @vid_hdr_offset: VID header offset
	* @max_beb_per1024: maximum number of expected bad blocks per 1024 PEBs		* @max_beb_per1024: maximum expected number of bad PEB per 1024 PEBs
	*		*
	* This function attaches MTD device @mtd_dev to UBI and assign @ubi_num number		* This function attaches MTD device @mtd_dev to UBI and assign @ubi_num number
	* to the newly created UBI device, unless @ubi_num is %UBI_DEV_NUM_AUTO, in		* to the newly created UBI device, unless @ubi_num is %UBI_DEV_NUM_AUTO, in
	@@ -1218,8 +1220,7 @@ static int __init ubi_init(void)

	mutex_lock(&ubi_devices_mutex);		mutex_lock(&ubi_devices_mutex);
	err = ubi_attach_mtd_dev(mtd, UBI_DEV_NUM_AUTO,		err = ubi_attach_mtd_dev(mtd, UBI_DEV_NUM_AUTO,
	p->vid_hdr_offs,		p->vid_hdr_offs, p->max_beb_per1024);
	CONFIG_MTD_UBI_BEB_LIMIT);
	mutex_unlock(&ubi_devices_mutex);		mutex_unlock(&ubi_devices_mutex);
	if (err < 0) {		if (err < 0) {
	ubi_err("cannot attach mtd%d", mtd->index);		ubi_err("cannot attach mtd%d", mtd->index);
	@@ -1386,23 +1387,32 @@ static int __init ubi_mtd_param_parse(const char val, struct kernel_param kp)
	if (p->vid_hdr_offs < 0)		if (p->vid_hdr_offs < 0)
	return p->vid_hdr_offs;		return p->vid_hdr_offs;

			if (tokens[2]) {
			int err = kstrtoint(tokens[2], 10, &p->max_beb_per1024);

			if (err) {
			printk(KERN_ERR "UBI error: bad value for "
			"max_beb_per1024 parameter: %s", tokens[2]);
			return -EINVAL;
			}
			}

	mtd_devs += 1;		mtd_devs += 1;
	return 0;		return 0;
	}		}

	module_param_call(mtd, ubi_mtd_param_parse, NULL, NULL, 000);		module_param_call(mtd, ubi_mtd_param_parse, NULL, NULL, 000);
	MODULE_PARM_DESC(mtd, "MTD devices to attach. Parameter format: "		MODULE_PARM_DESC(mtd, "MTD devices to attach. Parameter format: mtd=<name\|num\|path>[,<vid_hdr_offs>[,max_beb_per1024]].\n"
	"mtd=<name\|num\|path>[,<vid_hdr_offs>].\n"
	"Multiple \"mtd\" parameters may be specified.\n"		"Multiple \"mtd\" parameters may be specified.\n"
	"MTD devices may be specified by their number, name, or "		"MTD devices may be specified by their number, name, or path to the MTD character device node.\n"
	"path to the MTD character device node.\n"		"Optional \"vid_hdr_offs\" parameter specifies UBI VID header position to be used by UBI. (default value if 0)\n"
	"Optional \"vid_hdr_offs\" parameter specifies UBI VID "		"Optional \"max_beb_per1024\" parameter specifies the maximum expected bad eraseblock per 1024 eraseblocks. (default value ("
	"header position to be used by UBI.\n"		__stringify(CONFIG_MTD_UBI_BEB_LIMIT) ") if 0)\n"
	"Example 1: mtd=/dev/mtd0 - attach MTD device "		"\n"
	"/dev/mtd0.\n"		"Example 1: mtd=/dev/mtd0 - attach MTD device /dev/mtd0.\n"
	"Example 2: mtd=content,1984 mtd=4 - attach MTD device "		"Example 2: mtd=content,1984 mtd=4 - attach MTD device with name \"content\" using VID header offset 1984, and MTD device number 4 with default VID header offset.\n"
	"with name \"content\" using VID header offset 1984, and "		"Example 3: mtd=/dev/mtd1,0,25 - attach MTD device /dev/mtd1 using default VID header offset and reserve 25*nand_size_in_blocks/1024 erase blocks for bad block handling.\n"
	"MTD device number 4 with default VID header offset.");		"\t(e.g. if the NAND chipset has 4096 PEB, 100 will be reserved for this UBI device).");

	MODULE_VERSION(__stringify(UBI_VERSION));		MODULE_VERSION(__stringify(UBI_VERSION));
	MODULE_DESCRIPTION("UBI - Unsorted Block Images");		MODULE_DESCRIPTION("UBI - Unsorted Block Images");

Admin message