1 From: Daniel Golle <daniel@makrotopia.org>
2 Subject: ubi: auto-attach mtd device named "ubi" or "data" on boot
4 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
6 drivers/mtd/ubi/build.c | 36 ++++++++++++++++++++++++++++++++++++
7 1 file changed, 36 insertions(+)
9 --- a/drivers/mtd/ubi/build.c
10 +++ b/drivers/mtd/ubi/build.c
11 @@ -1226,6 +1226,54 @@ static struct mtd_info * __init open_mtd
16 + * This function tries attaching mtd partitions named either "ubi" or "data"
19 +static void __init ubi_auto_attach(void)
22 + struct mtd_info *mtd;
26 + /* try attaching mtd device named "ubi" or "data" */
27 + mtd = open_mtd_device("ubi");
29 + mtd = open_mtd_device("data");
34 + /* check for a valid ubi magic if read from flash was successful */
35 + err = mtd_read(mtd, 0, 4, &len, (void *) magic);
36 + if (!err && len == 4 && strncmp(magic, "UBI#", 4)) {
37 + pr_err("UBI error: no valid UBI magic found inside mtd%d\n", mtd->index);
41 + /* don't auto-add media types where UBI doesn't makes sense */
42 + if (mtd->type != MTD_NANDFLASH &&
43 + mtd->type != MTD_NORFLASH &&
44 + mtd->type != MTD_DATAFLASH &&
45 + mtd->type != MTD_MLCNANDFLASH)
48 + mutex_lock(&ubi_devices_mutex);
49 + pr_notice("UBI: auto-attach mtd%d\n", mtd->index);
50 + err = ubi_attach_mtd_dev(mtd, UBI_DEV_NUM_AUTO, 0, 0);
51 + mutex_unlock(&ubi_devices_mutex);
53 + pr_err("UBI error: cannot attach mtd%d\n", mtd->index);
60 + put_mtd_device(mtd);
63 static int __init ubi_init(void)
66 @@ -1309,6 +1357,12 @@ static int __init ubi_init(void)
70 + /* auto-attach mtd devices only if built-in to the kernel and no ubi.mtd
71 + * parameter was given */
72 + if (IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
73 + !ubi_is_module() && !mtd_devs)
76 err = ubiblock_init();
78 pr_err("UBI error: block: cannot initialize, error %d", err);