{"id":1449475,"url":"http://patchwork.ozlabs.org/api/patches/1449475/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210308235319.2988609-3-danielwa@cisco.com/","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":"<20210308235319.2988609-3-danielwa@cisco.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/20210308235319.2988609-3-danielwa@cisco.com/","date":"2021-03-08T23:53:10","name":"[v2,2/7] CMDLINE: drivers: of: ifdef out cmdline section","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"dbfd28a75d0b1abae75b93e947403e3592e85d92","submitter":{"id":67374,"url":"http://patchwork.ozlabs.org/api/people/67374/?format=json","name":"Daniel Walker (danielwa)","email":"danielwa@cisco.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210308235319.2988609-3-danielwa@cisco.com/mbox/","series":[{"id":232855,"url":"http://patchwork.ozlabs.org/api/series/232855/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=232855","date":"2021-03-08T23:53:08","name":"Generic Command Line changes","version":2,"mbox":"http://patchwork.ozlabs.org/series/232855/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1449475/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1449475/checks/","tags":{},"related":[{"id":1449483,"url":"http://patchwork.ozlabs.org/api/patches/1449483/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210309000247.2989531-3-danielwa@cisco.com/","msgid":"<20210309000247.2989531-3-danielwa@cisco.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/20210309000247.2989531-3-danielwa@cisco.com/","date":"2021-03-09T00:02:38","name":"[v2,2/7] CMDLINE: drivers: of: ifdef out cmdline section","mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210309000247.2989531-3-danielwa@cisco.com/mbox/"},{"id":1460183,"url":"http://patchwork.ozlabs.org/api/patches/1460183/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/0c4b839f023f87c451c8aa3c4f7a8d92729c2f02.1617126961.git.danielwa@cisco.com/","msgid":"<0c4b839f023f87c451c8aa3c4f7a8d92729c2f02.1617126961.git.danielwa@cisco.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/0c4b839f023f87c451c8aa3c4f7a8d92729c2f02.1617126961.git.danielwa@cisco.com/","date":"2021-03-30T17:56:57","name":"[2/8] CMDLINE: drivers: of: ifdef out cmdline section","mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/0c4b839f023f87c451c8aa3c4f7a8d92729c2f02.1617126961.git.danielwa@cisco.com/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=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n unprotected) header.d=cisco.com header.i=@cisco.com header.a=rsa-sha256\n header.s=iport header.b=MyDy0W3T;\n\tdkim-atps=neutral","lists.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n unprotected) header.d=cisco.com header.i=@cisco.com header.a=rsa-sha256\n header.s=iport header.b=MyDy0W3T;\n\tdkim-atps=neutral","lists.ozlabs.org; spf=pass (sender SPF authorized)\n smtp.mailfrom=cisco.com (client-ip=173.37.142.94;\n helo=alln-iport-7.cisco.com;\n envelope-from=danielwa@cisco.com; receiver=)","lists.ozlabs.org; dkim=pass (1024-bit key;\n unprotected) header.d=cisco.com header.i=@cisco.com header.a=rsa-sha256\n header.s=iport header.b=MyDy0W3T; dkim-atps=neutral"],"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 4DvZvN5cRcz9sW5\n\tfor ; Tue, 9 Mar 2021 10:54:40 +1100 (AEDT)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4DvZvN4cVlz3dPd\n\tfor ; Tue, 9 Mar 2021 10:54:40 +1100 (AEDT)","from alln-iport-7.cisco.com (alln-iport-7.cisco.com [173.37.142.94])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n bits)) (No client certificate requested)\n by lists.ozlabs.org (Postfix) with ESMTPS id 4DvZtQ23mpz3cly\n for ; Tue, 9 Mar 2021 10:53:49 +1100 (AEDT)","from alln-core-5.cisco.com ([173.36.13.138])\n by alln-iport-7.cisco.com with ESMTP/TLS/DHE-RSA-SEED-SHA;\n 08 Mar 2021 23:53:24 +0000","from zorba.cisco.com ([10.24.7.91])\n by alln-core-5.cisco.com (8.15.2/8.15.2) with ESMTP id 128NrKRj007218;\n Mon, 8 Mar 2021 23:53:23 GMT"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple;\n d=cisco.com; i=@cisco.com; l=1606; q=dns/txt; s=iport;\n t=1615247632; x=1616457232;\n h=from:to:cc:subject:date:message-id:mime-version:\n content-transfer-encoding;\n bh=5nfrAdR24COgZBWF2wEri9D+5QFCKExgHngLXOOCcpM=;\n b=MyDy0W3ThL4fuDMCF4ZbbTYJ2H16NsZiNdGeWEJ8qzrobrQJ6ggEgsXp\n WVxWnYbizV2Qss2BvTIfTSehrcscpu653cGcEmcoX9II8X26qDb0IW4Gr\n Hj0dzTgwlBL71moldr89Vr2aPLB/i39SQDTHfRw7hri6eHsdd9qlkpQzm c=;","X-IPAS-Result":"\n A0AvAgDZuEZgkIoNJK1iHQEBAQEJARIBBQUBgg+DdwE5MbJsCwEBAQ80BAEBhE2BfAIlOBMCAwEBAQMCAwEBAQEFAQEBAgEGBBQBAQEBAQGGRYZ9AUaBPgESgnCDCKwigiiJCYFFFIEliFx0hBgcgUlCgRGDWIozBIJAB4EOgigSnjWcAoMIgR+aeA8io2yUXaJVgWshgVkzGggbFYMkUBkNjjiNcwFcIAMvOAIGCgEBAwmPJgEB","X-IronPort-Anti-Spam-Filtered":"true","X-IronPort-AV":"E=Sophos;i=\"5.81,233,1610409600\"; d=\"scan'208\";a=\"657753751\"","From":"Daniel Walker ","To":"Will Deacon ,\n Christophe Leroy ,\n Rob Herring ,\n Daniel Gimpelevich ,\n Andrew Morton , x86@kernel.org,\n linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,\n Rob Herring , Frank Rowand ","Subject":"[PATCH v2 2/7] CMDLINE: drivers: of: ifdef out cmdline section","Date":"Mon, 8 Mar 2021 15:53:10 -0800","Message-Id":"<20210308235319.2988609-3-danielwa@cisco.com>","X-Mailer":"git-send-email 2.25.1","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Auto-Response-Suppress":"DR, OOF, AutoReply","X-Outbound-SMTP-Client":"10.24.7.91, [10.24.7.91]","X-Outbound-Node":"alln-core-5.cisco.com","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":"devicetree@vger.kernel.org, Ruslan Ruslichenko ,\n linux-kernel@vger.kernel.org, xe-linux-external@cisco.com","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n "},"content":"It looks like there's some seepage of cmdline stuff into\nthe generic device tree code. This conflicts with the\ngeneric cmdline implementation so I remove it in the case\nwhen that's enabled.\n\nCc: xe-linux-external@cisco.com\nSigned-off-by: Ruslan Ruslichenko \nSigned-off-by: Daniel Walker \n---\n drivers/of/fdt.c | 12 ++++++++++++\n 1 file changed, 12 insertions(+)","diff":"diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c\nindex feb0f2d67fc5..e25240d84632 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,6 +1051,16 @@ 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+\n+#ifdef CONFIG_GENERIC_CMDLINE\n+\t/*\n+\t * The builtin command line will be added here, or it can override\n+\t * with the DT bootargs.\n+\t */\n+\tcmdline_add_builtin(data,\n+\t\t\t (l > 0 ? p : NULL), /* This is sanity checking */\n+\t\t\t COMMAND_LINE_SIZE);\n+#else\n \tif (p != NULL && l > 0)\n \t\tstrlcpy(data, p, min(l, COMMAND_LINE_SIZE));\n \n@@ -1070,6 +1081,7 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,\n \t\tstrlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);\n #endif\n #endif /* CONFIG_CMDLINE */\n+#endif /* CONFIG_GENERIC_CMDLINE */\n \n \tpr_debug(\"Command line is: %s\\n\", (char *)data);\n \n","prefixes":["v2","2/7"]}