{"id":1466839,"url":"http://patchwork.ozlabs.org/api/patches/1466839/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210416040924.2882771-7-danielwa@cisco.com/","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":"<20210416040924.2882771-7-danielwa@cisco.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/20210416040924.2882771-7-danielwa@cisco.com/","date":"2021-04-16T04:09:17","name":"[6/8] CMDLINE: x86: convert to generic builtin command line","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"52d7634b0dd8841b8adb0a3faae3de07a60d0afe","submitter":{"id":67374,"url":"http://patchwork.ozlabs.org/api/people/67374/?format=json","name":"Daniel Walker (danielwa)","email":"danielwa@cisco.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210416040924.2882771-7-danielwa@cisco.com/mbox/","series":[{"id":239425,"url":"http://patchwork.ozlabs.org/api/series/239425/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=239425","date":"2021-04-16T04:09:11","name":"generic command line v4","version":1,"mbox":"http://patchwork.ozlabs.org/series/239425/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1466839/comments/","check":"success","checks":"http://patchwork.ozlabs.org/api/patches/1466839/checks/","tags":{},"related":[{"id":1449488,"url":"http://patchwork.ozlabs.org/api/patches/1449488/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210309000247.2989531-8-danielwa@cisco.com/","msgid":"<20210309000247.2989531-8-danielwa@cisco.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/20210309000247.2989531-8-danielwa@cisco.com/","date":"2021-03-09T00:02:43","name":"[v2,7/7] CMDLINE: x86: convert to generic builtin command line","mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210309000247.2989531-8-danielwa@cisco.com/mbox/"},{"id":1460188,"url":"http://patchwork.ozlabs.org/api/patches/1460188/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/19776ce76932e1957faa21250f303481db39fb32.1617126961.git.danielwa@cisco.com/","msgid":"<19776ce76932e1957faa21250f303481db39fb32.1617126961.git.danielwa@cisco.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/19776ce76932e1957faa21250f303481db39fb32.1617126961.git.danielwa@cisco.com/","date":"2021-03-30T17:57:02","name":"[7/8] CMDLINE: x86: convert to generic builtin command line","mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/19776ce76932e1957faa21250f303481db39fb32.1617126961.git.danielwa@cisco.com/mbox/"}],"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=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n unprotected) header.d=cisco.com header.i=@cisco.com header.a=rsa-sha256\n header.s=iport header.b=irFQFaXK;\n\tdkim-atps=neutral","lists.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n unprotected) header.d=cisco.com header.i=@cisco.com header.a=rsa-sha256\n header.s=iport header.b=irFQFaXK;\n\tdkim-atps=neutral","lists.ozlabs.org; spf=pass (sender SPF authorized)\n smtp.mailfrom=cisco.com (client-ip=173.37.86.72; helo=rcdn-iport-1.cisco.com;\n envelope-from=danielwa@cisco.com; receiver=)","lists.ozlabs.org; dkim=pass (1024-bit key;\n unprotected) header.d=cisco.com header.i=@cisco.com header.a=rsa-sha256\n header.s=iport header.b=irFQFaXK; dkim-atps=neutral"],"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 4FM2q80WMfz9sVv\n\tfor ; Fri, 16 Apr 2021 14:12:20 +1000 (AEST)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4FM2q76k6Wz3d2L\n\tfor ; Fri, 16 Apr 2021 14:12:19 +1000 (AEST)","from rcdn-iport-1.cisco.com (rcdn-iport-1.cisco.com [173.37.86.72])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n bits)) (No client certificate requested)\n by lists.ozlabs.org (Postfix) with ESMTPS id 4FM2m36c2yz3bq3\n for ; Fri, 16 Apr 2021 14:09:39 +1000 (AEST)","from alln-core-6.cisco.com ([173.36.13.139])\n by rcdn-iport-1.cisco.com with ESMTP/TLS/DHE-RSA-SEED-SHA;\n 16 Apr 2021 04:09:38 +0000","from zorba.cisco.com ([10.24.7.67])\n by alln-core-6.cisco.com (8.15.2/8.15.2) with ESMTP id 13G49OHl016753;\n Fri, 16 Apr 2021 04:09:37 GMT"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple;\n d=cisco.com; i=@cisco.com; l=4126; q=dns/txt; s=iport;\n t=1618546180; x=1619755780;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=PeTW14FxWGoMvyvzYReuQevTCGzCc/Dodslmcogr2V0=;\n b=irFQFaXKS51pYkEdw8IyhmRyZwMOk9h2ceh2EK7oD6SuDZSkTjgMQBLZ\n vQ1YD8mYURwV57oMEq+8XY/9KkUEsGRA3eQAZVJO0woGbaWcgg36lTrq8\n xfsNn9cfQ0rGiArVmFeQRv3Bu/StQtLqq3QNHKxoOcNdIl7HsHDgJqf0s Y=;","IronPort-HdrOrdr":"\n A9a23:Yqph260lbigOnMHLnaSIxgqjBe9yeYIsi2QD101hICF9WMbwrayTtd4c0gL5jytUZWopnsqONLLFbXTX85N05od5B8bHYCDKsHalRbsN0aLM2DvlcheVysd80uNaf7F6GJnMCzFB/KXHyS2ZN/pl/9Wd6qCvgo7lvhJQZCVncbtp4Qs8KgvzKCxLbTJLD5Y4C5aQj/Avz1GdUE8aYcihCn4OU/KrnayoqLvdfRUECxQ7gTPgsRqU7tfBfiSw71M3Ty5IhYwv63HClBb0op++quihxgXHvlWjiKh+qZ/EwttHCNfksKgoAwSprBq0b4J8XLDHmzY5rIiUmS8XueiJhQs8NMJu7H6UREWJmF/G3gnt1ytG0Q6F9WOl","X-IronPort-Anti-Spam-Filtered":"true","X-IronPort-Anti-Spam-Result":"\n A0BMAACIDXlg/4sNJK1aHAEBAQEBAQcBARIBAQQEAQGBfgcBAQsBAYIpgU0BOTGMZ4lOijKQPIF8CwEBAQ80BAEBhFACgXMCJTQJDgIDAQEMAQEFAQEBAgEGBHEThV1DFgGFawYyATgOEFEhNgYBEoJxglYDL6wHgiuBAYdDDWOBRBSBJQGIa3SDdSccgUlChHOCHogbBIJGAXUZAQolAYFUgRuQWYJyimGbUluDFoEmliaFKw8jpHyVGI8HlFuBVDqBWTMaCBsVgyRQGQ6OKxaNawFbIQMvOAIGCgEBAwmJToNAAQE","X-IronPort-AV":"E=Sophos;i=\"5.82,226,1613433600\"; d=\"scan'208\";a=\"876181661\"","From":"Daniel Walker ","To":"Will Deacon ,\n Christophe Leroy ,\n Rob Herring ,\n Daniel Gimpelevich ,\n Andrew Morton , x86@kernel.org,\n linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,\n Thomas Gleixner , Ingo Molnar ,\n Borislav Petkov , \"H. Peter Anvin\" ","Subject":"[PATCH 6/8] CMDLINE: x86: convert to generic builtin command line","Date":"Thu, 15 Apr 2021 21:09:17 -0700","Message-Id":"<20210416040924.2882771-7-danielwa@cisco.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20210416040924.2882771-1-danielwa@cisco.com>","References":"<20210416040924.2882771-1-danielwa@cisco.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Auto-Response-Suppress":"DR, OOF, AutoReply","X-Outbound-SMTP-Client":"10.24.7.67, [10.24.7.67]","X-Outbound-Node":"alln-core-6.cisco.com","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-kernel@vger.kernel.org, Ruslan Ruslichenko ,\n Ruslan Bilovol , xe-linux-external@cisco.com","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n "},"content":"This updates the x86 code to use the CONFIG_GENERIC_CMDLINE\noption.\n\nCc: xe-linux-external@cisco.com\nSigned-off-by: Ruslan Ruslichenko \nSigned-off-by: Ruslan Bilovol \nSigned-off-by: Daniel Walker \n---\n arch/x86/Kconfig | 44 +----------------------------------------\n arch/x86/kernel/setup.c | 18 ++---------------\n 2 files changed, 3 insertions(+), 59 deletions(-)","diff":"diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig\nindex 2792879d398e..73ea9589e50d 100644\n--- a/arch/x86/Kconfig\n+++ b/arch/x86/Kconfig\n@@ -118,6 +118,7 @@ config X86\n \tselect EDAC_SUPPORT\n \tselect GENERIC_CLOCKEVENTS_BROADCAST\tif X86_64 || (X86_32 && X86_LOCAL_APIC)\n \tselect GENERIC_CLOCKEVENTS_MIN_ADJUST\n+\tselect GENERIC_CMDLINE\n \tselect GENERIC_CMOS_UPDATE\n \tselect GENERIC_CPU_AUTOPROBE\n \tselect GENERIC_CPU_VULNERABILITIES\n@@ -2358,49 +2359,6 @@ choice\n \n endchoice\n \n-config CMDLINE_BOOL\n-\tbool \"Built-in kernel command line\"\n-\thelp\n-\t Allow for specifying boot arguments to the kernel at\n-\t build time. On some systems (e.g. embedded ones), it is\n-\t necessary or convenient to provide some or all of the\n-\t kernel boot arguments with the kernel itself (that is,\n-\t to not rely on the boot loader to provide them.)\n-\n-\t To compile command line arguments into the kernel,\n-\t set this option to 'Y', then fill in the\n-\t boot arguments in CONFIG_CMDLINE.\n-\n-\t Systems with fully functional boot loaders (i.e. non-embedded)\n-\t should leave this option set to 'N'.\n-\n-config CMDLINE\n-\tstring \"Built-in kernel command string\"\n-\tdepends on CMDLINE_BOOL\n-\tdefault \"\"\n-\thelp\n-\t Enter arguments here that should be compiled into the kernel\n-\t image and used at boot time. If the boot loader provides a\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 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-\tbool \"Built-in command line overrides boot loader arguments\"\n-\tdepends on CMDLINE_BOOL && CMDLINE != \"\"\n-\thelp\n-\t Set this option to 'Y' to have the kernel ignore the boot loader\n-\t command line, and use ONLY the built-in command line.\n-\n-\t This is used to work around broken boot loaders. This should\n-\t be set to 'N' under normal conditions.\n-\n config MODIFY_LDT_SYSCALL\n \tbool \"Enable the LDT (local descriptor table)\" if EXPERT\n \tdefault y\ndiff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c\nindex 5ecd69a48393..cd2aa33c44d7 100644\n--- a/arch/x86/kernel/setup.c\n+++ b/arch/x86/kernel/setup.c\n@@ -47,6 +47,7 @@\n #include \n #include \n #include \n+#include \n \n /*\n * max_low_pfn_mapped: highest directly mapped pfn < 4 GB\n@@ -161,9 +162,6 @@ unsigned long saved_video_mode;\n #define RAMDISK_LOAD_FLAG\t\t0x4000\n \n static char __initdata command_line[COMMAND_LINE_SIZE];\n-#ifdef CONFIG_CMDLINE_BOOL\n-static char __initdata builtin_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE;\n-#endif\n \n #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)\n struct edd edd;\n@@ -883,19 +881,7 @@ void __init setup_arch(char **cmdline_p)\n \tbss_resource.start = __pa_symbol(__bss_start);\n \tbss_resource.end = __pa_symbol(__bss_stop)-1;\n \n-#ifdef CONFIG_CMDLINE_BOOL\n-#ifdef CONFIG_CMDLINE_OVERRIDE\n-\tstrlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);\n-#else\n-\tif (builtin_cmdline[0]) {\n-\t\t/* append boot loader cmdline to builtin */\n-\t\tstrlcat(builtin_cmdline, \" \", COMMAND_LINE_SIZE);\n-\t\tstrlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE);\n-\t\tstrlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);\n-\t}\n-#endif\n-#endif\n-\n+\tcmdline_add_builtin(boot_command_line);\n \tstrlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);\n \t*cmdline_p = command_line;\n \n","prefixes":["6/8"]}