{"id":1461766,"url":"http://patchwork.ozlabs.org/api/patches/1461766/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/9b4899b0abc156eb207b19fe0b24dd5bf0355b99.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":"<9b4899b0abc156eb207b19fe0b24dd5bf0355b99.1617375802.git.christophe.leroy@csgroup.eu>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/9b4899b0abc156eb207b19fe0b24dd5bf0355b99.1617375802.git.christophe.leroy@csgroup.eu/","date":"2021-04-02T15:18:13","name":"[v4,12/20] nios2: Convert to GENERIC_CMDLINE","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"4c1eaa06e4b78827dcd0a60f4fd1d877aff134f0","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/9b4899b0abc156eb207b19fe0b24dd5bf0355b99.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/1461766/comments/","check":"success","checks":"http://patchwork.ozlabs.org/api/patches/1461766/checks/","tags":{},"related":[{"id":1458807,"url":"http://patchwork.ozlabs.org/api/patches/1458807/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/85b1dc6339351cbc46d179e8fdb9dfc398e58303.1616765870.git.christophe.leroy@csgroup.eu/","msgid":"<85b1dc6339351cbc46d179e8fdb9dfc398e58303.1616765870.git.christophe.leroy@csgroup.eu>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/85b1dc6339351cbc46d179e8fdb9dfc398e58303.1616765870.git.christophe.leroy@csgroup.eu/","date":"2021-03-26T13:44:56","name":"[v3,09/17] nios2: Convert to GENERIC_CMDLINE","mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/85b1dc6339351cbc46d179e8fdb9dfc398e58303.1616765870.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=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 4FBkM15sb5z9sSC\n\tfor ; Sat, 3 Apr 2021 02:22:37 +1100 (AEDT)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4FBkM153Qsz3f5J\n\tfor ; Sat, 3 Apr 2021 02:22:37 +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 4FBkG1281bz3c0f\n for ; Sat, 3 Apr 2021 02:18:17 +1100 (AEDT)","from localhost (mailhub1-int [192.168.12.234])\n by localhost (Postfix) with ESMTP id 4FBkFx03zqz9v2m3;\n Fri, 2 Apr 2021 17:18:13 +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 A8kam4b7TJbi; Fri, 2 Apr 2021 17:18:12 +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 4FBkFw53rLz9v2ls;\n Fri, 2 Apr 2021 17:18:12 +0200 (CEST)","from localhost (localhost [127.0.0.1])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id 7C7E18BB7F;\n Fri, 2 Apr 2021 17:18:14 +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 H5LeedaB8gob; Fri, 2 Apr 2021 17:18:14 +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 25D4A8BB79;\n Fri, 2 Apr 2021 17:18:14 +0200 (CEST)","by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0)\n id 0385767989; Fri, 2 Apr 2021 15:18:13 +0000 (UTC)"],"X-Virus-Scanned":["Debian amavisd-new at c-s.fr","amavisd-new at c-s.fr"],"Message-Id":"\n <9b4899b0abc156eb207b19fe0b24dd5bf0355b99.1617375802.git.christophe.leroy@csgroup.eu>","In-Reply-To":"","References":"","From":"Christophe Leroy ","Subject":"[PATCH v4 12/20] nios2: Convert to GENERIC_CMDLINE","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:13 +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":"This converts the architecture to GENERIC_CMDLINE.\n\nSigned-off-by: Christophe Leroy \n---\nv4: Added missing selection of CONFIG_GENERIC_CMDLINE in Kconfig\n---\n arch/nios2/Kconfig | 25 ++-----------------------\n arch/nios2/kernel/setup.c | 13 ++++---------\n 2 files changed, 6 insertions(+), 32 deletions(-)","diff":"diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig\nindex c24955c81c92..6018f3d626f8 100644\n--- a/arch/nios2/Kconfig\n+++ b/arch/nios2/Kconfig\n@@ -10,6 +10,7 @@ config NIOS2\n \tselect COMMON_CLK\n \tselect TIMER_OF\n \tselect GENERIC_ATOMIC64\n+\tselect GENERIC_CMDLINE\n \tselect GENERIC_CPU_DEVICES\n \tselect GENERIC_IRQ_PROBE\n \tselect GENERIC_IRQ_SHOW\n@@ -90,31 +91,9 @@ config NIOS2_ALIGNMENT_TRAP\n \n comment \"Boot options\"\n \n-config CMDLINE_BOOL\n-\tbool \"Default bootloader kernel arguments\"\n-\tdefault y\n-\n-config CMDLINE\n-\tstring \"Default kernel command string\"\n-\tdefault \"\"\n-\tdepends on CMDLINE_BOOL\n-\thelp\n-\t On some platforms, there is currently no way for the boot loader to\n-\t pass arguments to the kernel. For these platforms, you can supply\n-\t some command-line options at build time by entering them here. In\n-\t other cases you can specify kernel args so that you don't have\n-\t to set them up in board prom initialization routines.\n-\n-config CMDLINE_FORCE\n-\tbool \"Force default kernel command string\"\n-\tdepends on CMDLINE_BOOL\n-\thelp\n-\t Set this to have arguments from the default kernel command string\n-\t override those passed by the boot loader.\n-\n config NIOS2_CMDLINE_IGNORE_DTB\n \tbool \"Ignore kernel command string from DTB\"\n-\tdepends on CMDLINE_BOOL\n+\tdepends on CMDLINE != \"\"\n \tdepends on !CMDLINE_FORCE\n \tdefault y\n \thelp\ndiff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c\nindex d2f21957e99c..5b38d3d0ad64 100644\n--- a/arch/nios2/kernel/setup.c\n+++ b/arch/nios2/kernel/setup.c\n@@ -20,6 +20,7 @@\n #include \n #include \n #include \n+#include \n \n #include \n #include \n@@ -108,7 +109,7 @@ asmlinkage void __init nios2_boot_init(unsigned r4, unsigned r5, unsigned r6,\n \t\t\t\t unsigned r7)\n {\n \tunsigned dtb_passed = 0;\n-\tchar cmdline_passed[COMMAND_LINE_SIZE] __maybe_unused = { 0, };\n+\tchar cmdline_passed[COMMAND_LINE_SIZE] = { 0, };\n \n #if defined(CONFIG_NIOS2_PASS_CMDLINE)\n \tif (r4 == 0x534f494e) { /* r4 is magic NIOS */\n@@ -127,14 +128,8 @@ asmlinkage void __init nios2_boot_init(unsigned r4, unsigned r5, unsigned r6,\n \n \tearly_init_devtree((void *)dtb_passed);\n \n-#ifndef CONFIG_CMDLINE_FORCE\n-\tif (cmdline_passed[0])\n-\t\tstrlcpy(boot_command_line, cmdline_passed, COMMAND_LINE_SIZE);\n-#ifdef CONFIG_NIOS2_CMDLINE_IGNORE_DTB\n-\telse\n-\t\tstrlcpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);\n-#endif\n-#endif\n+\tif (cmdline_passed[0] || IS_ENABLED(CONFIG_NIOS2_CMDLINE_IGNORE_DTB))\n+\t\tcmdline_build(boot_command_line, cmdline_passed);\n \n \tparse_early_param();\n }\n","prefixes":["v4","12/20"]}