mtd: fix cmdlinepart parser, early naming for auto-filled MTD (472b444e) · Commits · 戴 / test

Commit ("mtd: core: set some defaults when dev.parent is set") attempted to provide some default settings for MTDs that (a) assign the parent device and (b) don't provide their own name or owner However, this isn't a perfect drop-in replacement for the boilerplate found in some drivers, because the MTD name is used by partition parsers like cmdlinepart, but the name isn't set until add_mtd_device(), after the parsing is completed. This means cmdlinepart sees a NULL name and therefore will not work properly. Fix this by moving the default name and owner assignment to be first in the MTD registration process. [Note: this does not fix all reported issues, particularly with NAND drivers. Will require an additional fix for drivers/mtd/nand/] Fixes: ("mtd: core: set some defaults when dev.parent is set") Reported-by:

Heiko Schocher <hs@denx.de> Signed-off-by:

Brian Norris <computersforpeace@gmail.com> Cc: Heiko Schocher <hs@denx.de> Cc: Frans Klaver <fransklaver@gmail.com>

drivers/mtd/mtdcore.c

+17 −9

Original line number	Diff line number	Diff line
		@@ -426,15 +426,6 @@ int add_mtd_device(struct mtd_info *mtd)
		mtd->erasesize_mask = (1 << mtd->erasesize_shift) - 1;
		mtd->writesize_mask = (1 << mtd->writesize_shift) - 1;

		if (mtd->dev.parent) {
		if (!mtd->owner && mtd->dev.parent->driver)
		mtd->owner = mtd->dev.parent->driver->owner;
		if (!mtd->name)
		mtd->name = dev_name(mtd->dev.parent);
		} else {
		pr_debug("mtd device won't show a device symlink in sysfs\n");
		}

		/* Some chips always power up locked. Unlock them now */
		if ((mtd->flags & MTD_WRITEABLE) && (mtd->flags & MTD_POWERUP_LOCK)) {
		error = mtd_unlock(mtd, 0, mtd->size);
		@@ -549,6 +540,21 @@ static int mtd_add_device_partitions(struct mtd_info *mtd,
		return 0;
		}

		/*
		* Set a few defaults based on the parent devices, if not provided by the
		* driver
		*/
		static void mtd_set_dev_defaults(struct mtd_info *mtd)
		{
		if (mtd->dev.parent) {
		if (!mtd->owner && mtd->dev.parent->driver)
		mtd->owner = mtd->dev.parent->driver->owner;
		if (!mtd->name)
		mtd->name = dev_name(mtd->dev.parent);
		} else {
		pr_debug("mtd device won't show a device symlink in sysfs\n");
		}
		}

		/**
		* mtd_device_parse_register - parse partitions and register an MTD device.
		@@ -587,6 +593,8 @@ int mtd_device_parse_register(struct mtd_info mtd, const char const *types,
		int ret;
		struct mtd_partition *real_parts = NULL;

		mtd_set_dev_defaults(mtd);

		ret = parse_mtd_partitions(mtd, types, &real_parts, parser_data);
		if (ret <= 0 && nr_parts && parts) {
		real_parts = kmemdup(parts, sizeof(parts) nr_parts,

Admin message