{"id":1458777,"url":"http://patchwork.ozlabs.org/api/patches/1458777/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/f57bc57d4032a1893b22c39adcd671297610b31c.1616765869.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":"","list_archive_url":"https://lore.kernel.org/linuxppc-dev/f57bc57d4032a1893b22c39adcd671297610b31c.1616765869.git.christophe.leroy@csgroup.eu/","date":"2021-03-26T13:44:49","name":"[v3,02/17] drivers: of: use cmdline building function","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"adf402740eda17e6870431d817d2b505df0f438a","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/f57bc57d4032a1893b22c39adcd671297610b31c.1616765869.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/1458777/comments/","check":"success","checks":"http://patchwork.ozlabs.org/api/patches/1458777/checks/","tags":{},"related":[{"id":1461739,"url":"http://patchwork.ozlabs.org/api/patches/1461739/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/b39c6cfefe9c8391a64ebfca3ae39fcc49e5c607.1617375802.git.christophe.leroy@csgroup.eu/","msgid":"","list_archive_url":"https://lore.kernel.org/linuxppc-dev/b39c6cfefe9c8391a64ebfca3ae39fcc49e5c607.1617375802.git.christophe.leroy@csgroup.eu/","date":"2021-04-02T15:18:03","name":"[v4,02/20] drivers: of: use cmdline building function","mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/b39c6cfefe9c8391a64ebfca3ae39fcc49e5c607.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=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 4F6NWs48GGz9s1l\n\tfor ; Sat, 27 Mar 2021 00:45:13 +1100 (AEDT)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4F6NWs33GSz3c3W\n\tfor ; Sat, 27 Mar 2021 00:45:13 +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 4F6NWV4lNBz2yxl\n for ; Sat, 27 Mar 2021 00:44:52 +1100 (AEDT)","from localhost (mailhub1-int [192.168.12.234])\n by localhost (Postfix) with ESMTP id 4F6NWN2bwmz9tyyY;\n Fri, 26 Mar 2021 14:44:48 +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 WXR477eJDIpw; Fri, 26 Mar 2021 14:44:48 +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 4F6NWN1k0Gz9tyyV;\n Fri, 26 Mar 2021 14:44:48 +0100 (CET)","from localhost (localhost [127.0.0.1])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id 196218B8C9;\n Fri, 26 Mar 2021 14:44:49 +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 um4ZFYXC0Irt; Fri, 26 Mar 2021 14:44:49 +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 CD9DC8B8C7;\n Fri, 26 Mar 2021 14:44:48 +0100 (CET)","by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0)\n id 5A96B67611; Fri, 26 Mar 2021 13:44:49 +0000 (UTC)"],"X-Virus-Scanned":["Debian amavisd-new at c-s.fr","amavisd-new at c-s.fr"],"Message-Id":"\n ","In-Reply-To":"","References":"","From":"Christophe Leroy ","Subject":"[PATCH v3 02/17] drivers: of: use cmdline building function","To":"will@kernel.org, danielwa@cisco.com, robh@kernel.org,\n daniel@gimpelevich.san-francisco.ca.us","Date":"Fri, 26 Mar 2021 13:44:49 +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 patch uses the new cmdline building function to\nconcatenate the of provided cmdline with built-in parts\nbased on compile-time options.\n\nSigned-off-by: Christophe Leroy \n---\n drivers/of/fdt.c | 23 ++++-------------------\n 1 file changed, 4 insertions(+), 19 deletions(-)","diff":"diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c\nindex dcc1dd96911a..cf2b95b8f298 100644\n--- a/drivers/of/fdt.c\n+++ b/drivers/of/fdt.c\n@@ -25,6 +25,7 @@\n #include \n #include \n #include \n+#include \n \n #include /* for COMMAND_LINE_SIZE */\n #include \n@@ -1050,26 +1051,10 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,\n \n \t/* Retrieve command line */\n \tp = of_get_flat_dt_prop(node, \"bootargs\", &l);\n-\tif (p != NULL && l > 0)\n-\t\tstrlcpy(data, p, min(l, COMMAND_LINE_SIZE));\n+\tif (l <= 0)\n+\t\tp = NULL;\n \n-\t/*\n-\t * CONFIG_CMDLINE is meant to be a default in case nothing else\n-\t * managed to set the command line, unless CONFIG_CMDLINE_FORCE\n-\t * is set in which case we override whatever was found earlier.\n-\t */\n-#ifdef CONFIG_CMDLINE\n-#if defined(CONFIG_CMDLINE_EXTEND)\n-\tstrlcat(data, \" \", COMMAND_LINE_SIZE);\n-\tstrlcat(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);\n-#elif defined(CONFIG_CMDLINE_FORCE)\n-\tstrlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);\n-#else\n-\t/* No arguments from boot loader, use kernel's cmdl*/\n-\tif (!((char *)data)[0])\n-\t\tstrlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);\n-#endif\n-#endif /* CONFIG_CMDLINE */\n+\tcmdline_build(data, p, COMMAND_LINE_SIZE);\n \n \tpr_debug(\"Command line is: %s\\n\", (char *)data);\n \n","prefixes":["v3","02/17"]}