From nobody Mon May 25 20:34:57 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177820891795348.535618186276906; Thu, 7 May 2026 19:55:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wLBM4-000795-3t; Thu, 07 May 2026 22:54:20 -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 1wLBM1-00078H-JG for qemu-devel@nongnu.org; Thu, 07 May 2026 22:54:17 -0400 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wLBLz-0003qt-P6 for qemu-devel@nongnu.org; Thu, 07 May 2026 22:54:17 -0400 Received: from loongson.cn (unknown [10.2.5.185]) by gateway (Coremail) with SMTP id _____8Ax6HhUUP1pJsEHAA--.254S3; Fri, 08 May 2026 10:54:12 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.185]) by front1 (Coremail) with SMTP id qMiowJBx68FEUP1p3qd8AA--.38421S3; Fri, 08 May 2026 10:54:10 +0800 (CST) From: Song Gao To: qemu-devel@nongnu.org Cc: Bibo Mao Subject: [PULL 1/3] hw/loongarch/virt: Define virt machine type with type_init() Date: Fri, 8 May 2026 10:27:59 +0800 Message-Id: <20260508022801.2637558-2-gaosong@loongson.cn> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260508022801.2637558-1-gaosong@loongson.cn> References: <20260508022801.2637558-1-gaosong@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowJBx68FEUP1p3qd8AA--.38421S3 X-CM-SenderInfo: 5jdr20tqj6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== 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=lists1p.gnu.org; Received-SPF: pass client-ip=114.242.206.163; envelope-from=gaosong@loongson.cn; helo=mail.loongson.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=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: 1778208922253158500 Content-Type: text/plain; charset="utf-8" From: Bibo Mao Define virt machine with function type_init(), so that qemu versioned virt machine can be added in later with similar method. Signed-off-by: Bibo Mao Reviewed-by: Song Gao Signed-off-by: Song Gao --- hw/loongarch/virt.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index 2fc1526130..c134b102c2 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -1535,18 +1535,21 @@ static void virt_class_init(ObjectClass *oc, const = void *data) "for PCI MMIO"); } =20 -static const TypeInfo virt_machine_types[] =3D { - { - .name =3D TYPE_LOONGARCH_VIRT_MACHINE, - .parent =3D TYPE_MACHINE, - .instance_size =3D sizeof(LoongArchVirtMachineState), - .class_init =3D virt_class_init, - .instance_init =3D virt_initfn, - .interfaces =3D (const InterfaceInfo[]) { - { TYPE_HOTPLUG_HANDLER }, - { } - }, - } +static const TypeInfo virt_machine_info =3D { + .name =3D TYPE_LOONGARCH_VIRT_MACHINE, + .parent =3D TYPE_MACHINE, + .instance_size =3D sizeof(LoongArchVirtMachineState), + .class_init =3D virt_class_init, + .instance_init =3D virt_initfn, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_HOTPLUG_HANDLER }, + { } + }, }; =20 -DEFINE_TYPES(virt_machine_types) +static void machvirt_machine_init(void) +{ + type_register_static(&virt_machine_info); +} + +type_init(machvirt_machine_init); --=20 2.54.0 From nobody Mon May 25 20:34:57 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778208918064960.9695543981446; Thu, 7 May 2026 19:55:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wLBM4-00079Q-GR; Thu, 07 May 2026 22:54:20 -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 1wLBM2-00078V-FJ for qemu-devel@nongnu.org; Thu, 07 May 2026 22:54:18 -0400 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wLBLz-0003r4-Sj for qemu-devel@nongnu.org; Thu, 07 May 2026 22:54:18 -0400 Received: from loongson.cn (unknown [10.2.5.185]) by gateway (Coremail) with SMTP id _____8CxRXhUUP1pJ8EHAA--.275S3; Fri, 08 May 2026 10:54:12 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.185]) by front1 (Coremail) with SMTP id qMiowJBx68FEUP1p3qd8AA--.38421S4; Fri, 08 May 2026 10:54:12 +0800 (CST) From: Song Gao To: qemu-devel@nongnu.org Cc: Bibo Mao Subject: [PULL 2/3] hw/loongarch/virt: Define versioned virt machine Date: Fri, 8 May 2026 10:28:00 +0800 Message-Id: <20260508022801.2637558-3-gaosong@loongson.cn> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260508022801.2637558-1-gaosong@loongson.cn> References: <20260508022801.2637558-1-gaosong@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowJBx68FEUP1p3qd8AA--.38421S4 X-CM-SenderInfo: 5jdr20tqj6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== 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=lists1p.gnu.org; Received-SPF: pass client-ip=114.242.206.163; envelope-from=gaosong@loongson.cn; helo=mail.loongson.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=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: 1778208922267158500 Content-Type: text/plain; charset="utf-8" From: Bibo Mao Add versioned virt machine started from QEMU 11.1 Signed-off-by: Bibo Mao Reviewed-by: Song Gao Signed-off-by: Song Gao --- hw/loongarch/virt.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index c134b102c2..f68ccdb12b 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -1535,9 +1535,41 @@ static void virt_class_init(ObjectClass *oc, const v= oid *data) "for PCI MMIO"); } =20 +#define DEFINE_VIRT_MACHINE_VERSION(latest, ...) \ + static void MACHINE_VER_SYM(class_init, virt, __VA_ARGS__)( \ + ObjectClass *oc, \ + const void *data) \ + { \ + MachineClass *mc =3D MACHINE_CLASS(oc); \ + MACHINE_VER_SYM(options, virt, __VA_ARGS__)(mc); \ + mc->desc =3D "QEMU " MACHINE_VER_STR(__VA_ARGS__) " LoongArch Virt= ual Machine"; \ + MACHINE_VER_DEPRECATION(__VA_ARGS__); \ + if (latest) { \ + mc->alias =3D "virt"; \ + } \ + } \ + static const TypeInfo MACHINE_VER_SYM(info, virt, __VA_ARGS__) =3D \ + { \ + .name =3D MACHINE_VER_TYPE_NAME("virt", __VA_ARGS__), \ + .parent =3D TYPE_LOONGARCH_VIRT_MACHINE, \ + .class_init =3D MACHINE_VER_SYM(class_init, virt, __VA_ARGS__), \ + }; \ + static void MACHINE_VER_SYM(register, virt, __VA_ARGS__)(void) \ + { \ + MACHINE_VER_DELETION(__VA_ARGS__); \ + type_register_static(&MACHINE_VER_SYM(info, virt, __VA_ARGS__)); \ + } \ + type_init(MACHINE_VER_SYM(register, virt, __VA_ARGS__)); + +#define DEFINE_VIRT_MACHINE_AS_LATEST(major, minor) \ + DEFINE_VIRT_MACHINE_VERSION(true, major, minor) +#define DEFINE_VIRT_MACHINE(major, minor) \ + DEFINE_VIRT_MACHINE_VERSION(false, major, minor) + static const TypeInfo virt_machine_info =3D { .name =3D TYPE_LOONGARCH_VIRT_MACHINE, .parent =3D TYPE_MACHINE, + .abstract =3D true, .instance_size =3D sizeof(LoongArchVirtMachineState), .class_init =3D virt_class_init, .instance_init =3D virt_initfn, @@ -1553,3 +1585,8 @@ static void machvirt_machine_init(void) } =20 type_init(machvirt_machine_init); + +static void virt_machine_11_1_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 1) --=20 2.54.0 From nobody Mon May 25 20:34:57 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778208919245551.8206992682506; Thu, 7 May 2026 19:55:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wLBM4-00079M-M0; Thu, 07 May 2026 22:54:20 -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 1wLBM2-00078e-Pp for qemu-devel@nongnu.org; Thu, 07 May 2026 22:54:18 -0400 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wLBLz-0003rJ-S2 for qemu-devel@nongnu.org; Thu, 07 May 2026 22:54:18 -0400 Received: from loongson.cn (unknown [10.2.5.185]) by gateway (Coremail) with SMTP id _____8DxrOlVUP1pKMEHAA--.23102S3; Fri, 08 May 2026 10:54:13 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.185]) by front1 (Coremail) with SMTP id qMiowJBx68FEUP1p3qd8AA--.38421S5; Fri, 08 May 2026 10:54:12 +0800 (CST) From: Song Gao To: qemu-devel@nongnu.org Cc: Bibo Mao Subject: [PULL 3/3] target/loongarch: Add support for dbar hint variants Date: Fri, 8 May 2026 10:28:01 +0800 Message-Id: <20260508022801.2637558-4-gaosong@loongson.cn> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20260508022801.2637558-1-gaosong@loongson.cn> References: <20260508022801.2637558-1-gaosong@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowJBx68FEUP1p3qd8AA--.38421S5 X-CM-SenderInfo: 5jdr20tqj6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== 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=lists1p.gnu.org; Received-SPF: pass client-ip=114.242.206.163; envelope-from=gaosong@loongson.cn; helo=mail.loongson.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=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: 1778208925737154100 Content-Type: text/plain; charset="utf-8" LoongArch architecture (since LA664) introduces fine-grained dbar hints that allow controlling which memory accesses are ordered by the barrier. Previously, all dbar instructions were treated as a full barrier (TCG_MO_ALL | TCG_BAR_SC). This patch adds support for decoding dbar hints and emitting the appropriate TCG memory barrier flags. For CPUs that do not advertise the DBAR_HINTS feature (cpucfg3.DBAR_HINTS =3D 0), all dbar hints fall back to a full barrier, preserving compatibility. The hint encoding follows the LoongArch v1.10 specification: The hint is a 5-bit field (bits 4-0). Bit4 is reserved and currently ignored/discarded. Only bits 3-0 are used for ordering control. * Bit3: barrier for previous read (0: true, 1: false) * Bit2: barrier for previous write (0: true, 1: false) * Bit1: barrier for succeeding read (0: true, 1: false) * Bit0: barrier for succeeding write (0: true, 1: false) The mapping to TCG memory order flags is as follows: TCG_BAR_SC |TCG_MO_LD_LD | TCG_MO_LD_ST; TCG_BAR_SC |TCG_MO_ST_LD | TCG_MO_ST_ST; TCG_BAR_SC |TCG_MO_LD_LD | TCG_MO_ST_LD; TCG_BAR_SC |TCG_MO_ST_ST | TCG_MO_LD_ST; Special hint handling: - hint 0x700: LL/SC loop barrier, treated as a full barrier as recommended. - hint 0xf and 0x1f: reserved/no-op, treated as no operation Signed-off-by: Song Gao Reviewed-by: Bibo Mao --- target/loongarch/cpu.c | 4 ++ .../tcg/insn_trans/trans_memory.c.inc | 63 ++++++++++++++++++- target/loongarch/tcg/translate.c | 1 + target/loongarch/translate.h | 3 + 4 files changed, 69 insertions(+), 2 deletions(-) diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index e22568c84a..d8d106b07e 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -455,6 +455,10 @@ static void loongarch_max_initfn(Object *obj) data =3D FIELD_DP32(data, CPUCFG2, LLACQ_SCREL, 1); data =3D FIELD_DP32(data, CPUCFG2, SCQ, 1); cpu->env.cpucfg[2] =3D data; + + data =3D cpu->env.cpucfg[3]; + data =3D FIELD_DP32(data, CPUCFG3, DBAR_HINTS, 1); + cpu->env.cpucfg[3] =3D data; } } =20 diff --git a/target/loongarch/tcg/insn_trans/trans_memory.c.inc b/target/lo= ongarch/tcg/insn_trans/trans_memory.c.inc index e287d46363..dcecf02e54 100644 --- a/target/loongarch/tcg/insn_trans/trans_memory.c.inc +++ b/target/loongarch/tcg/insn_trans/trans_memory.c.inc @@ -137,11 +137,70 @@ static bool trans_preldx(DisasContext *ctx, arg_preld= x * a) return true; } =20 +/* + * Decode dbar hint and emit appropriate TCG memory barrier. + * + * The hint is a 5-bit field (0-31) encoded in the instruction. + * For hint 0x700 (special LL/SC loop barrier), treat as full barrier. + * + * See LoongArch Reference Manual v1.10, Section 4.2.2 for details. + */ static bool trans_dbar(DisasContext *ctx, arg_dbar * a) { - tcg_gen_mb(TCG_BAR_SC | TCG_MO_ALL); + int hint =3D a->imm; + TCGBar bar_flags =3D 0; + + /* Reserved/no-op hints: 0xf and 0x1f */ + if (hint =3D=3D 0xf || hint =3D=3D 0x1f) { + return true; + } + + /* If the CPU does not support fine-grained hints,or for the special L= L/SC + * loop barrier (0x700), emit a full barrier. + */ + if (!avail_DBAR_HINT(ctx) || hint =3D=3D 0x700) { + tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); + return true; + } + + /* + * Fine-grained hint decoding: + * The hint is a 5-bit field (bits 4-0). Bit4 is reserved and currently + * ignored/discarded. Only bits 3-0 are used for ordering control. + * Bit3: barrier for previous read (0: true, 1: false) + * Bit2: barrier for previous write (0: true, 1: false) + * Bit1: barrier for succeeding read (0: true, 1: false) + * Bit0: barrier for succeeding write (0: true, 1: false) + * + * For each combination, we set the corresponding TCG_MO_* flag if both + * sides of the barrier require ordering. + */ + + bool prev_rd =3D !(hint & 0x08); /* bit3 */ + bool prev_wr =3D !(hint & 0x04); /* bit2 */ + bool succ_rd =3D !(hint & 0x02); /* bit1 */ + bool succ_wr =3D !(hint & 0x01); /* bit0 */ + + if (prev_rd) { + bar_flags |=3D TCG_MO_LD_LD | TCG_MO_LD_ST; + } + if (prev_wr) { + bar_flags |=3D TCG_MO_ST_LD | TCG_MO_ST_ST; + } + if (succ_rd) { + bar_flags |=3D TCG_MO_LD_LD | TCG_MO_ST_LD; + } + if (succ_wr) { + bar_flags |=3D TCG_MO_ST_ST | TCG_MO_LD_ST; + } + + if (bar_flags =3D=3D 0) { + bar_flags =3D TCG_MO_ALL; + } + + tcg_gen_mb(bar_flags | TCG_BAR_SC); return true; -} + } =20 static bool trans_ibar(DisasContext *ctx, arg_ibar *a) { diff --git a/target/loongarch/tcg/translate.c b/target/loongarch/tcg/transl= ate.c index 202b80e047..124dce6269 100644 --- a/target/loongarch/tcg/translate.c +++ b/target/loongarch/tcg/translate.c @@ -149,6 +149,7 @@ static void loongarch_tr_init_disas_context(DisasContex= tBase *dcbase, =20 ctx->cpucfg1 =3D env->cpucfg[1]; ctx->cpucfg2 =3D env->cpucfg[2]; + ctx->cpucfg3 =3D env->cpucfg[3]; } =20 static void loongarch_tr_tb_start(DisasContextBase *dcbase, CPUState *cs) diff --git a/target/loongarch/translate.h b/target/loongarch/translate.h index ba1c89e57b..8aa8325dc6 100644 --- a/target/loongarch/translate.h +++ b/target/loongarch/translate.h @@ -43,6 +43,8 @@ #define avail_LLACQ_SCREL(C) (FIELD_EX32((C)->cpucfg2, CPUCFG2, LLACQ_S= CREL)) #define avail_LLACQ_SCREL_64(C) (avail_64(C) && avail_LLACQ_SCREL(C)) =20 +#define avail_DBAR_HINT(C) (FIELD_EX32((C)->cpucfg3, CPUCFG3, DBAR_HINTS)) + /* * If an operation is being performed on less than TARGET_LONG_BITS, * it may require the inputs to be sign- or zero-extended; which will @@ -66,6 +68,7 @@ typedef struct DisasContext { bool va32; /* 32-bit virtual address */ uint32_t cpucfg1; uint32_t cpucfg2; + uint32_t cpucfg3; } DisasContext; =20 void generate_exception(DisasContext *ctx, int excp); --=20 2.54.0