SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/loongarch: Move kvm specified vCPU property to kvm directory

Browse Source 
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>
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
This commit is contained in:
Bibo Mao 2025-02-14 17:10:48 +08:00
parent 3406b001e6
commit 780a65bd95
2 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
target/loongarch/cpu.c
View File

@ -718,34 +718,12 @@ static void loongarch_set_lasx(Object *obj, bool value, Error **errp)
cpu->env.cpucfg[2] = FIELD_DP32(val, CPUCFG2, LASX, value); cpu->env.cpucfg[2] = FIELD_DP32(val, CPUCFG2, LASX, value);
} }
static bool loongarch_get_lbt(Object *obj, Error **errp)
{
return LOONGARCH_CPU(obj)->lbt != ON_OFF_AUTO_OFF;
}
static void loongarch_set_lbt(Object *obj, bool value, Error **errp)
{
LoongArchCPU *cpu = LOONGARCH_CPU(obj);
cpu->lbt = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
}
static bool loongarch_get_pmu(Object *obj, Error **errp)
{
return LOONGARCH_CPU(obj)->pmu != ON_OFF_AUTO_OFF;
}
static void loongarch_set_pmu(Object *obj, bool value, Error **errp)
{
LoongArchCPU *cpu = LOONGARCH_CPU(obj);
cpu->pmu = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
}
void loongarch_cpu_post_init(Object *obj) void loongarch_cpu_post_init(Object *obj)
{ {
LoongArchCPU *cpu = LOONGARCH_CPU(obj); LoongArchCPU *cpu = LOONGARCH_CPU(obj);
cpu->lbt = ON_OFF_AUTO_OFF;
cpu->pmu = ON_OFF_AUTO_OFF;
cpu->lsx = ON_OFF_AUTO_AUTO; cpu->lsx = ON_OFF_AUTO_AUTO;
cpu->lasx = ON_OFF_AUTO_AUTO; cpu->lasx = ON_OFF_AUTO_AUTO;
object_property_add_bool(obj, "lsx", loongarch_get_lsx, object_property_add_bool(obj, "lsx", loongarch_get_lsx,
@ -754,21 +732,7 @@ void loongarch_cpu_post_init(Object *obj)
loongarch_set_lasx); loongarch_set_lasx);
/* lbt is enabled only in kvm mode, not supported in tcg mode */ /* lbt is enabled only in kvm mode, not supported in tcg mode */
if (kvm_enabled()) { if (kvm_enabled()) {
cpu->lbt = 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 = 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); kvm_loongarch_cpu_post_init(cpu);
} else {
cpu->lbt = ON_OFF_AUTO_OFF;
cpu->pmu = ON_OFF_AUTO_OFF;
} }
} }

35
target/loongarch/kvm/kvm.c
View File

@ -1016,8 +1016,43 @@ int kvm_arch_init_vcpu(CPUState *cs)
return ret; return ret;
} }
static bool loongarch_get_lbt(Object *obj, Error **errp)
{
return LOONGARCH_CPU(obj)->lbt != ON_OFF_AUTO_OFF;
}
static void loongarch_set_lbt(Object *obj, bool value, Error **errp)
{
LoongArchCPU *cpu = LOONGARCH_CPU(obj);
cpu->lbt = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
}
static bool loongarch_get_pmu(Object *obj, Error **errp)
{
return LOONGARCH_CPU(obj)->pmu != ON_OFF_AUTO_OFF;
}
static void loongarch_set_pmu(Object *obj, bool value, Error **errp)
{
LoongArchCPU *cpu = LOONGARCH_CPU(obj);
cpu->pmu = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
}
void kvm_loongarch_cpu_post_init(LoongArchCPU *cpu) void kvm_loongarch_cpu_post_init(LoongArchCPU *cpu)
{ {
cpu->lbt = 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 = 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 disable performance monitor unit.");
} }
int kvm_arch_destroy_vcpu(CPUState *cs) int kvm_arch_destroy_vcpu(CPUState *cs)