{"id":1461756,"url":"http://patchwork.ozlabs.org/api/patches/1461756/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/76542a49b685ddb41894fd53feb250fcec731b01.1617375802.git.christophe.leroy@csgroup.eu/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/","list_archive_url":"https://lore.kernel.org/linuxppc-dev/","list_archive_url_format":"https://lore.kernel.org/linuxppc-dev/{}/","commit_url_format":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"},"msgid":"<76542a49b685ddb41894fd53feb250fcec731b01.1617375802.git.christophe.leroy@csgroup.eu>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/76542a49b685ddb41894fd53feb250fcec731b01.1617375802.git.christophe.leroy@csgroup.eu/","date":"2021-04-02T15:18:04","name":"[v4,03/20] x86/efi: Replace CONFIG_CMDLINE_OVERRIDE by CONFIG_CMDLINE_FORCE","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"2b2d123cb8ac948f39b55c03c998b6dd2c3129ec","submitter":{"id":79086,"url":"http://patchwork.ozlabs.org/api/people/79086/?format=json","name":"Christophe Leroy","email":"christophe.leroy@csgroup.eu"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/76542a49b685ddb41894fd53feb250fcec731b01.1617375802.git.christophe.leroy@csgroup.eu/mbox/","series":[{"id":237158,"url":"http://patchwork.ozlabs.org/api/series/237158/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=237158","date":"2021-04-02T15:18:03","name":"Implement GENERIC_CMDLINE","version":4,"mbox":"http://patchwork.ozlabs.org/series/237158/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1461756/comments/","check":"success","checks":"http://patchwork.ozlabs.org/api/patches/1461756/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n ","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Authentication-Results":["ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=112.213.38.117; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org;\n receiver=)","lists.ozlabs.org; spf=pass (sender SPF authorized)\n smtp.mailfrom=csgroup.eu (client-ip=93.17.236.30; helo=pegase1.c-s.fr;\n envelope-from=christophe.leroy@csgroup.eu; receiver=)"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (4096 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 4FBkGy0yl7z9sRf\n\tfor ; Sat, 3 Apr 2021 02:19:06 +1100 (AEDT)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4FBkGx73CCz3cNY\n\tfor ; Sat, 3 Apr 2021 02:19:05 +1100 (AEDT)","from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by lists.ozlabs.org (Postfix) with ESMTPS id 4FBkFv011Qz3brL\n for ; Sat, 3 Apr 2021 02:18:08 +1100 (AEDT)","from localhost (mailhub1-int [192.168.12.234])\n by localhost (Postfix) with ESMTP id 4FBkFl3Jq5z9v2m1;\n Fri, 2 Apr 2021 17:18:03 +0200 (CEST)","from pegase1.c-s.fr ([192.168.12.234])\n by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024)\n with ESMTP id otY6ACZI1rY1; Fri, 2 Apr 2021 17:18:03 +0200 (CEST)","from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192])\n by pegase1.c-s.fr (Postfix) with ESMTP id 4FBkFl2Mpwz9v2ls;\n Fri, 2 Apr 2021 17:18:03 +0200 (CEST)","from localhost (localhost [127.0.0.1])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id 33C168BB7B;\n Fri, 2 Apr 2021 17:18:05 +0200 (CEST)","from messagerie.si.c-s.fr ([127.0.0.1])\n by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023)\n with ESMTP id j0ftI9D6qL0u; Fri, 2 Apr 2021 17:18:05 +0200 (CEST)","from po16121vm.idsi0.si.c-s.fr (unknown [192.168.4.90])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id A27078BB79;\n Fri, 2 Apr 2021 17:18:04 +0200 (CEST)","by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0)\n id 7ECCA67989; Fri, 2 Apr 2021 15:18:04 +0000 (UTC)"],"X-Virus-Scanned":["Debian amavisd-new at c-s.fr","amavisd-new at c-s.fr"],"Message-Id":"\n <76542a49b685ddb41894fd53feb250fcec731b01.1617375802.git.christophe.leroy@csgroup.eu>","In-Reply-To":"","References":"","From":"Christophe Leroy ","Subject":"[PATCH v4 03/20] x86/efi: Replace CONFIG_CMDLINE_OVERRIDE by\n CONFIG_CMDLINE_FORCE","To":"will@kernel.org, danielwa@cisco.com, robh@kernel.org,\n daniel@gimpelevich.san-francisco.ca.us, arnd@kernel.org,\n akpm@linux-foundation.org","Date":"Fri, 2 Apr 2021 15:18:04 +0000 (UTC)","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Cc":"linux-arch@vger.kernel.org, devicetree@vger.kernel.org,\n microblaze , linux-xtensa@linux-xtensa.org,\n linux-sh@vger.kernel.org, linux-hexagon@vger.kernel.org, x86@kernel.org,\n linux-kernel@vger.kernel.org, nios2 ,\n linux-mips@vger.kernel.org, linux-mm@kvack.org,\n openrisc@lists.librecores.org,\n sparclinux@vger.kernel.org, linux-riscv@lists.infradead.org,\n linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n "},"content":"During boot, x86 uses EFI driver. That driver is also used\nby ARM.\n\nIn order to refactor the command line processing in that driver\nin a following patch, rename CONFIG_CMDLINE_OVERRIDE by\nCONFIG_CMDLINE_FORCE on the x86 in order to be similar\nto ARM (and most other architectures).\n\nSigned-off-by: Christophe Leroy \n---\nv4: New\n---\n arch/x86/Kconfig | 4 ++--\n arch/x86/kernel/setup.c | 2 +-\n drivers/firmware/efi/libstub/x86-stub.c | 2 +-\n 3 files changed, 4 insertions(+), 4 deletions(-)","diff":"diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig\nindex 2792879d398e..a20684d56b4b 100644\n--- a/arch/x86/Kconfig\n+++ b/arch/x86/Kconfig\n@@ -2384,14 +2384,14 @@ config CMDLINE\n \t command line at boot time, it is appended to this string to\n \t form the full kernel command line, when the system boots.\n \n-\t However, you can use the CONFIG_CMDLINE_OVERRIDE option to\n+\t However, you can use the CONFIG_CMDLINE_FORCE option to\n \t change this behavior.\n \n \t In most cases, the command line (whether built-in or provided\n \t by the boot loader) should specify the device for the root\n \t file system.\n \n-config CMDLINE_OVERRIDE\n+config CMDLINE_FORCE\n \tbool \"Built-in command line overrides boot loader arguments\"\n \tdepends on CMDLINE_BOOL && CMDLINE != \"\"\n \thelp\ndiff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c\nindex d883176ef2ce..6f2de58eeb54 100644\n--- a/arch/x86/kernel/setup.c\n+++ b/arch/x86/kernel/setup.c\n@@ -884,7 +884,7 @@ void __init setup_arch(char **cmdline_p)\n \tbss_resource.end = __pa_symbol(__bss_stop)-1;\n \n #ifdef CONFIG_CMDLINE_BOOL\n-#ifdef CONFIG_CMDLINE_OVERRIDE\n+#ifdef CONFIG_CMDLINE_FORCE\n \tstrlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);\n #else\n \tif (builtin_cmdline[0]) {\ndiff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c\nindex f14c4ff5839f..28659276b6ba 100644\n--- a/drivers/firmware/efi/libstub/x86-stub.c\n+++ b/drivers/firmware/efi/libstub/x86-stub.c\n@@ -742,7 +742,7 @@ unsigned long efi_main(efi_handle_t handle,\n \t\tgoto fail;\n \t}\n #endif\n-\tif (!IS_ENABLED(CONFIG_CMDLINE_OVERRIDE)) {\n+\tif (!IS_ENABLED(CONFIG_CMDLINE_FORCE)) {\n \t\tunsigned long cmdline_paddr = ((u64)hdr->cmd_line_ptr |\n \t\t\t\t\t ((u64)boot_params->ext_cmd_line_ptr << 32));\n \t\tstatus = efi_parse_options((char *)cmdline_paddr);\n","prefixes":["v4","03/20"]}