Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1461771/?format=api
{ "id": 1461771, "url": "http://patchwork.ozlabs.org/api/patches/1461771/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/61707011a81a365ccc22a6374f797b6f63cf5030.1617375802.git.christophe.leroy@csgroup.eu/", "project": { "id": 2, "url": "http://patchwork.ozlabs.org/api/projects/2/?format=api", "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": "<61707011a81a365ccc22a6374f797b6f63cf5030.1617375802.git.christophe.leroy@csgroup.eu>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/61707011a81a365ccc22a6374f797b6f63cf5030.1617375802.git.christophe.leroy@csgroup.eu/", "date": "2021-04-02T15:18:19", "name": "[v4,17/20] xtensa: Convert to GENERIC_CMDLINE", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": false, "hash": "da65db774fb0622ca2013c62e20fb5d59bb25653", "submitter": { "id": 79086, "url": "http://patchwork.ozlabs.org/api/people/79086/?format=api", "name": "Christophe Leroy", "email": "christophe.leroy@csgroup.eu" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/61707011a81a365ccc22a6374f797b6f63cf5030.1617375802.git.christophe.leroy@csgroup.eu/mbox/", "series": [ { "id": 237158, "url": "http://patchwork.ozlabs.org/api/series/237158/?format=api", "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/1461771/comments/", "check": "success", "checks": "http://patchwork.ozlabs.org/api/patches/1461771/checks/", "tags": {}, "related": [ { "id": 1458811, "url": "http://patchwork.ozlabs.org/api/patches/1458811/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/14bee90f01159aca28390d57be538760980436a4.1616765870.git.christophe.leroy@csgroup.eu/", "msgid": "<14bee90f01159aca28390d57be538760980436a4.1616765870.git.christophe.leroy@csgroup.eu>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/14bee90f01159aca28390d57be538760980436a4.1616765870.git.christophe.leroy@csgroup.eu/", "date": "2021-03-26T13:45:01", "name": "[v3,14/17] xtensa: Convert to GENERIC_CMDLINE", "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/14bee90f01159aca28390d57be538760980436a4.1616765870.git.christophe.leroy@csgroup.eu/mbox/" } ], "headers": { "Return-Path": "\n <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>", "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=<UNKNOWN>)", "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=<UNKNOWN>)" ], "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 4FBkP14qhLz9sVb\n\tfor <patchwork-incoming@ozlabs.org>; Sat, 3 Apr 2021 02:24:21 +1100 (AEDT)", "from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4FBkP13rCYz3fWt\n\tfor <patchwork-incoming@ozlabs.org>; Sat, 3 Apr 2021 02:24:21 +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 4FBkG709B3z3c4J\n for <linuxppc-dev@lists.ozlabs.org>; Sat, 3 Apr 2021 02:18:22 +1100 (AEDT)", "from localhost (mailhub1-int [192.168.12.234])\n by localhost (Postfix) with ESMTP id 4FBkG25GKzz9v2mG;\n Fri, 2 Apr 2021 17:18:18 +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 Fa98FSt8wZGD; Fri, 2 Apr 2021 17:18:18 +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 4FBkG24Cgkz9v2mF;\n Fri, 2 Apr 2021 17:18:18 +0200 (CEST)", "from localhost (localhost [127.0.0.1])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id 30F038BB7F;\n Fri, 2 Apr 2021 17:18:20 +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 HQzlnfTPkzN2; Fri, 2 Apr 2021 17:18:20 +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 611E98BB79;\n Fri, 2 Apr 2021 17:18:19 +0200 (CEST)", "by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0)\n id 3D03167989; Fri, 2 Apr 2021 15:18:19 +0000 (UTC)" ], "X-Virus-Scanned": [ "Debian amavisd-new at c-s.fr", "amavisd-new at c-s.fr" ], "Message-Id": "\n <61707011a81a365ccc22a6374f797b6f63cf5030.1617375802.git.christophe.leroy@csgroup.eu>", "In-Reply-To": "<cover.1617375802.git.christophe.leroy@csgroup.eu>", "References": "<cover.1617375802.git.christophe.leroy@csgroup.eu>", "From": "Christophe Leroy <christophe.leroy@csgroup.eu>", "Subject": "[PATCH v4 17/20] xtensa: 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:19 +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 <linuxppc-dev.lists.ozlabs.org>", "List-Unsubscribe": "<https://lists.ozlabs.org/options/linuxppc-dev>,\n <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>", "List-Archive": "<http://lists.ozlabs.org/pipermail/linuxppc-dev/>", "List-Post": "<mailto:linuxppc-dev@lists.ozlabs.org>", "List-Help": "<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>", "List-Subscribe": "<https://lists.ozlabs.org/listinfo/linuxppc-dev>,\n <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>", "Cc": "linux-arch@vger.kernel.org, devicetree@vger.kernel.org,\n microblaze <monstr@monstr.eu>, 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 <ley.foon.tan@intel.com>,\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 <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>" }, "content": "This converts the architecture to GENERIC_CMDLINE.\n\nSigned-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>\n---\n arch/xtensa/Kconfig | 15 +--------------\n arch/xtensa/configs/audio_kc705_defconfig | 1 -\n arch/xtensa/configs/common_defconfig | 1 -\n arch/xtensa/configs/generic_kc705_defconfig | 1 -\n arch/xtensa/configs/iss_defconfig | 1 -\n arch/xtensa/configs/nommu_kc705_defconfig | 1 -\n arch/xtensa/configs/smp_lx200_defconfig | 1 -\n arch/xtensa/configs/virt_defconfig | 1 -\n arch/xtensa/configs/xip_kc705_defconfig | 1 -\n arch/xtensa/kernel/setup.c | 10 ++--------\n 10 files changed, 3 insertions(+), 30 deletions(-)", "diff": "diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig\nindex 9ad6b7b82707..42309f5e9cda 100644\n--- a/arch/xtensa/Kconfig\n+++ b/arch/xtensa/Kconfig\n@@ -16,6 +16,7 @@ config XTENSA\n \tselect COMMON_CLK\n \tselect DMA_REMAP if MMU\n \tselect GENERIC_ATOMIC64\n+\tselect GENERIC_CMDLINE\n \tselect GENERIC_IRQ_SHOW\n \tselect GENERIC_PCI_IOMAP\n \tselect GENERIC_SCHED_CLOCK\n@@ -353,20 +354,6 @@ config GENERIC_CALIBRATE_DELAY\n \thelp\n \t The BogoMIPS value can easily be derived from the CPU frequency.\n \n-config CMDLINE_BOOL\n-\tbool \"Default bootloader kernel arguments\"\n-\n-config CMDLINE\n-\tstring \"Initial kernel command string\"\n-\tdepends on CMDLINE_BOOL\n-\tdefault \"console=ttyS0,38400 root=/dev/ram\"\n-\thelp\n-\t On some architectures (EBSA110 and 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 config USE_OF\n \tbool \"Flattened Device Tree support\"\n \tselect OF\ndiff --git a/arch/xtensa/configs/audio_kc705_defconfig b/arch/xtensa/configs/audio_kc705_defconfig\nindex 3be62da8089b..5f8661a33ab4 100644\n--- a/arch/xtensa/configs/audio_kc705_defconfig\n+++ b/arch/xtensa/configs/audio_kc705_defconfig\n@@ -27,7 +27,6 @@ CONFIG_PREEMPT=y\n CONFIG_HIGHMEM=y\n # CONFIG_PCI is not set\n CONFIG_XTENSA_PLATFORM_XTFPGA=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x38000000@0\"\n CONFIG_USE_OF=y\n CONFIG_BUILTIN_DTB_SOURCE=\"kc705\"\ndiff --git a/arch/xtensa/configs/common_defconfig b/arch/xtensa/configs/common_defconfig\nindex fa9389869154..6467ebcbb080 100644\n--- a/arch/xtensa/configs/common_defconfig\n+++ b/arch/xtensa/configs/common_defconfig\n@@ -6,7 +6,6 @@ CONFIG_MODULES=y\n CONFIG_MODVERSIONS=y\n CONFIG_XTENSA_PLATFORM_XT2000=y\n CONFIG_GENERIC_CALIBRATE_DELAY=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"console=ttyS0,38400 ip=bootp root=nfs nfsroot=/opt/montavista/pro/devkit/xtensa/linux_be/target memmap=128M@0\"\n CONFIG_BINFMT_MISC=y\n CONFIG_NET=y\ndiff --git a/arch/xtensa/configs/generic_kc705_defconfig b/arch/xtensa/configs/generic_kc705_defconfig\nindex e9d6b6f6eca1..8984c4e68a42 100644\n--- a/arch/xtensa/configs/generic_kc705_defconfig\n+++ b/arch/xtensa/configs/generic_kc705_defconfig\n@@ -26,7 +26,6 @@ CONFIG_PREEMPT=y\n CONFIG_HIGHMEM=y\n # CONFIG_PCI is not set\n CONFIG_XTENSA_PLATFORM_XTFPGA=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x38000000@0\"\n CONFIG_USE_OF=y\n CONFIG_BUILTIN_DTB_SOURCE=\"kc705\"\ndiff --git a/arch/xtensa/configs/iss_defconfig b/arch/xtensa/configs/iss_defconfig\nindex 32ce8fb068f0..996ad115264d 100644\n--- a/arch/xtensa/configs/iss_defconfig\n+++ b/arch/xtensa/configs/iss_defconfig\n@@ -2,7 +2,6 @@ CONFIG_SYSVIPC=y\n CONFIG_LOG_BUF_SHIFT=14\n CONFIG_EXPERT=y\n # CONFIG_PCI is not set\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"console=ttyS0,38400 eth0=tuntap,,tap0 ip=192.168.168.5:192.168.168.1 root=nfs nfsroot=192.168.168.1:/opt/montavista/pro/devkit/xtensa/linux_be/target memmap=128M@0\"\n # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set\n CONFIG_NET=y\ndiff --git a/arch/xtensa/configs/nommu_kc705_defconfig b/arch/xtensa/configs/nommu_kc705_defconfig\nindex 88b2e222d4bf..54250bc74885 100644\n--- a/arch/xtensa/configs/nommu_kc705_defconfig\n+++ b/arch/xtensa/configs/nommu_kc705_defconfig\n@@ -33,7 +33,6 @@ CONFIG_PREEMPT=y\n CONFIG_MEMMAP_CACHEATTR=0xfff2442f\n # CONFIG_PCI is not set\n CONFIG_XTENSA_PLATFORM_XTFPGA=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"earlycon=uart8250,mmio32native,0x9d050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=256M@0x60000000\"\n CONFIG_USE_OF=y\n CONFIG_BUILTIN_DTB_SOURCE=\"kc705_nommu\"\ndiff --git a/arch/xtensa/configs/smp_lx200_defconfig b/arch/xtensa/configs/smp_lx200_defconfig\nindex a47c85638ec1..58b284fd627f 100644\n--- a/arch/xtensa/configs/smp_lx200_defconfig\n+++ b/arch/xtensa/configs/smp_lx200_defconfig\n@@ -30,7 +30,6 @@ CONFIG_HOTPLUG_CPU=y\n # CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX is not set\n # CONFIG_PCI is not set\n CONFIG_XTENSA_PLATFORM_XTFPGA=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=96M@0\"\n CONFIG_USE_OF=y\n CONFIG_BUILTIN_DTB_SOURCE=\"lx200mx\"\ndiff --git a/arch/xtensa/configs/virt_defconfig b/arch/xtensa/configs/virt_defconfig\nindex 6d1387dfa96f..fb4dce2c70a3 100644\n--- a/arch/xtensa/configs/virt_defconfig\n+++ b/arch/xtensa/configs/virt_defconfig\n@@ -21,7 +21,6 @@ CONFIG_XTENSA_VARIANT_DC233C=y\n CONFIG_XTENSA_UNALIGNED_USER=y\n CONFIG_XTENSA_KSEG_512M=y\n CONFIG_HIGHMEM=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x80000000@0\"\n CONFIG_USE_OF=y\n CONFIG_BUILTIN_DTB_SOURCE=\"virt\"\ndiff --git a/arch/xtensa/configs/xip_kc705_defconfig b/arch/xtensa/configs/xip_kc705_defconfig\nindex 4f1ff9531f6a..ae4427773af2 100644\n--- a/arch/xtensa/configs/xip_kc705_defconfig\n+++ b/arch/xtensa/configs/xip_kc705_defconfig\n@@ -26,7 +26,6 @@ CONFIG_KERNEL_LOAD_ADDRESS=0xf6000000\n CONFIG_XTENSA_KSEG_512M=y\n CONFIG_HIGHMEM=y\n CONFIG_XTENSA_PLATFORM_XTFPGA=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x38000000@0\"\n CONFIG_USE_OF=y\n CONFIG_BUILTIN_DTB_SOURCE=\"kc705\"\ndiff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c\nindex ed184106e4cf..ebb009f112a5 100644\n--- a/arch/xtensa/kernel/setup.c\n+++ b/arch/xtensa/kernel/setup.c\n@@ -25,6 +25,7 @@\n #include <linux/cpu.h>\n #include <linux/of.h>\n #include <linux/of_fdt.h>\n+#include <linux/cmdline.h>\n \n #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)\n # include <linux/console.h>\n@@ -73,10 +74,6 @@ extern unsigned long loops_per_jiffy;\n \n static char __initdata command_line[COMMAND_LINE_SIZE];\n \n-#ifdef CONFIG_CMDLINE_BOOL\n-static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;\n-#endif\n-\n #ifdef CONFIG_PARSE_BOOTPARAM\n /*\n * Boot parameter parsing.\n@@ -257,10 +254,7 @@ void __init init_arch(bp_tag_t *bp_start)\n \tearly_init_devtree(dtb_start);\n #endif\n \n-#ifdef CONFIG_CMDLINE_BOOL\n-\tif (!command_line[0])\n-\t\tstrlcpy(command_line, default_command_line, COMMAND_LINE_SIZE);\n-#endif\n+\tcmdline_build(command_line, command_line);\n \n \t/* Early hook for platforms */\n \n", "prefixes": [ "v4", "17/20" ] }