{"id":1458794,"url":"http://patchwork.ozlabs.org/api/patches/1458794/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/29e44feb9254a462e23513cc4279dae6af0f2ae6.1616765870.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":"<29e44feb9254a462e23513cc4279dae6af0f2ae6.1616765870.git.christophe.leroy@csgroup.eu>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/29e44feb9254a462e23513cc4279dae6af0f2ae6.1616765870.git.christophe.leroy@csgroup.eu/","date":"2021-03-26T13:44:53","name":"[v3,06/17] arm64: Convert to GENERIC_CMDLINE","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"09d42dffb887b68ad3ebc0cce039eb14b2b81a3f","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/29e44feb9254a462e23513cc4279dae6af0f2ae6.1616765870.git.christophe.leroy@csgroup.eu/mbox/","series":[{"id":236020,"url":"http://patchwork.ozlabs.org/api/series/236020/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=236020","date":"2021-03-26T13:44:49","name":"Implement GENERIC_CMDLINE","version":3,"mbox":"http://patchwork.ozlabs.org/series/236020/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1458794/comments/","check":"warning","checks":"http://patchwork.ozlabs.org/api/patches/1458794/checks/","tags":{},"related":[{"id":1461763,"url":"http://patchwork.ozlabs.org/api/patches/1461763/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/d1a338ad8f382216083166d546bed7acce798674.1617375802.git.christophe.leroy@csgroup.eu/","msgid":"<d1a338ad8f382216083166d546bed7acce798674.1617375802.git.christophe.leroy@csgroup.eu>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/d1a338ad8f382216083166d546bed7acce798674.1617375802.git.christophe.leroy@csgroup.eu/","date":"2021-04-02T15:18:10","name":"[v4,09/20] arm64: Convert to GENERIC_CMDLINE","mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/d1a338ad8f382216083166d546bed7acce798674.1617375802.git.christophe.leroy@csgroup.eu/mbox/"}],"headers":{"Return-Path":"\n <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>","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=<UNKNOWN>)","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=<UNKNOWN>)"],"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 4F6NZ64Gzgz9sWS\n\tfor <patchwork-incoming@ozlabs.org>; Sat, 27 Mar 2021 00:47:10 +1100 (AEDT)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4F6NZ63Xqgz3cn4\n\tfor <patchwork-incoming@ozlabs.org>; Sat, 27 Mar 2021 00:47:10 +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 4F6NWY1gHdz3bsK\n for <linuxppc-dev@lists.ozlabs.org>; Sat, 27 Mar 2021 00:44:57 +1100 (AEDT)","from localhost (mailhub1-int [192.168.12.234])\n by localhost (Postfix) with ESMTP id 4F6NWS60pgz9v03C;\n Fri, 26 Mar 2021 14:44:52 +0100 (CET)","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 ua4xnFB1IzAD; Fri, 26 Mar 2021 14:44:52 +0100 (CET)","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 4F6NWS560hz9v03B;\n Fri, 26 Mar 2021 14:44:52 +0100 (CET)","from localhost (localhost [127.0.0.1])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id 702B98B8CB;\n Fri, 26 Mar 2021 14:44:53 +0100 (CET)","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 nQgQ-Ws-8ZQe; Fri, 26 Mar 2021 14:44:53 +0100 (CET)","from po16121vm.idsi0.si.c-s.fr (unknown [192.168.4.90])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id EC3738B8C7;\n Fri, 26 Mar 2021 14:44:52 +0100 (CET)","by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0)\n id 78A0A67611; Fri, 26 Mar 2021 13:44:53 +0000 (UTC)"],"X-Virus-Scanned":["Debian amavisd-new at c-s.fr","amavisd-new at c-s.fr"],"Message-Id":"\n <29e44feb9254a462e23513cc4279dae6af0f2ae6.1616765870.git.christophe.leroy@csgroup.eu>","In-Reply-To":"<cover.1616765869.git.christophe.leroy@csgroup.eu>","References":"<cover.1616765869.git.christophe.leroy@csgroup.eu>","From":"Christophe Leroy <christophe.leroy@csgroup.eu>","Subject":"[PATCH v3 06/17] arm64: Convert to GENERIC_CMDLINE","To":"will@kernel.org, danielwa@cisco.com, robh@kernel.org,\n daniel@gimpelevich.san-francisco.ca.us","Date":"Fri, 26 Mar 2021 13:44:53 +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 <linuxppc-dev.lists.ozlabs.org>","List-Unsubscribe":"<https://lists.ozlabs.org/options/linuxppc-dev>,\n <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>","List-Archive":"<http://lists.ozlabs.org/pipermail/linuxppc-dev/>","List-Post":"<mailto:linuxppc-dev@lists.ozlabs.org>","List-Help":"<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>","List-Subscribe":"<https://lists.ozlabs.org/listinfo/linuxppc-dev>,\n <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>","Cc":"linux-arch@vger.kernel.org, devicetree@vger.kernel.org,\n microblaze <monstr@monstr.eu>, 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 <ley.foon.tan@intel.com>,\n linux-mips@vger.kernel.org, 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 <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>"},"content":"This converts the architecture to GENERIC_CMDLINE.\n\nSigned-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>\n---\n arch/arm64/Kconfig                 | 33 +-----------------------------\n arch/arm64/kernel/idreg-override.c |  9 ++++----\n 2 files changed, 5 insertions(+), 37 deletions(-)","diff":"diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig\nindex 5656e7aacd69..eeff7730ccf0 100644\n--- a/arch/arm64/Kconfig\n+++ b/arch/arm64/Kconfig\n@@ -105,6 +105,7 @@ config ARM64\n \tselect GENERIC_ALLOCATOR\n \tselect GENERIC_ARCH_TOPOLOGY\n \tselect GENERIC_CLOCKEVENTS_BROADCAST\n+\tselect GENERIC_CMDLINE\n \tselect GENERIC_CPU_AUTOPROBE\n \tselect GENERIC_CPU_VULNERABILITIES\n \tselect GENERIC_EARLY_IOREMAP\n@@ -1831,38 +1832,6 @@ config ARM64_ACPI_PARKING_PROTOCOL\n \t  protocol even if the corresponding data is present in the ACPI\n \t  MADT table.\n \n-config CMDLINE\n-\tstring \"Default kernel command string\"\n-\tdefault \"\"\n-\thelp\n-\t  Provide a set of default command-line options at build time by\n-\t  entering them here. As a minimum, you should specify the the\n-\t  root device (e.g. root=/dev/nfs).\n-\n-choice\n-\tprompt \"Kernel command line type\" if CMDLINE != \"\"\n-\tdefault CMDLINE_FROM_BOOTLOADER\n-\thelp\n-\t  Choose how the kernel will handle the provided default kernel\n-\t  command line string.\n-\n-config CMDLINE_FROM_BOOTLOADER\n-\tbool \"Use bootloader kernel arguments if available\"\n-\thelp\n-\t  Uses the command-line options passed by the boot loader. If\n-\t  the boot loader doesn't provide any, the default kernel command\n-\t  string provided in CMDLINE will be used.\n-\n-config CMDLINE_FORCE\n-\tbool \"Always use the default kernel command string\"\n-\thelp\n-\t  Always use the default kernel command string, even if the boot\n-\t  loader passes other arguments to the kernel.\n-\t  This is useful if you cannot or don't want to change the\n-\t  command-line options your boot loader passes to the kernel.\n-\n-endchoice\n-\n config EFI_STUB\n \tbool\n \ndiff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c\nindex 83f1c4b92095..8bc955cdcf82 100644\n--- a/arch/arm64/kernel/idreg-override.c\n+++ b/arch/arm64/kernel/idreg-override.c\n@@ -9,6 +9,7 @@\n #include <linux/ctype.h>\n #include <linux/kernel.h>\n #include <linux/libfdt.h>\n+#include <linux/cmdline.h>\n \n #include <asm/cacheflush.h>\n #include <asm/cpufeature.h>\n@@ -187,12 +188,10 @@ static __init const u8 *get_bootargs_cmdline(void)\n static __init void parse_cmdline(void)\n {\n \tconst u8 *prop = get_bootargs_cmdline();\n+\tstatic char __initdata cmdline[COMMAND_LINE_SIZE];\n \n-\tif (IS_ENABLED(CONFIG_CMDLINE_FORCE) || !prop)\n-\t\t__parse_cmdline(CONFIG_CMDLINE, true);\n-\n-\tif (!IS_ENABLED(CONFIG_CMDLINE_FORCE) && prop)\n-\t\t__parse_cmdline(prop, true);\n+\tcmdline_build(cmdline, prop, COMMAND_LINE_SIZE);\n+\t__parse_cmdline(cmdline, true);\n }\n \n /* Keep checkers quiet */\n","prefixes":["v3","06/17"]}