{"id":1458793,"url":"http://patchwork.ozlabs.org/api/patches/1458793/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/7362e4f6a5f5b79e6ad3fd3cec3183a4a283f7fc.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":"<7362e4f6a5f5b79e6ad3fd3cec3183a4a283f7fc.1616765870.git.christophe.leroy@csgroup.eu>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/7362e4f6a5f5b79e6ad3fd3cec3183a4a283f7fc.1616765870.git.christophe.leroy@csgroup.eu/","date":"2021-03-26T13:44:52","name":"[v3,05/17] arm: Convert to GENERIC_CMDLINE","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"71a8b3734e5ec651cee44c846f4d17c9f6c3c63a","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/7362e4f6a5f5b79e6ad3fd3cec3183a4a283f7fc.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/1458793/comments/","check":"success","checks":"http://patchwork.ozlabs.org/api/patches/1458793/checks/","tags":{},"related":[{"id":1461760,"url":"http://patchwork.ozlabs.org/api/patches/1461760/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/2e49b9ae60a90aec8b555946279cab059a2812a4.1617375802.git.christophe.leroy@csgroup.eu/","msgid":"<2e49b9ae60a90aec8b555946279cab059a2812a4.1617375802.git.christophe.leroy@csgroup.eu>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/2e49b9ae60a90aec8b555946279cab059a2812a4.1617375802.git.christophe.leroy@csgroup.eu/","date":"2021-04-02T15:18:09","name":"[v4,08/20] arm: Convert to GENERIC_CMDLINE","mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/2e49b9ae60a90aec8b555946279cab059a2812a4.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 4F6NYl6sW6z9sVm\n\tfor ; Sat, 27 Mar 2021 00:46:51 +1100 (AEDT)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4F6NYl67XDz3cyl\n\tfor ; Sat, 27 Mar 2021 00:46:51 +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 4F6NWY1ftkz3bsG\n for ; Sat, 27 Mar 2021 00:44:57 +1100 (AEDT)","from localhost (mailhub1-int [192.168.12.234])\n by localhost (Postfix) with ESMTP id 4F6NWR6RK3z9v03F;\n Fri, 26 Mar 2021 14:44:51 +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 e4Ftj0Jvyaj1; Fri, 26 Mar 2021 14:44:51 +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 4F6NWR4zwtz9v03B;\n Fri, 26 Mar 2021 14:44:51 +0100 (CET)","from localhost (localhost [127.0.0.1])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id 6D8748B8CD;\n Fri, 26 Mar 2021 14:44:52 +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 NpujWXqfQku1; Fri, 26 Mar 2021 14:44:52 +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 E574D8B8C9;\n Fri, 26 Mar 2021 14:44:51 +0100 (CET)","by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0)\n id 71E7E67611; Fri, 26 Mar 2021 13:44:52 +0000 (UTC)"],"X-Virus-Scanned":["Debian amavisd-new at c-s.fr","amavisd-new at c-s.fr"],"Message-Id":"\n <7362e4f6a5f5b79e6ad3fd3cec3183a4a283f7fc.1616765870.git.christophe.leroy@csgroup.eu>","In-Reply-To":"","References":"","From":"Christophe Leroy ","Subject":"[PATCH v3 05/17] arm: 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:52 +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/arm/Kconfig | 38 +----------------------------------\n arch/arm/kernel/atags_parse.c | 15 +++++---------\n 2 files changed, 6 insertions(+), 47 deletions(-)","diff":"diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig\nindex 5da96f5df48f..67bc75f2da81 100644\n--- a/arch/arm/Kconfig\n+++ b/arch/arm/Kconfig\n@@ -50,6 +50,7 @@ config ARM\n \tselect GENERIC_ARCH_TOPOLOGY if ARM_CPU_TOPOLOGY\n \tselect GENERIC_ATOMIC64 if CPU_V7M || CPU_V6 || !CPU_32v6K || !AEABI\n \tselect GENERIC_CLOCKEVENTS_BROADCAST if SMP\n+\tselect GENERIC_CMDLINE if ATAGS\n \tselect GENERIC_IRQ_IPI if SMP\n \tselect GENERIC_CPU_AUTOPROBE\n \tselect GENERIC_EARLY_IOREMAP\n@@ -1740,43 +1741,6 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND\n \n endchoice\n \n-config CMDLINE\n-\tstring \"Default kernel command string\"\n-\tdefault \"\"\n-\thelp\n-\t On some architectures (e.g. CATS), there is currently no way\n-\t for the boot loader to pass arguments to the kernel. For these\n-\t architectures, you should supply some command-line options at build\n-\t time by entering them here. As a minimum, you should specify the\n-\t memory size and the root device (e.g., mem=64M root=/dev/nfs).\n-\n-choice\n-\tprompt \"Kernel command line type\" if CMDLINE != \"\"\n-\tdefault CMDLINE_FROM_BOOTLOADER\n-\tdepends on ATAGS\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_EXTEND\n-\tbool \"Extend bootloader kernel arguments\"\n-\thelp\n-\t The command-line arguments provided by the boot loader will be\n-\t appended to the default kernel command string.\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-endchoice\n-\n config XIP_KERNEL\n \tbool \"Kernel Execute-In-Place from ROM\"\n \tdepends on !ARM_LPAE && !ARCH_MULTIPLATFORM\ndiff --git a/arch/arm/kernel/atags_parse.c b/arch/arm/kernel/atags_parse.c\nindex 373b61f9a4f0..3d5bd52ee458 100644\n--- a/arch/arm/kernel/atags_parse.c\n+++ b/arch/arm/kernel/atags_parse.c\n@@ -14,6 +14,7 @@\n * is not parsed in any way).\n */\n \n+#include \n #include \n #include \n #include \n@@ -120,16 +121,10 @@ __tagtable(ATAG_REVISION, parse_tag_revision);\n \n static int __init parse_tag_cmdline(const struct tag *tag)\n {\n-#if defined(CONFIG_CMDLINE_EXTEND)\n-\tstrlcat(default_command_line, \" \", COMMAND_LINE_SIZE);\n-\tstrlcat(default_command_line, tag->u.cmdline.cmdline,\n-\t\tCOMMAND_LINE_SIZE);\n-#elif defined(CONFIG_CMDLINE_FORCE)\n-\tpr_warn(\"Ignoring tag cmdline (using the default kernel command line)\\n\");\n-#else\n-\tstrlcpy(default_command_line, tag->u.cmdline.cmdline,\n-\t\tCOMMAND_LINE_SIZE);\n-#endif\n+\tcmdline_build(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);\n+\n+\tif IS_ENABLED(CONFIG_CMDLINE_FORCE)\n+\t\tpr_warn(\"Ignoring tag cmdline (using the default kernel command line)\\n\");\n \treturn 0;\n }\n \n","prefixes":["v3","05/17"]}