mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
089c25f466
Fix ubiblock_create_from_param() ubiblock_create_auto_rootfs section mismatch. Without this, the system upgrade will not work if the kernel was compiled with clang-18. WARNING: modpost: vmlinux: section mismatch in reference: ubiblock_notify+0x190 (section: .text) -> ubiblock_create_auto_rootfs (section: .init.text) ``` [33342.080771] Call trace: [33342.083205] ubiblock_create_auto_rootfs+0x0/0xd0 [33342.087902] blocking_notifier_call_chain+0xb0/0x1a0 [33342.092857] ubi_volume_notify+0xcc/0xdc [33342.096773] ubi_create_volume+0x520/0x684 [33342.100861] ubi_cdev_ioctl+0x2ac/0x834 [33342.104688] __arm64_sys_ioctl+0x14f0/0x15f4 [33342.108947] invoke_syscall+0x44/0xc8 [33342.112601] do_el0_svc+0x78/0xa8 [33342.115907] el0_svc+0x24/0x50 [33342.118951] el0t_64_sync_handler+0x88/0xf0 [33342.123126] el0t_64_sync+0x150/0x154 [33342.126784] Code: ???????? ???????? ???????? ???????? (????????) ``` Signed-off-by: Romanov Danila <pervokur@gmail.com>
70 lines
1.7 KiB
Diff
70 lines
1.7 KiB
Diff
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
|
|
@@ -642,6 +642,47 @@ static void __init ubiblock_create_from_
|
|
}
|
|
}
|
|
|
|
+#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 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))
|
|
+ desc = ubi_open_volume_nm(ubi_num, "fit", UBI_READONLY);;
|
|
+
|
|
+ if (IS_ERR(desc))
|
|
+ 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;
|
|
@@ -674,6 +715,10 @@ int __init ubiblock_init(void)
|
|
*/
|
|
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.
|