2020-02-23 12:20:11 +00:00
|
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
|
|
|
Subject: ubi: auto-create ubiblock device for rootfs
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
|
|
|
---
|
|
|
|
|
drivers/mtd/ubi/block.c | 42 ++++++++++++++++++++++++++++++++++++++++++
|
|
|
|
|
1 file changed, 42 insertions(+)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/mtd/ubi/block.c
|
|
|
|
|
+++ b/drivers/mtd/ubi/block.c
|
image: add support for building FIT image with filesystem
Allow for single (external-data) FIT image to hold kernel, dtb and
squashfs. In that way, the bootloader verifies the system integrity
including the rootfs, because what's the point of checking that the
hash of the kernel is correct if it won't boot in case of squashfs
being corrupted? Better allow bootloader to check everything needed
to make it at least up to failsafe mode. As a positive side effect
this change also makes the sysupgrade process on nand potentially
much easier as it is now.
In short: mkimage has a parameter '-E' which allows generating FIT
images with 'external' data rather than embedding the data into the
device-tree blob itself. In this way, the FIT structure itself remains
small and can be parsed easily (rather than having to page around
megabytes of image content). This patch makes use of that and adds
support for adding sub-images of type 'filesystem' which are used to
store the squashfs. Now U-Boot can verify the whole OS and the new
partition parsers added in the Linux kernel can detect the filesystem
sub-images, create partitions for them, and select the active rootfs
volume based on the configuration in FIT (passing configuration via
device tree could be implemented easily at a later stage).
This new FIT partition parser works for NOR flash (on top of mtdblock),
NAND flash (on top of ubiblock) as well as classic block devices
(ie. eMMC, SDcard, SATA, NVME, ...).
It could even be used to mount such FIT images via `losetup -P` on a
user PC if this patch gets included in Linux upstream one day ;)
Signed-off-by: John Crispin <john@phrozen.org>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-02-15 14:37:17 +00:00
|
|
|
@@ -652,6 +652,47 @@ static void __init ubiblock_create_from_
|
2020-02-23 12:20:11 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+#define UBIFS_NODE_MAGIC 0x06101831
|
|
|
|
|
+static inline int ubi_vol_is_ubifs(struct ubi_volume_desc *desc)
|
|
|
|
|
+{
|
|
|
|
|
+ int ret;
|
|
|
|
|
+ uint32_t magic_of, magic;
|
|
|
|
|
+ ret = ubi_read(desc, 0, (char *)&magic_of, 0, 4);
|
|
|
|
|
+ if (ret)
|
|
|
|
|
+ return 0;
|
|
|
|
|
+ magic = le32_to_cpu(magic_of);
|
|
|
|
|
+ return magic == UBIFS_NODE_MAGIC;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+static void __init ubiblock_create_auto_rootfs(void)
|
|
|
|
|
+{
|
|
|
|
|
+ int ubi_num, ret, is_ubifs;
|
|
|
|
|
+ struct ubi_volume_desc *desc;
|
|
|
|
|
+ struct ubi_volume_info vi;
|
|
|
|
|
+
|
|
|
|
|
+ for (ubi_num = 0; ubi_num < UBI_MAX_DEVICES; ubi_num++) {
|
|
|
|
|
+ desc = ubi_open_volume_nm(ubi_num, "rootfs", UBI_READONLY);
|
|
|
|
|
+ if (IS_ERR(desc))
|
image: add support for building FIT image with filesystem
Allow for single (external-data) FIT image to hold kernel, dtb and
squashfs. In that way, the bootloader verifies the system integrity
including the rootfs, because what's the point of checking that the
hash of the kernel is correct if it won't boot in case of squashfs
being corrupted? Better allow bootloader to check everything needed
to make it at least up to failsafe mode. As a positive side effect
this change also makes the sysupgrade process on nand potentially
much easier as it is now.
In short: mkimage has a parameter '-E' which allows generating FIT
images with 'external' data rather than embedding the data into the
device-tree blob itself. In this way, the FIT structure itself remains
small and can be parsed easily (rather than having to page around
megabytes of image content). This patch makes use of that and adds
support for adding sub-images of type 'filesystem' which are used to
store the squashfs. Now U-Boot can verify the whole OS and the new
partition parsers added in the Linux kernel can detect the filesystem
sub-images, create partitions for them, and select the active rootfs
volume based on the configuration in FIT (passing configuration via
device tree could be implemented easily at a later stage).
This new FIT partition parser works for NOR flash (on top of mtdblock),
NAND flash (on top of ubiblock) as well as classic block devices
(ie. eMMC, SDcard, SATA, NVME, ...).
It could even be used to mount such FIT images via `losetup -P` on a
user PC if this patch gets included in Linux upstream one day ;)
Signed-off-by: John Crispin <john@phrozen.org>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-02-15 14:37:17 +00:00
|
|
|
+ desc = ubi_open_volume_nm(ubi_num, "fit", UBI_READONLY);;
|
|
|
|
|
+
|
|
|
|
|
+ if (IS_ERR(desc))
|
2020-02-23 12:20:11 +00:00
|
|
|
+ continue;
|
|
|
|
|
+
|
|
|
|
|
+ ubi_get_volume_info(desc, &vi);
|
|
|
|
|
+ is_ubifs = ubi_vol_is_ubifs(desc);
|
|
|
|
|
+ ubi_close_volume(desc);
|
|
|
|
|
+ if (is_ubifs)
|
|
|
|
|
+ break;
|
|
|
|
|
+
|
|
|
|
|
+ ret = ubiblock_create(&vi);
|
|
|
|
|
+ if (ret)
|
|
|
|
|
+ pr_err("UBI error: block: can't add '%s' volume, err=%d\n",
|
|
|
|
|
+ vi.name, ret);
|
|
|
|
|
+ /* always break if we get here */
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
static void ubiblock_remove_all(void)
|
|
|
|
|
{
|
|
|
|
|
struct ubiblock *next;
|
2019-11-25 15:08:31 +00:00
|
|
|
@@ -684,6 +722,10 @@ int __init ubiblock_init(void)
|
2020-02-23 12:20:11 +00:00
|
|
|
*/
|
|
|
|
|
ubiblock_create_from_param();
|
|
|
|
|
|
|
|
|
|
+ /* auto-attach "rootfs" volume if existing and non-ubifs */
|
|
|
|
|
+ if (IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV))
|
|
|
|
|
+ ubiblock_create_auto_rootfs();
|
|
|
|
|
+
|
|
|
|
|
/*
|
|
|
|
|
* Block devices are only created upon user requests, so we ignore
|
|
|
|
|
* existing volumes.
|
