1 From: Daniel Golle <daniel@makrotopia.org>
2 Subject: ubi: auto-create ubiblock device for rootfs
4 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
6 drivers/mtd/ubi/block.c | 42 ++++++++++++++++++++++++++++++++++++++++++
7 1 file changed, 42 insertions(+)
9 --- a/drivers/mtd/ubi/block.c
10 +++ b/drivers/mtd/ubi/block.c
11 @@ -644,10 +644,47 @@ match_volume_desc(struct ubi_volume_info
15 +#define UBIFS_NODE_MAGIC 0x06101831
16 +static inline int ubi_vol_is_ubifs(struct ubi_volume_desc *desc)
19 + uint32_t magic_of, magic;
20 + ret = ubi_read(desc, 0, (char *)&magic_of, 0, 4);
23 + magic = le32_to_cpu(magic_of);
24 + return magic == UBIFS_NODE_MAGIC;
27 +static void __init ubiblock_create_auto_rootfs(struct ubi_volume_info *vi)
30 + struct ubi_volume_desc *desc;
32 + if (strcmp(vi->name, "rootfs") &&
33 + strcmp(vi->name, "fit"))
36 + desc = ubi_open_volume(vi->ubi_num, vi->vol_id, UBI_READONLY);
40 + is_ubifs = ubi_vol_is_ubifs(desc);
41 + ubi_close_volume(desc);
45 + ret = ubiblock_create(vi);
47 + pr_err("UBI error: block: can't add '%s' volume, err=%d\n",
52 ubiblock_create_from_param(struct ubi_volume_info *vi)
55 + bool got_param = false;
56 struct ubiblock_param *p;
59 @@ -660,6 +697,7 @@ ubiblock_create_from_param(struct ubi_vo
60 if (!match_volume_desc(vi, p->name, p->ubi_num, p->vol_id))
64 ret = ubiblock_create(vi);
67 @@ -668,6 +706,10 @@ ubiblock_create_from_param(struct ubi_vo
72 + /* auto-attach "rootfs" volume if existing and non-ubifs */
73 + if (!got_param && IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV))
74 + ubiblock_create_auto_rootfs(vi);
77 static int ubiblock_notify(struct notifier_block *nb,