From nobody Sat Apr 11 17:11:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775716912596755.2972350701439; Wed, 8 Apr 2026 23:41:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wAj4T-0007tT-Qf; Thu, 09 Apr 2026 02:40:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wAj4N-0007qq-PB; Thu, 09 Apr 2026 02:40:52 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1wAj4H-0004PT-EA; Thu, 09 Apr 2026 02:40:49 -0400 Received: from [127.0.0.2] (unknown [36.110.52.2]) by APP-03 (Coremail) with SMTP id rQCowABnht3aSddpeI91DQ--.34096S3; 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: quoted-printable 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 , Leif Lindholm , qemu-arm@nongnu.org, Song Gao , Bibo Mao , Jiaxun Yang , Paul Burton , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jia Liu , Stafford Horne , Alistair Francis , Palmer Dabbelt , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu , qemu-riscv@nongnu.org, Vivian Wang X-Mailer: b4 0.15.1 X-CM-TRANSID: rQCowABnht3aSddpeI91DQ--.34096S3 X-Coremail-Antispam: 1UD129KBjvJXoWxAw4xAw17Kw13ArWkur1rJFb_yoW5Gr1rpr Z2kFyDtrWIkF45G3ySqFyjk3WrGF15W3y7K39Fk393CFyDuryxWF40yayrKry8Gw1kKFW5 ZFsYqF97Xas2grJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUQYb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK0II2c7xJM28CjxkF 64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI8IcV CY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E87Iv 6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c 02F40Ex7xfMcIj6xIIjxv20xvE14v26r1Y6r17McIj6I8E87Iv67AKxVW8JVWxJwAm72CE 4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4 IIrI8v6xkF7I0E8cxan2IY04v7MxkF7I0En4kS14v26r4a6rW5MxAIw28IcxkI7VAKI48J MxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwV AFwI0_JrI_JrWlx4CE17CEb7AF67AKxVW8ZVWrXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv2 0xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4 v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AK xVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU8Q_-DUUUUU== X-Originating-IP: [36.110.52.2] X-CM-SenderInfo: pzdqw2pxlnt03j6l2u1dvotugofq/ Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=159.226.251.81; 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1775716914226158500 The node unit addresses should be based on the reg value (which is in turn based on MPIDR), rather than some arbitrary number [1]. Also, they should have been in hex, not decimal, as per de facto convention [2]. Fix them. Link: https://github.com/devicetree-org/devicetree-specification/blob/v0.4/= source/chapter2-devicetree-basics.rst#devicetree-structure-and-conventions = # [1] Link: https://lore.kernel.org/devicetree-spec/CAL_JsqJFv3+UJ-bjLGk0i7Wc+sps= owCrqQZ_s3P4gN8r1W-Q-w@mail.gmail.com/ # [2] Signed-off-by: Vivian Wang Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/sbsa-ref.c | 4 ++-- hw/arm/virt.c | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 52c35e10c2..7fd631bff5 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -259,10 +259,10 @@ static void create_fdt(SBSAMachineState *sms) qemu_fdt_setprop_cell(sms->fdt, "/cpus", "#size-cells", 0x0); =20 for (cpu =3D sms->smp_cpus - 1; cpu >=3D 0; cpu--) { - char *nodename =3D g_strdup_printf("/cpus/cpu@%d", cpu); + uint64_t mpidr =3D sbsa_ref_cpu_mp_affinity(sms, cpu); + char *nodename =3D g_strdup_printf("/cpus/cpu@%" PRIx64, mpidr); ARMCPU *armcpu =3D ARM_CPU(qemu_get_cpu(cpu)); CPUState *cs =3D CPU(armcpu); - uint64_t mpidr =3D sbsa_ref_cpu_mp_affinity(sms, cpu); =20 qemu_fdt_add_subnode(sms->fdt, nodename); qemu_fdt_setprop_u64(sms->fdt, nodename, "reg", mpidr); diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ec0d8475ca..20d62cc311 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -466,8 +466,9 @@ static void fdt_add_cpu_nodes(const VirtMachineState *v= ms) qemu_fdt_setprop_cell(ms->fdt, "/cpus", "#size-cells", 0x0); =20 for (cpu =3D smp_cpus - 1; cpu >=3D 0; cpu--) { - char *nodename =3D g_strdup_printf("/cpus/cpu@%d", cpu); ARMCPU *armcpu =3D ARM_CPU(qemu_get_cpu(cpu)); + char *nodename =3D g_strdup_printf("/cpus/cpu@%" PRIx64, + arm_cpu_mp_affinity(armcpu)); CPUState *cs =3D CPU(armcpu); =20 qemu_fdt_add_subnode(ms->fdt, nodename); @@ -521,7 +522,9 @@ static void fdt_add_cpu_nodes(const VirtMachineState *v= ms) qemu_fdt_add_subnode(ms->fdt, "/cpus/cpu-map"); =20 for (cpu =3D smp_cpus - 1; cpu >=3D 0; cpu--) { - char *cpu_path =3D g_strdup_printf("/cpus/cpu@%d", cpu); + ARMCPU *armcpu =3D ARM_CPU(qemu_get_cpu(cpu)); + char *cpu_path =3D g_strdup_printf("/cpus/cpu@%" PRIx64, + arm_cpu_mp_affinity(armcpu)); char *map_path; =20 if (ms->smp.threads > 1) { --=20 2.53.0 From nobody Sat Apr 11 17:11:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775716897184942.2507037339956; Wed, 8 Apr 2026 23:41:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wAj4S-0007sB-VO; Thu, 09 Apr 2026 02:40:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wAj4L-0007qe-Rf; Thu, 09 Apr 2026 02:40:51 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1wAj4H-0004PS-EC; Thu, 09 Apr 2026 02:40:49 -0400 Received: from [127.0.0.2] (unknown [36.110.52.2]) by APP-03 (Coremail) with SMTP id rQCowABnht3aSddpeI91DQ--.34096S4; Thu, 09 Apr 2026 14:40:27 +0800 (CST) From: Vivian Wang Date: Thu, 09 Apr 2026 14:40:12 +0800 Subject: [PATCH 2/5] hw/loongarch: Use hex unit addresses in FDT CPU nodes MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260409-fix-unit-address-v1-2-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 , Leif Lindholm , qemu-arm@nongnu.org, Song Gao , Bibo Mao , Jiaxun Yang , Paul Burton , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jia Liu , Stafford Horne , Alistair Francis , Palmer Dabbelt , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu , qemu-riscv@nongnu.org, Vivian Wang X-Mailer: b4 0.15.1 X-CM-TRANSID: rQCowABnht3aSddpeI91DQ--.34096S4 X-Coremail-Antispam: 1UD129KBjvJXoW7GF4xtFWrWFW8uw4DuF4rXwb_yoW8JrW3p3 929asrJrZ7KrZrJ342yFyY9F15KFn8Gw42qa9Fgw40yr9rWr18uF1IyrWqvFyUJa4rJF4r ZFs5tF93Xas0y3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUmF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1l e2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI 8IcVAFwI0_Jrv_JF1lYx0Ex4A2jsIE14v26r4j6F4UMcvjeVCFs4IE7xkEbVWUJVW8JwAC jcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxcIEc7CjxVA2Y2ka0x kIwI1lc7CjxVAaw2AFwI0_GFv_Wryl42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_ Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1V AY17CE14v26r4a6rW5MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAI cVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIx AIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2 KfnxnUUI43ZEXa7sREHGQ3UUUUU== X-Originating-IP: [36.110.52.2] X-CM-SenderInfo: pzdqw2pxlnt03j6l2u1dvotugofq/ Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=159.226.251.81; 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1775716900675158500 These unit addresses should have been in hex, not decimal, as per de facto convention [1]. Fix them. Link: https://lore.kernel.org/devicetree-spec/CAL_JsqJFv3+UJ-bjLGk0i7Wc+sps= owCrqQZ_s3P4gN8r1W-Q-w@mail.gmail.com/ # [1] Signed-off-by: Vivian Wang Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/loongarch/virt-fdt-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/loongarch/virt-fdt-build.c b/hw/loongarch/virt-fdt-build.c index 6c06b36fca..5875c6d9ae 100644 --- a/hw/loongarch/virt-fdt-build.c +++ b/hw/loongarch/virt-fdt-build.c @@ -66,7 +66,7 @@ static void fdt_add_cpu_nodes(const LoongArchVirtMachineS= tate *lvms) continue; } =20 - nodename =3D g_strdup_printf("/cpus/cpu@%d", num); + nodename =3D g_strdup_printf("/cpus/cpu@%x", (unsigned)num); cpu =3D LOONGARCH_CPU(cs); =20 qemu_fdt_add_subnode(ms->fdt, nodename); @@ -91,7 +91,7 @@ static void fdt_add_cpu_nodes(const LoongArchVirtMachineS= tate *lvms) continue; } =20 - nodename =3D g_strdup_printf("/cpus/cpu@%d", num); + nodename =3D g_strdup_printf("/cpus/cpu@%x", (unsigned)num); if (ms->smp.threads > 1) { map_path =3D g_strdup_printf( "/cpus/cpu-map/socket%d/core%d/thread%d", --=20 2.53.0 From nobody Sat Apr 11 17:11:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17757169315921015.7870105422257; Wed, 8 Apr 2026 23:42:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wAj4V-0007tg-6F; Thu, 09 Apr 2026 02:40:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wAj4N-0007qy-QO; Thu, 09 Apr 2026 02:40:52 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1wAj4H-0004Pl-FD; Thu, 09 Apr 2026 02:40:50 -0400 Received: from [127.0.0.2] (unknown [36.110.52.2]) by APP-03 (Coremail) with SMTP id rQCowABnht3aSddpeI91DQ--.34096S5; Thu, 09 Apr 2026 14:40:27 +0800 (CST) From: Vivian Wang Date: Thu, 09 Apr 2026 14:40:13 +0800 Subject: [PATCH 3/5] hw/mips: Use hex unit addresses in FDT CPU nodes MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260409-fix-unit-address-v1-3-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 , Leif Lindholm , qemu-arm@nongnu.org, Song Gao , Bibo Mao , Jiaxun Yang , Paul Burton , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jia Liu , Stafford Horne , Alistair Francis , Palmer Dabbelt , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu , qemu-riscv@nongnu.org, Vivian Wang X-Mailer: b4 0.15.1 X-CM-TRANSID: rQCowABnht3aSddpeI91DQ--.34096S5 X-Coremail-Antispam: 1UD129KBjvdXoW7GF4xtFWrWFW8uw4DuF4rXwb_yoWDGwbE9a 9FvrnYva1DJry2gF93Zr9FyFyrJ345XF1I9an7Kr43t348ArWrA3ZY9rWDJry5XrW8Cry3 u3s8Xr15KanxtjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbkAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY02 0Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM2 8EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUXVWUAwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2kIc2 xKxwCY1x0262kKe7AKxVW8ZVWrXwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWU JVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67 kF1VAFwI0_GFv_WrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY 6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42 IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIev Ja73UjIFyTuYvjTRuzuWDUUUU X-Originating-IP: [36.110.52.2] X-CM-SenderInfo: pzdqw2pxlnt03j6l2u1dvotugofq/ Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=159.226.251.81; 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1775716932519154100 These unit addresses should have been in hex, not decimal, as per de facto convention [1]. Fix them. Link: https://lore.kernel.org/devicetree-spec/CAL_JsqJFv3+UJ-bjLGk0i7Wc+sps= owCrqQZ_s3P4gN8r1W-Q-w@mail.gmail.com/ # [1] Signed-off-by: Vivian Wang Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/boston.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 4579df23eb..9ef3f6c814 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -542,7 +542,7 @@ static const void *create_fdt(BostonState *s, qemu_fdt_setprop_cell(fdt, "/cpus", "#address-cells", 0x1); =20 for (cpu =3D 0; cpu < ms->smp.cpus; cpu++) { - name =3D g_strdup_printf("/cpus/cpu@%d", cpu); + name =3D g_strdup_printf("/cpus/cpu@%x", (unsigned)cpu); qemu_fdt_add_subnode(fdt, name); qemu_fdt_setprop_string(fdt, name, "compatible", "img,mips"); qemu_fdt_setprop_string(fdt, name, "status", "okay"); --=20 2.53.0 From nobody Sat Apr 11 17:11:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775716930076154.84897193634515; Wed, 8 Apr 2026 23:42:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wAj4V-0007tf-5O; Thu, 09 Apr 2026 02:40:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wAj4N-0007qr-P9; Thu, 09 Apr 2026 02:40:52 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1wAj4H-0004PV-FD; Thu, 09 Apr 2026 02:40:50 -0400 Received: from [127.0.0.2] (unknown [36.110.52.2]) by APP-03 (Coremail) with SMTP id rQCowABnht3aSddpeI91DQ--.34096S6; Thu, 09 Apr 2026 14:40:27 +0800 (CST) From: Vivian Wang Date: Thu, 09 Apr 2026 14:40:14 +0800 Subject: [PATCH 4/5] hw/or1k: Use hex unit addresses in FDT CPU nodes MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260409-fix-unit-address-v1-4-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 , Leif Lindholm , qemu-arm@nongnu.org, Song Gao , Bibo Mao , Jiaxun Yang , Paul Burton , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jia Liu , Stafford Horne , Alistair Francis , Palmer Dabbelt , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu , qemu-riscv@nongnu.org, Vivian Wang X-Mailer: b4 0.15.1 X-CM-TRANSID: rQCowABnht3aSddpeI91DQ--.34096S6 X-Coremail-Antispam: 1UD129KBjvJXoW7KFyUXF1fZr4UKF1rJr48tFb_yoW8Wr4Dpa 97Aa4UtryxtrW7Ga9avF1UC3WrtrnxXr47WFZ3uw48Arn8Xry7WF1Iy393tryUXF95tF4a qFZ3GFy0qw1vgrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUma14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE 3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2I x0cI8IcVAFwI0_Jrv_JF1lYx0Ex4A2jsIE14v26r4j6F4UMcvjeVCFs4IE7xkEbVWUJVW8 JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxcIEc7CjxVA2Y2 ka0xkIwI1lc7CjxVAaw2AFwI0_GFv_Wryl42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Y z7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zV AF1VAY17CE14v26r4a6rW5MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4l IxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF 4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsG vfC2KfnxnUUI43ZEXa7sREBOJ5UUUUU== X-Originating-IP: [36.110.52.2] X-CM-SenderInfo: pzdqw2pxlnt03j6l2u1dvotugofq/ Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=159.226.251.81; 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1775716932528154100 These unit addresses should have been in hex, not decimal, as per de facto convention [1]. Fix them. Link: https://lore.kernel.org/devicetree-spec/CAL_JsqJFv3+UJ-bjLGk0i7Wc+sps= owCrqQZ_s3P4gN8r1W-Q-w@mail.gmail.com/ # [1] Signed-off-by: Vivian Wang Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/or1k/or1k-sim.c | 2 +- hw/or1k/virt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/or1k/or1k-sim.c b/hw/or1k/or1k-sim.c index f1b1f63274..b851e48c16 100644 --- a/hw/or1k/or1k-sim.c +++ b/hw/or1k/or1k-sim.c @@ -138,7 +138,7 @@ static void openrisc_create_fdt(Or1ksimState *state, qemu_fdt_setprop_cell(fdt, "/cpus", "#address-cells", 0x1); =20 for (cpu =3D 0; cpu < num_cpus; cpu++) { - nodename =3D g_strdup_printf("/cpus/cpu@%d", cpu); + nodename =3D g_strdup_printf("/cpus/cpu@%x", (unsigned)cpu); qemu_fdt_add_subnode(fdt, nodename); qemu_fdt_setprop_string(fdt, nodename, "compatible", "opencores,or1200-rtlsvn481"); diff --git a/hw/or1k/virt.c b/hw/or1k/virt.c index 39f54058ab..ac644f128e 100644 --- a/hw/or1k/virt.c +++ b/hw/or1k/virt.c @@ -162,7 +162,7 @@ static void openrisc_create_fdt(OR1KVirtState *state, qemu_fdt_setprop_cell(fdt, "/cpus", "#address-cells", 0x1); =20 for (cpu =3D 0; cpu < num_cpus; cpu++) { - nodename =3D g_strdup_printf("/cpus/cpu@%d", cpu); + nodename =3D g_strdup_printf("/cpus/cpu@%x", (unsigned)cpu); qemu_fdt_add_subnode(fdt, nodename); qemu_fdt_setprop_string(fdt, nodename, "compatible", "opencores,or1200-rtlsvn481"); --=20 2.53.0 From nobody Sat Apr 11 17:11:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775716897584869.8116455277984; Wed, 8 Apr 2026 23:41:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wAj4U-0007te-Us; Thu, 09 Apr 2026 02:40:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wAj4N-0007qz-QV; Thu, 09 Apr 2026 02:40:52 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1wAj4H-0004PW-Du; Thu, 09 Apr 2026 02:40:50 -0400 Received: from [127.0.0.2] (unknown [36.110.52.2]) by APP-03 (Coremail) with SMTP id rQCowABnht3aSddpeI91DQ--.34096S7; Thu, 09 Apr 2026 14:40:27 +0800 (CST) From: Vivian Wang Date: Thu, 09 Apr 2026 14:40:15 +0800 Subject: [PATCH 5/5] hw/riscv: Use hex unit addresses in FDT CPU nodes MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260409-fix-unit-address-v1-5-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 , Leif Lindholm , qemu-arm@nongnu.org, Song Gao , Bibo Mao , Jiaxun Yang , Paul Burton , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jia Liu , Stafford Horne , Alistair Francis , Palmer Dabbelt , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu , qemu-riscv@nongnu.org, Vivian Wang X-Mailer: b4 0.15.1 X-CM-TRANSID: rQCowABnht3aSddpeI91DQ--.34096S7 X-Coremail-Antispam: 1UD129KBjvJXoWxuryrZF1fWw15Zr1UCw48WFg_yoW5uw1rpF WkKFnIv348tF43WaySya4jyr1a9rnxW347K397C397Jr45ury5XFn2ya40yryDKa4kXa15 ZFZ5WryYq3Zavr7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUmq14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE 3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2I x0cI8IcVAFwI0_Jrv_JF1lYx0Ex4A2jsIE14v26r4j6F4UMcvjeVCFs4IE7xkEbVWUJVW8 JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxcIEc7CjxVA2Y2 ka0xkIwI1lc7CjxVAaw2AFwI0_GFv_Wryl42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Y z7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zV AF1VAY17CE14v26r4a6rW5MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1l IxAIcVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r 1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIY CTnIWIevJa73UjIFyTuYvjTRZfHUDUUUU X-Originating-IP: [36.110.52.2] X-CM-SenderInfo: pzdqw2pxlnt03j6l2u1dvotugofq/ Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=159.226.251.81; 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1775716900844158500 These unit addresses should have been in hex, not decimal, as per de facto convention [1]. Fix them. Link: https://lore.kernel.org/devicetree-spec/CAL_JsqJFv3+UJ-bjLGk0i7Wc+sps= owCrqQZ_s3P4gN8r1W-Q-w@mail.gmail.com/ # [1] Signed-off-by: Vivian Wang Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/riscv/sifive_u.c | 9 +++++---- hw/riscv/spike.c | 4 ++-- hw/riscv/virt.c | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 7ec67b2565..54f3bcc3b2 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -168,8 +168,9 @@ static void create_fdt(SiFiveUState *s, const MemMapEnt= ry *memmap, =20 for (cpu =3D ms->smp.cpus - 1; cpu >=3D 0; cpu--) { int cpu_phandle =3D phandle++; - nodename =3D g_strdup_printf("/cpus/cpu@%d", cpu); - char *intc =3D g_strdup_printf("/cpus/cpu@%d/interrupt-controller"= , cpu); + nodename =3D g_strdup_printf("/cpus/cpu@%x", (unsigned)cpu); + char *intc =3D g_strdup_printf("/cpus/cpu@%x/interrupt-controller", + (unsigned)cpu); qemu_fdt_add_subnode(fdt, nodename); /* cpu 0 is the management hart that does not have mmu */ if (cpu !=3D 0) { @@ -198,7 +199,7 @@ static void create_fdt(SiFiveUState *s, const MemMapEnt= ry *memmap, cells =3D g_new0(uint32_t, ms->smp.cpus * 4); for (cpu =3D 0; cpu < ms->smp.cpus; cpu++) { nodename =3D - g_strdup_printf("/cpus/cpu@%d/interrupt-controller", cpu); + g_strdup_printf("/cpus/cpu@%x/interrupt-controller", (unsigned= )cpu); uint32_t intc_phandle =3D qemu_fdt_get_phandle(fdt, nodename); cells[cpu * 4 + 0] =3D cpu_to_be32(intc_phandle); cells[cpu * 4 + 1] =3D cpu_to_be32(IRQ_M_SOFT); @@ -249,7 +250,7 @@ static void create_fdt(SiFiveUState *s, const MemMapEnt= ry *memmap, cells =3D g_new0(uint32_t, ms->smp.cpus * 4 - 2); for (cpu =3D 0; cpu < ms->smp.cpus; cpu++) { nodename =3D - g_strdup_printf("/cpus/cpu@%d/interrupt-controller", cpu); + g_strdup_printf("/cpus/cpu@%x/interrupt-controller", (unsigned= )cpu); uint32_t intc_phandle =3D qemu_fdt_get_phandle(fdt, nodename); /* cpu 0 is the management hart that does not have S-mode */ if (cpu =3D=3D 0) { diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 35c696f891..cac01ea1ff 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -105,8 +105,8 @@ static void create_fdt(SpikeState *s, const MemMapEntry= *memmap, for (cpu =3D s->soc[socket].num_harts - 1; cpu >=3D 0; cpu--) { cpu_phandle =3D phandle++; =20 - cpu_name =3D g_strdup_printf("/cpus/cpu@%d", - s->soc[socket].hartid_base + cpu); + cpu_name =3D g_strdup_printf("/cpus/cpu@%" PRIx32, + s->soc[socket].hartid_base + (uint32_t)cpu); qemu_fdt_add_subnode(fdt, cpu_name); if (is_32_bit) { qemu_fdt_setprop_string(fdt, cpu_name, "mmu-type", "riscv,= sv32"); diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index a1c323e66d..42a83dd829 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -248,8 +248,8 @@ static void create_fdt_socket_cpus(RISCVVirtState *s, i= nt socket, =20 cpu_phandle =3D (*phandle)++; =20 - cpu_name =3D g_strdup_printf("/cpus/cpu@%d", - s->soc[socket].hartid_base + cpu); + cpu_name =3D g_strdup_printf("/cpus/cpu@%" PRIx32, + s->soc[socket].hartid_base + (uint32_t)cpu); qemu_fdt_add_subnode(ms->fdt, cpu_name); =20 if (satp_mode_max !=3D -1) { --=20 2.53.0