{"id":2221289,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2221289/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260409-fix-unit-address-v1-1-946840930af2@iscas.ac.cn>","date":"2026-04-09T06:40:11","name":"[1/5] hw/arm: Fix unit addresses of FDT CPU nodes","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"e57d848f1dea8774c41c4701e07699abf0bc017f","submitter":{"id":91053,"url":"http://patchwork.ozlabs.org/api/1.0/people/91053/?format=json","name":"Vivian Wang","email":"wangruikang@iscas.ac.cn"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260409-fix-unit-address-v1-1-946840930af2@iscas.ac.cn/mbox/","series":[{"id":499239,"url":"http://patchwork.ozlabs.org/api/1.0/series/499239/?format=json","date":"2026-04-09T06:40:10","name":"hw: Fix unit addresses of FDT CPU nodes","version":1,"mbox":"http://patchwork.ozlabs.org/series/499239/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2221289/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":"legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)","Received":["from lists.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4frr296pX1z1yD3\n\tfor ; Thu, 09 Apr 2026 16:41:53 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wAj4T-0007tT-Qf; Thu, 09 Apr 2026 02:40:57 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wAj4N-0007qq-PB; Thu, 09 Apr 2026 02:40:52 -0400","from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn)\n by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256)\n (Exim 4.90_1) (envelope-from )\n id 1wAj4H-0004PT-EA; Thu, 09 Apr 2026 02:40:49 -0400","from [127.0.0.2] (unknown [36.110.52.2])\n by APP-03 (Coremail) with SMTP id rQCowABnht3aSddpeI91DQ--.34096S3;\n Thu, 09 Apr 2026 14:40:27 +0800 (CST)"],"From":"Vivian Wang ","Date":"Thu, 09 Apr 2026 14:40:11 +0800","Subject":"[PATCH 1/5] hw/arm: Fix unit addresses of FDT CPU nodes","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Message-Id":"<20260409-fix-unit-address-v1-1-946840930af2@iscas.ac.cn>","References":"<20260409-fix-unit-address-v1-0-946840930af2@iscas.ac.cn>","In-Reply-To":"<20260409-fix-unit-address-v1-0-946840930af2@iscas.ac.cn>","To":"qemu-devel@nongnu.org","Cc":"Peter Maydell ,\n Leif Lindholm , qemu-arm@nongnu.org,\n Song Gao , Bibo Mao ,\n Jiaxun Yang , Paul Burton ,\n Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu-Daud?=\n\t=?utf-8?q?=C3=A9?= , Jia Liu ,\n Stafford Horne ,\n Alistair Francis ,\n Palmer Dabbelt , Weiwei Li ,\n Daniel Henrique Barboza ,\n Liu Zhiwei ,\n Chao Liu , qemu-riscv@nongnu.org,\n Vivian Wang ","X-Mailer":"b4 0.15.1","X-CM-TRANSID":"rQCowABnht3aSddpeI91DQ--.34096S3","X-Coremail-Antispam":"1UD129KBjvJXoWxAw4xAw17Kw13ArWkur1rJFb_yoW5Gr1rpr\n Z2kFyDtrWIkF45G3ySqFyjk3WrGF15W3y7K39Fk393CFyDuryxWF40yayrKry8Gw1kKFW5\n ZFsYqF97Xas2grJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2\n 9KBjDU0xBIdaVrnRJUUUQYb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I2\n 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI\n 8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK0II2c7xJM28CjxkF\n 64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI8IcV\n CY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E87Iv\n 6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c\n 02F40Ex7xfMcIj6xIIjxv20xvE14v26r1Y6r17McIj6I8E87Iv67AKxVW8JVWxJwAm72CE\n 4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4\n IIrI8v6xkF7I0E8cxan2IY04v7MxkF7I0En4kS14v26r4a6rW5MxAIw28IcxkI7VAKI48J\n MxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwV\n AFwI0_JrI_JrWlx4CE17CEb7AF67AKxVW8ZVWrXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv2\n 0xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4\n v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AK\n xVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU8Q_-DUUUUU==","X-Originating-IP":"[36.110.52.2]","X-CM-SenderInfo":"pzdqw2pxlnt03j6l2u1dvotugofq/","Received-SPF":"pass client-ip=159.226.251.81;\n envelope-from=wangruikang@iscas.ac.cn; helo=cstnet.cn","X-Spam_score_int":"-41","X-Spam_score":"-4.2","X-Spam_bar":"----","X-Spam_report":"(-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"The node unit addresses should be based on the reg value (which is in\nturn based on MPIDR), rather than some arbitrary number [1]. Also, they\nshould have been in hex, not decimal, as per de facto convention [2].\nFix them.\n\nLink: https://github.com/devicetree-org/devicetree-specification/blob/v0.4/source/chapter2-devicetree-basics.rst#devicetree-structure-and-conventions # [1]\nLink: https://lore.kernel.org/devicetree-spec/CAL_JsqJFv3+UJ-bjLGk0i7Wc+spsowCrqQZ_s3P4gN8r1W-Q-w@mail.gmail.com/ # [2]\nSigned-off-by: Vivian Wang \n---\n hw/arm/sbsa-ref.c | 4 ++--\n hw/arm/virt.c | 7 +++++--\n 2 files changed, 7 insertions(+), 4 deletions(-)","diff":"diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c\nindex 52c35e10c2..7fd631bff5 100644\n--- a/hw/arm/sbsa-ref.c\n+++ b/hw/arm/sbsa-ref.c\n@@ -259,10 +259,10 @@ static void create_fdt(SBSAMachineState *sms)\n qemu_fdt_setprop_cell(sms->fdt, \"/cpus\", \"#size-cells\", 0x0);\n \n for (cpu = sms->smp_cpus - 1; cpu >= 0; cpu--) {\n- char *nodename = g_strdup_printf(\"/cpus/cpu@%d\", cpu);\n+ uint64_t mpidr = sbsa_ref_cpu_mp_affinity(sms, cpu);\n+ char *nodename = g_strdup_printf(\"/cpus/cpu@%\" PRIx64, mpidr);\n ARMCPU *armcpu = ARM_CPU(qemu_get_cpu(cpu));\n CPUState *cs = CPU(armcpu);\n- uint64_t mpidr = sbsa_ref_cpu_mp_affinity(sms, cpu);\n \n qemu_fdt_add_subnode(sms->fdt, nodename);\n qemu_fdt_setprop_u64(sms->fdt, nodename, \"reg\", mpidr);\ndiff --git a/hw/arm/virt.c b/hw/arm/virt.c\nindex ec0d8475ca..20d62cc311 100644\n--- a/hw/arm/virt.c\n+++ b/hw/arm/virt.c\n@@ -466,8 +466,9 @@ static void fdt_add_cpu_nodes(const VirtMachineState *vms)\n qemu_fdt_setprop_cell(ms->fdt, \"/cpus\", \"#size-cells\", 0x0);\n \n for (cpu = smp_cpus - 1; cpu >= 0; cpu--) {\n- char *nodename = g_strdup_printf(\"/cpus/cpu@%d\", cpu);\n ARMCPU *armcpu = ARM_CPU(qemu_get_cpu(cpu));\n+ char *nodename = g_strdup_printf(\"/cpus/cpu@%\" PRIx64,\n+ arm_cpu_mp_affinity(armcpu));\n CPUState *cs = CPU(armcpu);\n \n qemu_fdt_add_subnode(ms->fdt, nodename);\n@@ -521,7 +522,9 @@ static void fdt_add_cpu_nodes(const VirtMachineState *vms)\n qemu_fdt_add_subnode(ms->fdt, \"/cpus/cpu-map\");\n \n for (cpu = smp_cpus - 1; cpu >= 0; cpu--) {\n- char *cpu_path = g_strdup_printf(\"/cpus/cpu@%d\", cpu);\n+ ARMCPU *armcpu = ARM_CPU(qemu_get_cpu(cpu));\n+ char *cpu_path = g_strdup_printf(\"/cpus/cpu@%\" PRIx64,\n+ arm_cpu_mp_affinity(armcpu));\n char *map_path;\n \n if (ms->smp.threads > 1) {\n","prefixes":["1/5"]}