openwrt/target/linux/generic/pending-5.15/920-mangle_bootargs.patch
John Audia 67d998e25d
kernel: bump 5.15 to 5.15.145
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.145

No patches needed a rebase.

 23.05 backport:

    Rebased patch mediatek/100-dts-update-mt7622-rfb1.patch due to
    changes introduced in commit e37aa926447f ("arm64: dts: mediatek:
    mt7622: fix memory node warning check") in version v5.15.143 and we
    jumped over from v5.15.139 directly to v5.15.145.

Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3

 23.05 backport:

  Stijn:
   Compile-tested: ath79/generic, ipq40xx/generic, mvebu/cortexa72, ramips/mt{7621,7620,76x8}, realtek/rtl{838x,930x}, 86/64.
   Run-tested: cortexa72 (RB5009UG+S+IN), mt7621 (EAP615-Wall v1), rtl838x (GS1900-10HP, GS1900-8HP, GS108T v3).

  Petr:
   Compile-tested: ipq807x, mvebu/cortexa9
   Run-tested: turris-omnia, prpl-haze

Tested-by: Stijn Segers <foss@volatilesystems.org> [23.05 testing]
Signed-off-by: John Audia <therealgraysky@proton.me>
Signed-off-by: Petr Štetiar <ynezz@true.cz> [23.05 refresh]
(cherry picked from commit 8de4cc77a6)
2024-01-07 12:57:30 +00:00

72 lines
1.9 KiB
Diff

From: Imre Kaloz <kaloz@openwrt.org>
Subject: init: add CONFIG_MANGLE_BOOTARGS and disable it by default
Enabling this option renames the bootloader supplied root=
and rootfstype= variables, which might have to be know but
would break the automatisms OpenWrt uses.
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
---
init/Kconfig | 9 +++++++++
init/main.c | 24 ++++++++++++++++++++++++
2 files changed, 33 insertions(+)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1814,6 +1814,15 @@ config EMBEDDED
an embedded system so certain expert options are available
for configuration.
+config MANGLE_BOOTARGS
+ bool "Rename offending bootargs"
+ depends on EXPERT
+ help
+ Sometimes the bootloader passed bogus root= and rootfstype=
+ parameters to the kernel, and while you want to ignore them,
+ you need to know the values f.e. to support dual firmware
+ layouts on the flash.
+
config HAVE_PERF_EVENTS
bool
help
--- a/init/main.c
+++ b/init/main.c
@@ -618,6 +618,29 @@ static inline void setup_nr_cpu_ids(void
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
#endif
+#ifdef CONFIG_MANGLE_BOOTARGS
+static void __init mangle_bootargs(char *command_line)
+{
+ char *rootdev;
+ char *rootfs;
+
+ rootdev = strstr(command_line, "root=/dev/mtdblock");
+
+ if (rootdev)
+ strncpy(rootdev, "mangled_rootblock=", 18);
+
+ rootfs = strstr(command_line, "rootfstype");
+
+ if (rootfs)
+ strncpy(rootfs, "mangled_fs", 10);
+
+}
+#else
+static void __init mangle_bootargs(char *command_line)
+{
+}
+#endif
+
/*
* We need to store the untouched command line for future reference.
* We also need to store the touched command line since the parameter
@@ -957,6 +980,7 @@ asmlinkage __visible void __init __no_sa
pr_notice("%s", linux_banner);
early_security_init();
setup_arch(&command_line);
+ mangle_bootargs(command_line);
setup_boot_config();
setup_command_line(command_line);
setup_nr_cpu_ids();