Commit 929e754d authored by Wei Huang's avatar Wei Huang Committed by Peter Maydell
Browse files

arm: Add an option to turn on/off vPMU support 



This patch adds a pmu=[on/off] option to enable/disable vPMU support
in guest vCPU. It allows virt tools, such as libvirt, to determine the
exsitence of vPMU and configure it. Note this option is only available
for cortex-a57/cortex-53/ host CPUs, but unavailable on ARMv7 and other
processors. Also even though "pmu=" option is available for TCG mode,
setting it doesn't turn PMU on.

Signed-off-by: default avatarWei Huang <wei@redhat.com>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Message-id: 1477463301-17175-2-git-send-email-wei@redhat.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent d1df5cf3

hw/arm/virt-acpi-build.c

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info) 
        gicc->uid = i;

        gicc->flags = cpu_to_le32(ACPI_GICC_ENABLED);



        if (armcpu->has_pmu) {

        if (arm_feature(&armcpu->env, ARM_FEATURE_PMU)) {

            gicc->performance_interrupt = cpu_to_le32(PPI(VIRTUAL_PMU_IRQ));

        }

    }

hw/arm/virt.c

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static void fdt_add_pmu_nodes(const VirtBoardInfo *vbi, int gictype) 


    CPU_FOREACH(cpu) {

        armcpu = ARM_CPU(cpu);

        if (!armcpu->has_pmu ||

        if (!arm_feature(&armcpu->env, ARM_FEATURE_PMU) ||

            !kvm_arm_pmu_create(cpu, PPI(VIRTUAL_PMU_IRQ))) {

            return;

        }

target-arm/cpu.c

+15 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 */



#include "qemu/osdep.h"

#include "qemu/error-report.h"

#include "qapi/error.h"

#include "cpu.h"

#include "internals.h"
@@ -496,6 +497,10 @@ static Property arm_cpu_rvbar_property = 
static Property arm_cpu_has_el3_property =

            DEFINE_PROP_BOOL("has_el3", ARMCPU, has_el3, true);



/* use property name "pmu" to match other archs and virt tools */

static Property arm_cpu_has_pmu_property =

            DEFINE_PROP_BOOL("pmu", ARMCPU, has_pmu, true);



static Property arm_cpu_has_mpu_property =

            DEFINE_PROP_BOOL("has-mpu", ARMCPU, has_mpu, true);
@@ -539,6 +544,11 @@ static void arm_cpu_post_init(Object *obj) 
#endif

    }



    if (arm_feature(&cpu->env, ARM_FEATURE_PMU)) {

        qdev_property_add_static(DEVICE(obj), &arm_cpu_has_pmu_property,

                                 &error_abort);

    }



    if (arm_feature(&cpu->env, ARM_FEATURE_MPU)) {

        qdev_property_add_static(DEVICE(obj), &arm_cpu_has_mpu_property,

                                 &error_abort);
@@ -677,6 +687,11 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) 
        cpu->id_aa64pfr0 &= ~0xf000;

    }



    if (!cpu->has_pmu || !kvm_enabled()) {

        cpu->has_pmu = false;

        unset_feature(env, ARM_FEATURE_PMU);

    }



    if (!arm_feature(env, ARM_FEATURE_EL2)) {

        /* Disable the hypervisor feature bits in the processor feature

         * registers if we don't have EL2. These are id_pfr1[15:12] and

target-arm/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -1124,6 +1124,7 @@ enum arm_features { 
    ARM_FEATURE_V8_SHA256, /* implements SHA256 part of v8 Crypto Extensions */

    ARM_FEATURE_V8_PMULL, /* implements PMULL part of v8 Crypto Extensions */

    ARM_FEATURE_THUMB_DSP, /* DSP insns supported in the Thumb encodings */

    ARM_FEATURE_PMU, /* has PMU support */

};



static inline int arm_feature(CPUARMState *env, int feature)

target-arm/cpu64.c

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ static void aarch64_a57_initfn(Object *obj) 
    set_feature(&cpu->env, ARM_FEATURE_V8_PMULL);

    set_feature(&cpu->env, ARM_FEATURE_CRC);

    set_feature(&cpu->env, ARM_FEATURE_EL3);

    set_feature(&cpu->env, ARM_FEATURE_PMU);

    cpu->kvm_target = QEMU_KVM_ARM_TARGET_CORTEX_A57;

    cpu->midr = 0x411fd070;

    cpu->revidr = 0x00000000;
@@ -166,6 +167,7 @@ static void aarch64_a53_initfn(Object *obj) 
    set_feature(&cpu->env, ARM_FEATURE_V8_PMULL);

    set_feature(&cpu->env, ARM_FEATURE_CRC);

    set_feature(&cpu->env, ARM_FEATURE_EL3);

    set_feature(&cpu->env, ARM_FEATURE_PMU);

    cpu->kvm_target = QEMU_KVM_ARM_TARGET_CORTEX_A53;

    cpu->midr = 0x410fd034;

    cpu->revidr = 0x00000000;