{"id":1458809,"url":"http://patchwork.ozlabs.org/api/patches/1458809/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/46745e07b04139a22b5bd01dc37df97e6981e643.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":"<46745e07b04139a22b5bd01dc37df97e6981e643.1616765870.git.christophe.leroy@csgroup.eu>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/46745e07b04139a22b5bd01dc37df97e6981e643.1616765870.git.christophe.leroy@csgroup.eu/","date":"2021-03-26T13:44:58","name":"[v3,11/17] riscv: Convert to GENERIC_CMDLINE","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"7c28f33dda4f61e0928ad2838c87f1aedf7da70d","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/46745e07b04139a22b5bd01dc37df97e6981e643.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/1458809/comments/","check":"success","checks":"http://patchwork.ozlabs.org/api/patches/1458809/checks/","tags":{},"related":[{"id":1461768,"url":"http://patchwork.ozlabs.org/api/patches/1461768/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/9590d262050923a22d434358a9037131f67fcaae.1617375802.git.christophe.leroy@csgroup.eu/","msgid":"<9590d262050923a22d434358a9037131f67fcaae.1617375802.git.christophe.leroy@csgroup.eu>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/9590d262050923a22d434358a9037131f67fcaae.1617375802.git.christophe.leroy@csgroup.eu/","date":"2021-04-02T15:18:16","name":"[v4,14/20] riscv: Convert to GENERIC_CMDLINE","mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/9590d262050923a22d434358a9037131f67fcaae.1617375802.git.christophe.leroy@csgroup.eu/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=2404:9400:2:0:216:3eff:fee1:b9f1; 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\n [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1])\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 4F6Nbs3Ctsz9sWT\n\tfor ; Sat, 27 Mar 2021 00:48:41 +1100 (AEDT)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4F6Nbs2DG9z3dwx\n\tfor ; Sat, 27 Mar 2021 00:48:41 +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 4F6NWf2YTYz3bsL\n for ; Sat, 27 Mar 2021 00:45:01 +1100 (AEDT)","from localhost (mailhub1-int [192.168.12.234])\n by localhost (Postfix) with ESMTP id 4F6NWY5C3mz9v03L;\n Fri, 26 Mar 2021 14:44:57 +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 4mW1M94fWAEi; Fri, 26 Mar 2021 14:44:57 +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 4F6NWY4Gn8z9v03B;\n Fri, 26 Mar 2021 14:44:57 +0100 (CET)","from localhost (localhost [127.0.0.1])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id 6E7728B8C7;\n Fri, 26 Mar 2021 14:44:58 +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 lzygznqtzRZ7; Fri, 26 Mar 2021 14:44:58 +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 1C1488B8C9;\n Fri, 26 Mar 2021 14:44:58 +0100 (CET)","by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0)\n id 9B96867611; Fri, 26 Mar 2021 13:44:58 +0000 (UTC)"],"X-Virus-Scanned":["Debian amavisd-new at c-s.fr","amavisd-new at c-s.fr"],"Message-Id":"\n <46745e07b04139a22b5bd01dc37df97e6981e643.1616765870.git.christophe.leroy@csgroup.eu>","In-Reply-To":"","References":"","From":"Christophe Leroy ","Subject":"[PATCH v3 11/17] riscv: 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:58 +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, 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":"This converts the architecture to GENERIC_CMDLINE.\n\nSigned-off-by: Christophe Leroy \n---\n arch/riscv/Kconfig | 44 +--------------------------------------\n arch/riscv/kernel/setup.c | 5 ++---\n 2 files changed, 3 insertions(+), 46 deletions(-)","diff":"diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig\nindex 87d7b52f278f..3dbd50bed037 100644\n--- a/arch/riscv/Kconfig\n+++ b/arch/riscv/Kconfig\n@@ -39,6 +39,7 @@ config RISCV\n \tselect EDAC_SUPPORT\n \tselect GENERIC_ARCH_TOPOLOGY if SMP\n \tselect GENERIC_ATOMIC64 if !64BIT\n+\tselect GENERIC_CMDLINE\n \tselect GENERIC_EARLY_IOREMAP\n \tselect GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO\n \tselect GENERIC_IOREMAP\n@@ -390,49 +391,6 @@ endmenu\n \n menu \"Boot options\"\n \n-config CMDLINE\n-\tstring \"Built-in kernel command line\"\n-\thelp\n-\t For most platforms, the arguments for the kernel's command line\n-\t are provided at run-time, during boot. However, there are cases\n-\t where either no arguments are being provided or the provided\n-\t arguments are insufficient or even invalid.\n-\n-\t When that occurs, it is possible to define a built-in command\n-\t line here and choose how the kernel should use it later on.\n-\n-choice\n-\tprompt \"Built-in command line usage\" if CMDLINE != \"\"\n-\tdefault CMDLINE_FALLBACK\n-\thelp\n-\t Choose how the kernel will handle the provided built-in command\n-\t line.\n-\n-config CMDLINE_FALLBACK\n-\tbool \"Use bootloader kernel arguments if available\"\n-\thelp\n-\t Use the built-in command line as fallback in case we get nothing\n-\t during boot. This is the default behaviour.\n-\n-config CMDLINE_EXTEND\n-\tbool \"Extend bootloader kernel arguments\"\n-\thelp\n-\t The command-line arguments provided during boot will be\n-\t appended to the built-in command line. This is useful in\n-\t cases where the provided arguments are insufficient and\n-\t you don't want to or cannot modify them.\n-\n-\n-config CMDLINE_FORCE\n-\tbool \"Always use the default kernel command string\"\n-\thelp\n-\t Always use the built-in command line, even if we get one during\n-\t boot. This is useful in case you need to override the provided\n-\t command line on systems where you don't have or want control\n-\t over it.\n-\n-endchoice\n-\n config EFI_STUB\n \tbool\n \ndiff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c\nindex f8f15332caa2..e7c91ee478d1 100644\n--- a/arch/riscv/kernel/setup.c\n+++ b/arch/riscv/kernel/setup.c\n@@ -20,6 +20,7 @@\n #include \n #include \n #include \n+#include \n \n #include \n #include \n@@ -228,10 +229,8 @@ static void __init parse_dtb(void)\n \t}\n \n \tpr_err(\"No DTB passed to the kernel\\n\");\n-#ifdef CONFIG_CMDLINE_FORCE\n-\tstrlcpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);\n+\tcmdline_build(boot_command_line, NULL, COMMAND_LINE_SIZE);\n \tpr_info(\"Forcing kernel command line to: %s\\n\", boot_command_line);\n-#endif\n }\n \n void __init setup_arch(char **cmdline_p)\n","prefixes":["v3","11/17"]}