Since commit fa2d0aa96941 ("mmc: core: Allow setting slot index via
device tree alias") the linux kernel supports stable mmc device names.
Barebox has stable names since years so now we can connect both which
allows us to pass 'root=mmcblkXpN' as argument for the cmdline. Note: it
is crucial that the kernel device tree and the barebox device tree uses
the same mmc aliases.
This patch adds the support to store the above cmdline as linux_rootarg
if enabled. The partuuid is now used as fallback since it is not as
unique as the mmcblkXpN scheme. It is added as build option since the
system integrator needs to check if the used kernel contains the above
commit.
Signed-off-by: Marco Felsch <m.felsch@xxxxxxxxxxxxxx>
---
v3:
- fix Kconfig spelling
- check if cdev has an master (cdev->master) before accessing it.
v2:
- improved Kconfig deps
- improved Kconfig help message
- minimal get_linux_mmcblkdev() simplifications
common/Kconfig | 21 +++++++++++++++++++++
fs/fs.c | 43 +++++++++++++++++++++++++++++++++++++++----
2 files changed, 60 insertions(+), 4 deletions(-)
diff --git a/common/Kconfig b/common/Kconfig
index 6b3c1701be..db7cc6713a 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -700,6 +700,27 @@ config FLEXIBLE_BOOTARGS
to replace parts of the bootargs string without reconstructing it
completely.
+config MMCBLKDEV_ROOTARG
+ bool
+ prompt "Support 'root=mmcblkXpN' cmdline appending"
+ depends on FLEXIBLE_BOOTARGS
+ depends on MCI
+ depends on OFTREE
+ help
+ Enable this option to append 'root=mmcblkXpN' to the cmdline instead
+ of 'root=PARTUUID=XYZ'. Don't enable this option if your used linux
+ kernel doesn't contain commit [1]. The first linux kernel release
+ containing that commit is v5.10-rc1.
+
+ The appending only happen if barebox 'linux.bootargs.bootm.appendroot'
+ variable is set or the used blspec entry contains 'linux-appendroot'.
+
+ Note: It is crucial that the kernel device tree and the barebox device
+ tree uses the same mmc aliases.
+
+ [1] fa2d0aa96941 ("mmc: core: Allow setting slot index via device tree
+ alias")
+
config BAREBOX_UPDATE
bool "In-system barebox update infrastructure"
diff --git a/fs/fs.c b/fs/fs.c
index 881dc2fca0..6d952a18b1 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -2831,6 +2831,33 @@ out:
}
EXPORT_SYMBOL(chdir);
+static char *get_linux_mmcblkdev(struct fs_device_d *fsdev)
+{
+ struct cdev *cdevm, *cdev;
+ int id, partnum;
+
+ cdevm = fsdev->cdev->master;
+ id = of_alias_get_id(cdevm->device_node, "mmc");
+ if (id < 0)
+ return NULL;
+
+ partnum = 1; /* linux partitions are 1 based */
+ list_for_each_entry(cdev, &cdevm->partitions, partition_entry) {
+
+ /*
+ * Partname is not guaranteed but this partition cdev is listed
+ * in the partitions list so we need to count it instead of
+ * skipping it.
+ */
+ if (cdev->partname &&
+ !strcmp(cdev->partname, fsdev->cdev->partname))
+ return basprintf("root=/dev/mmcblk%dp%d", id, partnum);
+ partnum++;
+ }
+
+ return NULL;
+}
+
/*
* Mount a device to a directory.
* We do this by registering a new device on which the filesystem
@@ -2919,11 +2946,19 @@ int mount(const char *device, const char *fsname, const char *pathname,
fsdev->vfsmount.mnt_root = fsdev->sb.s_root;
- if (!fsdev->linux_rootarg && fsdev->cdev && fsdev->cdev->partuuid[0] != 0) {
- char *str = basprintf("root=PARTUUID=%s",
- fsdev->cdev->partuuid);
+ if (!fsdev->linux_rootarg && fsdev->cdev) {
+ char *str = NULL;
+
+ if (IS_ENABLED(CONFIG_MMCBLKDEV_ROOTARG) &&
+ fsdev->cdev->master &&
+ cdev_is_mci_main_part_dev(fsdev->cdev->master))
+ str = get_linux_mmcblkdev(fsdev);
+
+ if (!str && fsdev->cdev->partuuid[0] != 0)
+ str = basprintf("root=PARTUUID=%s", fsdev->cdev->partuuid);
- fsdev_set_linux_rootarg(fsdev, str);
+ if (str)
+ fsdev_set_linux_rootarg(fsdev, str);
}
path_put(&path);
--
2.29.2
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
