{"id":809051,"url":"http://patchwork.ozlabs.org/api/patches/809051/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/alpine.LFD.2.21.1709020416130.13598@localhost.localdomain/","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/alpine.LFD.2.21.1709020416130.13598@localhost.localdomain/","date":"2017-09-02T08:43:00","name":"devicetree: Remove remaining references/tests for \"chosen@0\"","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"b91f56124bbcd3451ce4c8e3860001b45e8f2432","submitter":{"id":2270,"url":"http://patchwork.ozlabs.org/api/people/2270/?format=json","name":"Robert P. J. Day","email":"rpjday@crashcourse.ca"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/alpine.LFD.2.21.1709020416130.13598@localhost.localdomain/mbox/","series":[{"id":1143,"url":"http://patchwork.ozlabs.org/api/series/1143/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=1143","date":"2017-09-02T08:43:00","name":"devicetree: Remove remaining references/tests for \"chosen@0\"","version":1,"mbox":"http://patchwork.ozlabs.org/series/1143/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809051/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809051/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xkqQs1skWz9s03\n\tfor ;\n\tSat, 2 Sep 2017 18:44:05 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xkqQs0vzBzDrJ6\n\tfor ;\n\tSat, 2 Sep 2017 18:44:05 +1000 (AEST)","from cpanel2.indieserve.net (cpanel2.indieserve.net\n\t[199.212.143.6])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xkqPk3c4TzDqk7\n\tfor ;\n\tSat, 2 Sep 2017 18:43:05 +1000 (AEST)","from cpec03f0ed08c7f-cm68b6fcf980b0.cpe.net.cable.rogers.com\n\t([174.118.92.171]:47916 helo=localhost.localdomain)\n\tby cpanel2.indieserve.net with esmtpsa\n\t(TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89)\n\t(envelope-from )\n\tid 1do418-0003C3-KV; Sat, 02 Sep 2017 04:43:02 -0400"],"Date":"Sat, 2 Sep 2017 04:43:00 -0400 (EDT)","From":"\"Robert P. J. Day\" ","X-X-Sender":"rpjday@localhost.localdomain","To":"devicetree@vger.kernel.org","Subject":"[PATCH] devicetree: Remove remaining references/tests for \"chosen@0\"","Message-ID":"","User-Agent":"Alpine 2.21 (LFD 202 2017-01-01)","MIME-Version":"1.0","Content-Type":"text/plain; charset=US-ASCII","X-AntiAbuse":["This header was added to track abuse,\n\tplease include it with any abuse report","Primary Hostname - cpanel2.indieserve.net","Original Domain - lists.ozlabs.org","Originator/Caller UID/GID - [47 12] / [47 12]","Sender Address Domain - crashcourse.ca"],"X-Get-Message-Sender-Via":"cpanel2.indieserve.net: authenticated_id:\n\trpjday+crashcourse.ca/only user confirmed/virtual account not\n\tconfirmed","X-Authenticated-Sender":"cpanel2.indieserve.net: rpjday@crashcourse.ca","X-Source":"","X-Source-Args":"","X-Source-Dir":"","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"linux-mips@linux-mips.org, monstr@monstr.eu,\n\tLinux PPC Mailing List ","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"},"content":"Since, according to a recent devicetree ML posting by Rob Herring,\nthe node \"/chosen@0\" is most likely for real Open Firmware and does\nnot apply to DTSpec, remove all remaining tests and references for\nthat node, of which there are very few left:\n\n arch/microblaze/kernel/prom.c | 3 +--\n arch/mips/generic/yamon-dt.c | 4 ----\n arch/powerpc/boot/oflib.c | 7 ++-----\n drivers/of/base.c | 2 --\n drivers/of/fdt.c | 5 +----\n 5 files changed, 4 insertions(+), 17 deletions(-)\n\nThis should be innocuous as, in all of the three arch/ files above,\nthere is a test for \"chosen\" immediately before the test for\n\"chosen@0\", so nothing should change.\n\nSigned-off-by: Robert P. J. Day \n\n---\n\n if this patch is premature, then just ignore it, thanks.","diff":"diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c\nindex 68f0999..c81bfd7 100644\n--- a/arch/microblaze/kernel/prom.c\n+++ b/arch/microblaze/kernel/prom.c\n@@ -53,8 +53,7 @@ static int __init early_init_dt_scan_chosen_serial(unsigned long node,\n\n \tpr_debug(\"%s: depth: %d, uname: %s\\n\", __func__, depth, uname);\n\n-\tif (depth == 1 && (strcmp(uname, \"chosen\") == 0 ||\n-\t\t\t\tstrcmp(uname, \"chosen@0\") == 0)) {\n+\tif (depth == 1 && (strcmp(uname, \"chosen\") == 0)) {\n \t\tp = of_get_flat_dt_prop(node, \"linux,stdout-path\", &l);\n \t\tif (p != NULL && l > 0)\n \t\t\tstdout = p; /* store pointer to stdout-path */\ndiff --git a/arch/mips/generic/yamon-dt.c b/arch/mips/generic/yamon-dt.c\nindex 6077bca..3a241b2 100644\n--- a/arch/mips/generic/yamon-dt.c\n+++ b/arch/mips/generic/yamon-dt.c\n@@ -28,8 +28,6 @@ __init int yamon_dt_append_cmdline(void *fdt)\n \t/* find or add chosen node */\n \tchosen_off = fdt_path_offset(fdt, \"/chosen\");\n \tif (chosen_off == -FDT_ERR_NOTFOUND)\n-\t\tchosen_off = fdt_path_offset(fdt, \"/chosen@0\");\n-\tif (chosen_off == -FDT_ERR_NOTFOUND)\n \t\tchosen_off = fdt_add_subnode(fdt, 0, \"chosen\");\n \tif (chosen_off < 0) {\n \t\tpr_err(\"Unable to find or add DT chosen node: %d\\n\",\n@@ -221,8 +219,6 @@ __init int yamon_dt_serial_config(void *fdt)\n \t/* find or add chosen node */\n \tchosen_off = fdt_path_offset(fdt, \"/chosen\");\n \tif (chosen_off == -FDT_ERR_NOTFOUND)\n-\t\tchosen_off = fdt_path_offset(fdt, \"/chosen@0\");\n-\tif (chosen_off == -FDT_ERR_NOTFOUND)\n \t\tchosen_off = fdt_add_subnode(fdt, 0, \"chosen\");\n \tif (chosen_off < 0) {\n \t\tpr_err(\"Unable to find or add DT chosen node: %d\\n\",\ndiff --git a/arch/powerpc/boot/oflib.c b/arch/powerpc/boot/oflib.c\nindex 46c98a4..a01471f 100644\n--- a/arch/powerpc/boot/oflib.c\n+++ b/arch/powerpc/boot/oflib.c\n@@ -131,11 +131,8 @@ static int check_of_version(void)\n \t\treturn 0;\n \tchosen = of_finddevice(\"/chosen\");\n \tif (chosen == (phandle) -1) {\n-\t\tchosen = of_finddevice(\"/chosen@0\");\n-\t\tif (chosen == (phandle) -1) {\n-\t\t\tprintf(\"no chosen\\n\");\n-\t\t\treturn 0;\n-\t\t}\n+\t\tprintf(\"no chosen\\n\");\n+\t\treturn 0;\n \t}\n \tif (of_getprop(chosen, \"mmu\", &chosen_mmu, sizeof(chosen_mmu)) <= 0) {\n \t\tprintf(\"no mmu\\n\");\ndiff --git a/drivers/of/base.c b/drivers/of/base.c\nindex 686628d..e0f636d 100644\n--- a/drivers/of/base.c\n+++ b/drivers/of/base.c\n@@ -1659,8 +1659,6 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))\n\n \tof_aliases = of_find_node_by_path(\"/aliases\");\n \tof_chosen = of_find_node_by_path(\"/chosen\");\n-\tif (of_chosen == NULL)\n-\t\tof_chosen = of_find_node_by_path(\"/chosen@0\");\n\n \tif (of_chosen) {\n \t\t/* linux,stdout-path and /aliases/stdout are for legacy compatibility */\ndiff --git a/drivers/of/fdt.c b/drivers/of/fdt.c\nindex ce30c9a..0b0a709 100644\n--- a/drivers/of/fdt.c\n+++ b/drivers/of/fdt.c\n@@ -980,8 +980,6 @@ int __init early_init_dt_scan_chosen_stdout(void)\n\n \toffset = fdt_path_offset(fdt, \"/chosen\");\n \tif (offset < 0)\n-\t\toffset = fdt_path_offset(fdt, \"/chosen@0\");\n-\tif (offset < 0)\n \t\treturn -ENOENT;\n\n \tp = fdt_getprop(fdt, offset, \"stdout-path\", &l);\n@@ -1117,8 +1115,7 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,\n\n \tpr_debug(\"search \\\"chosen\\\", depth: %d, uname: %s\\n\", depth, uname);\n\n-\tif (depth != 1 || !data ||\n-\t (strcmp(uname, \"chosen\") != 0 && strcmp(uname, \"chosen@0\") != 0))\n+\tif (depth != 1 || !data || (strcmp(uname, \"chosen\") != 0))\n \t\treturn 0;\n\n \tearly_init_dt_check_for_initrd(node);\n","prefixes":[]}