[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <tencent_1873443BEECF45E0336D4C4F8C35C19FEB06@qq.com>
Date: Fri, 28 Mar 2025 10:22:34 +0000
From: Yeking@...54.com
To: linux-arm-kernel@...ts.infradead.org
Cc: 谢致邦 (XIE Zhibang) <Yeking@...54.com>,
Catalin Marinas <catalin.marinas@....com>,
Will Deacon <will@...nel.org>,
Marc Zyngier <maz@...nel.org>,
Oliver Upton <oliver.upton@...ux.dev>,
Mark Brown <broonie@...nel.org>,
Andrea della Porta <andrea.porta@...e.com>,
Ard Biesheuvel <ardb@...nel.org>,
linux-kernel@...r.kernel.org
Subject: [PATCH] ARM64: Add back and fix support for CMDLINE_EXTEND
From: 谢致邦 (XIE Zhibang) <Yeking@...54.com>
After commit e6384c398459 ("efi/libstub: Parse builtin command line
after bootloader provided one"), the behavior of EFI has been consistent
with FDT.
So add back and fix support for CMDLINE_EXTEND.
Fixes: cae118b6acc3 ("arm64: Drop support for CMDLINE_EXTEND")
Signed-off-by: 谢致邦 (XIE Zhibang) <Yeking@...54.com>
---
arch/arm64/Kconfig | 6 ++++++
arch/arm64/kernel/pi/idreg-override.c | 8 +++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index a182295e6f08..736280eb0251 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -2427,6 +2427,12 @@ config CMDLINE_FROM_BOOTLOADER
the boot loader doesn't provide any, the default kernel command
string provided in CMDLINE will be used.
+config CMDLINE_EXTEND
+ bool "Extend bootloader kernel arguments"
+ help
+ The default kernel command string will be appended to the
+ command-line arguments provided by the boot loader.
+
config CMDLINE_FORCE
bool "Always use the default kernel command string"
help
diff --git a/arch/arm64/kernel/pi/idreg-override.c b/arch/arm64/kernel/pi/idreg-override.c
index c6b185b885f7..cff403477ff5 100644
--- a/arch/arm64/kernel/pi/idreg-override.c
+++ b/arch/arm64/kernel/pi/idreg-override.c
@@ -382,11 +382,13 @@ static __init void parse_cmdline(const void *fdt, int chosen)
static char const cmdline[] __initconst = CONFIG_CMDLINE;
const u8 *prop = get_bootargs_cmdline(fdt, chosen);
- if (IS_ENABLED(CONFIG_CMDLINE_FORCE) || !prop)
- __parse_cmdline(cmdline, true);
-
if (!IS_ENABLED(CONFIG_CMDLINE_FORCE) && prop)
__parse_cmdline(prop, true);
+
+ if (IS_ENABLED(CONFIG_CMDLINE_EXTEND) ||
+ IS_ENABLED(CONFIG_CMDLINE_FORCE) ||
+ !prop)
+ __parse_cmdline(cmdline, true);
}
void __init init_feature_override(u64 boot_status, const void *fdt,
--
2.43.0
Powered by blists - more mailing lists