From nobody Mon May 12 21:42:15 2025
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: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1739764771311921.8417310824095;
Sun, 16 Feb 2025 19:59:31 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tjsGM-0001WK-Hh; Sun, 16 Feb 2025 22:57:42 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <maobibo@loongson.cn>)
id 1tjsGB-0001SX-KB
for qemu-devel@nongnu.org; Sun, 16 Feb 2025 22:57:31 -0500
Received: from mail.loongson.cn ([114.242.206.163])
by eggs.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <maobibo@loongson.cn>) id 1tjsG7-0006r9-Ot
for qemu-devel@nongnu.org; Sun, 16 Feb 2025 22:57:31 -0500
Received: from loongson.cn (unknown [10.2.5.213])
by gateway (Coremail) with SMTP id _____8CxdXCfs7Jnrl54AA--.12066S3;
Mon, 17 Feb 2025 11:57:19 +0800 (CST)
Received: from localhost.localdomain (unknown [10.2.5.213])
by front1 (Coremail) with SMTP id qMiowMBxn8Wfs7JnbXwXAA--.24352S4;
Mon, 17 Feb 2025 11:57:19 +0800 (CST)
From: Bibo Mao <maobibo@loongson.cn>
To: Song Gao <gaosong@loongson.cn>
Cc: qemu-devel@nongnu.org,
lixianglai <lixianglai@loongson.cn>
Subject: [PATCH 2/8] target/loongarch: Mov kvm specified vcpu property to kvm
directory
Date: Mon, 17 Feb 2025 11:57:12 +0800
Message-Id: <20250217035718.3977137-3-maobibo@loongson.cn>
X-Mailer: git-send-email 2.39.3
In-Reply-To: <20250217035718.3977137-1-maobibo@loongson.cn>
References: <20250217035718.3977137-1-maobibo@loongson.cn>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-CM-TRANSID: qMiowMBxn8Wfs7JnbXwXAA--.24352S4
X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/
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=lists.gnu.org;
Received-SPF: pass client-ip=114.242.206.163;
envelope-from=maobibo@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,
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,
RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,
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-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZM-MESSAGEID: 1739764771843019000
Content-Type: text/plain; charset="utf-8"
LBT and PMU feature is supported only in kvm mode, move property
about these two features to function kvm_loongarch_cpu_post_init().
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
target/loongarch/cpu.c | 40 ++------------------------------------
target/loongarch/kvm/kvm.c | 35 +++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index 40f753167f..e1ff346bce 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -712,34 +712,12 @@ static void loongarch_set_lasx(Object *obj, bool valu=
e, Error **errp)
cpu->env.cpucfg[2] =3D FIELD_DP32(val, CPUCFG2, LASX, value);
}
=20
-static bool loongarch_get_lbt(Object *obj, Error **errp)
-{
- return LOONGARCH_CPU(obj)->lbt !=3D ON_OFF_AUTO_OFF;
-}
-
-static void loongarch_set_lbt(Object *obj, bool value, Error **errp)
-{
- LoongArchCPU *cpu =3D LOONGARCH_CPU(obj);
-
- cpu->lbt =3D value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
-}
-
-static bool loongarch_get_pmu(Object *obj, Error **errp)
-{
- return LOONGARCH_CPU(obj)->pmu !=3D ON_OFF_AUTO_OFF;
-}
-
-static void loongarch_set_pmu(Object *obj, bool value, Error **errp)
-{
- LoongArchCPU *cpu =3D LOONGARCH_CPU(obj);
-
- cpu->pmu =3D value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
-}
-
void loongarch_cpu_post_init(Object *obj)
{
LoongArchCPU *cpu =3D LOONGARCH_CPU(obj);
=20
+ cpu->lbt =3D ON_OFF_AUTO_OFF;
+ cpu->pmu =3D ON_OFF_AUTO_OFF;
cpu->lsx =3D ON_OFF_AUTO_AUTO;
cpu->lasx =3D ON_OFF_AUTO_AUTO;
object_property_add_bool(obj, "lsx", loongarch_get_lsx,
@@ -748,21 +726,7 @@ void loongarch_cpu_post_init(Object *obj)
loongarch_set_lasx);
/* lbt is enabled only in kvm mode, not supported in tcg mode */
if (kvm_enabled()) {
- cpu->lbt =3D ON_OFF_AUTO_AUTO;
- object_property_add_bool(obj, "lbt", loongarch_get_lbt,
- loongarch_set_lbt);
- object_property_set_description(obj, "lbt",
- "Set off to disable Binary Tranlation."=
);
-
- cpu->pmu =3D ON_OFF_AUTO_AUTO;
- object_property_add_bool(obj, "pmu", loongarch_get_pmu,
- loongarch_set_pmu);
- object_property_set_description(obj, "pmu",
- "Set off to performance monitor unit.");
kvm_loongarch_cpu_post_init(cpu);
- } else {
- cpu->lbt =3D ON_OFF_AUTO_OFF;
- cpu->pmu =3D ON_OFF_AUTO_OFF;
}
}
=20
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
index 516aba180f..df4b21bef5 100644
--- a/target/loongarch/kvm/kvm.c
+++ b/target/loongarch/kvm/kvm.c
@@ -1009,8 +1009,43 @@ int kvm_arch_init_vcpu(CPUState *cs)
return ret;
}
=20
+static bool loongarch_get_lbt(Object *obj, Error **errp)
+{
+ return LOONGARCH_CPU(obj)->lbt !=3D ON_OFF_AUTO_OFF;
+}
+
+static void loongarch_set_lbt(Object *obj, bool value, Error **errp)
+{
+ LoongArchCPU *cpu =3D LOONGARCH_CPU(obj);
+
+ cpu->lbt =3D value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
+}
+
+static bool loongarch_get_pmu(Object *obj, Error **errp)
+{
+ return LOONGARCH_CPU(obj)->pmu !=3D ON_OFF_AUTO_OFF;
+}
+
+static void loongarch_set_pmu(Object *obj, bool value, Error **errp)
+{
+ LoongArchCPU *cpu =3D LOONGARCH_CPU(obj);
+
+ cpu->pmu =3D value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
+}
+
void kvm_loongarch_cpu_post_init(LoongArchCPU *cpu)
{
+ cpu->lbt =3D ON_OFF_AUTO_AUTO;
+ object_property_add_bool(OBJECT(cpu), "lbt", loongarch_get_lbt,
+ loongarch_set_lbt);
+ object_property_set_description(OBJECT(cpu), "lbt",
+ "Set off to disable Binary Tranlation."=
);
+
+ cpu->pmu =3D ON_OFF_AUTO_AUTO;
+ object_property_add_bool(OBJECT(cpu), "pmu", loongarch_get_pmu,
+ loongarch_set_pmu);
+ object_property_set_description(OBJECT(cpu), "pmu",
+ "Set off to performance monitor unit.");
}
=20
int kvm_arch_destroy_vcpu(CPUState *cs)
--=20
2.39.3