hw/arm/virt: Move kvm pmu setup to virt_cpu_post_init
Move the KVM PMU setup part of fdt_add_pmu_nodes() to virt_cpu_post_init(), which is a more appropriate location. Now fdt_add_pmu_nodes() is also named more appropriately, because it no longer does anything but fdt node creation. No functional change intended. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Eric Auger <eric.auger@redhat.com> Signed-off-by: Andrew Jones <drjones@redhat.com> Message-id: 20201001061718.101915-5-drjones@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
fe11f058c5
commit
946f1bb18c
|
@ -521,22 +521,13 @@ static void fdt_add_gic_node(VirtMachineState *vms)
|
||||||
|
|
||||||
static void fdt_add_pmu_nodes(const VirtMachineState *vms)
|
static void fdt_add_pmu_nodes(const VirtMachineState *vms)
|
||||||
{
|
{
|
||||||
CPUState *cpu;
|
ARMCPU *armcpu = ARM_CPU(first_cpu);
|
||||||
ARMCPU *armcpu;
|
|
||||||
uint32_t irqflags = GIC_FDT_IRQ_FLAGS_LEVEL_HI;
|
uint32_t irqflags = GIC_FDT_IRQ_FLAGS_LEVEL_HI;
|
||||||
|
|
||||||
CPU_FOREACH(cpu) {
|
|
||||||
armcpu = ARM_CPU(cpu);
|
|
||||||
if (!arm_feature(&armcpu->env, ARM_FEATURE_PMU)) {
|
if (!arm_feature(&armcpu->env, ARM_FEATURE_PMU)) {
|
||||||
|
assert(!object_property_get_bool(OBJECT(armcpu), "pmu", NULL));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (kvm_enabled()) {
|
|
||||||
if (kvm_irqchip_in_kernel()) {
|
|
||||||
kvm_arm_pmu_set_irq(cpu, PPI(VIRTUAL_PMU_IRQ));
|
|
||||||
}
|
|
||||||
kvm_arm_pmu_init(cpu);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (vms->gic_version == VIRT_GIC_VERSION_2) {
|
if (vms->gic_version == VIRT_GIC_VERSION_2) {
|
||||||
irqflags = deposit32(irqflags, GIC_FDT_IRQ_PPI_CPU_START,
|
irqflags = deposit32(irqflags, GIC_FDT_IRQ_PPI_CPU_START,
|
||||||
|
@ -544,7 +535,6 @@ static void fdt_add_pmu_nodes(const VirtMachineState *vms)
|
||||||
(1 << vms->smp_cpus) - 1);
|
(1 << vms->smp_cpus) - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
armcpu = ARM_CPU(qemu_get_cpu(0));
|
|
||||||
qemu_fdt_add_subnode(vms->fdt, "/pmu");
|
qemu_fdt_add_subnode(vms->fdt, "/pmu");
|
||||||
if (arm_feature(&armcpu->env, ARM_FEATURE_V8)) {
|
if (arm_feature(&armcpu->env, ARM_FEATURE_V8)) {
|
||||||
const char compat[] = "arm,armv8-pmuv3";
|
const char compat[] = "arm,armv8-pmuv3";
|
||||||
|
@ -1678,11 +1668,23 @@ static void finalize_gic_version(VirtMachineState *vms)
|
||||||
*/
|
*/
|
||||||
static void virt_cpu_post_init(VirtMachineState *vms)
|
static void virt_cpu_post_init(VirtMachineState *vms)
|
||||||
{
|
{
|
||||||
bool aarch64;
|
bool aarch64, pmu;
|
||||||
|
CPUState *cpu;
|
||||||
|
|
||||||
aarch64 = object_property_get_bool(OBJECT(first_cpu), "aarch64", NULL);
|
aarch64 = object_property_get_bool(OBJECT(first_cpu), "aarch64", NULL);
|
||||||
|
pmu = object_property_get_bool(OBJECT(first_cpu), "pmu", NULL);
|
||||||
|
|
||||||
if (!kvm_enabled()) {
|
if (kvm_enabled()) {
|
||||||
|
CPU_FOREACH(cpu) {
|
||||||
|
if (pmu) {
|
||||||
|
assert(arm_feature(&ARM_CPU(cpu)->env, ARM_FEATURE_PMU));
|
||||||
|
if (kvm_irqchip_in_kernel()) {
|
||||||
|
kvm_arm_pmu_set_irq(cpu, PPI(VIRTUAL_PMU_IRQ));
|
||||||
|
}
|
||||||
|
kvm_arm_pmu_init(cpu);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
if (aarch64 && vms->highmem) {
|
if (aarch64 && vms->highmem) {
|
||||||
int requested_pa_size = 64 - clz64(vms->highest_gpa);
|
int requested_pa_size = 64 - clz64(vms->highest_gpa);
|
||||||
int pamax = arm_pamax(ARM_CPU(first_cpu));
|
int pamax = arm_pamax(ARM_CPU(first_cpu));
|
||||||
|
|
Loading…
Reference in a new issue