Commit 01fe6b60 authored by Shannon Zhao's avatar Shannon Zhao Committed by Peter Maydell
Browse files

hw/arm/virt: Add PMU node for virt machine 



Add a virtual PMU device for virt machine while use PPI 7 for PMU
overflow interrupt number.

Signed-off-by: default avatarShannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Message-id: 1465267577-1808-3-git-send-email-zhaoshenglong@huawei.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 5c0a3819

hw/arm/virt.c

+33 −0
Original line number Diff line number Diff line
@@ -436,6 +436,37 @@ static void fdt_add_gic_node(VirtBoardInfo *vbi, int type) 
    qemu_fdt_setprop_cell(vbi->fdt, "/intc", "phandle", vbi->gic_phandle);

}



static void fdt_add_pmu_nodes(const VirtBoardInfo *vbi, int gictype)

{

    CPUState *cpu;

    ARMCPU *armcpu;

    uint32_t irqflags = GIC_FDT_IRQ_FLAGS_LEVEL_HI;



    CPU_FOREACH(cpu) {

        armcpu = ARM_CPU(cpu);

        if (!armcpu->has_pmu ||

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

            return;

        }

    }



    if (gictype == 2) {

        irqflags = deposit32(irqflags, GIC_FDT_IRQ_PPI_CPU_START,

                             GIC_FDT_IRQ_PPI_CPU_WIDTH,

                             (1 << vbi->smp_cpus) - 1);

    }



    armcpu = ARM_CPU(qemu_get_cpu(0));

    qemu_fdt_add_subnode(vbi->fdt, "/pmu");

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

        const char compat[] = "arm,armv8-pmuv3";

        qemu_fdt_setprop(vbi->fdt, "/pmu", "compatible",

                         compat, sizeof(compat));

        qemu_fdt_setprop_cells(vbi->fdt, "/pmu", "interrupts",

                               GIC_FDT_IRQ_TYPE_PPI, VIRTUAL_PMU_IRQ, irqflags);

    }

}



static void create_v2m(VirtBoardInfo *vbi, qemu_irq *pic)

{

    int i;
@@ -1259,6 +1290,8 @@ static void machvirt_init(MachineState *machine) 


    create_gic(vbi, pic, gic_version, vms->secure);



    fdt_add_pmu_nodes(vbi, gic_version);



    create_uart(vbi, pic, VIRT_UART, sysmem, serial_hds[0]);



    if (vms->secure) {

include/hw/arm/virt.h

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ 
#define ARCH_TIMER_NS_EL1_IRQ 14

#define ARCH_TIMER_NS_EL2_IRQ 10



#define VIRTUAL_PMU_IRQ 7



#define PPI(irq) ((irq) + 16)



enum {

    VIRT_FLASH,

    VIRT_MEM,

target-arm/kvm32.c

+6 −0
Original line number Diff line number Diff line
@@ -522,3 +522,9 @@ bool kvm_arm_hw_debug_active(CPUState *cs) 
{

    return false;

}



int kvm_arm_pmu_create(CPUState *cs, int irq)

{

    qemu_log_mask(LOG_UNIMP, "%s: not implemented\n", __func__);

    return 0;

}

target-arm/kvm64.c

+41 −0
Original line number Diff line number Diff line
@@ -382,6 +382,47 @@ static CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, target_ulong addr) 
    return NULL;

}



static bool kvm_arm_pmu_support_ctrl(CPUState *cs, struct kvm_device_attr *attr)

{

    return kvm_vcpu_ioctl(cs, KVM_HAS_DEVICE_ATTR, attr) == 0;

}



int kvm_arm_pmu_create(CPUState *cs, int irq)

{

    int err;



    struct kvm_device_attr attr = {

        .group = KVM_ARM_VCPU_PMU_V3_CTRL,

        .addr = (intptr_t)&irq,

        .attr = KVM_ARM_VCPU_PMU_V3_IRQ,

        .flags = 0,

    };



    if (!kvm_arm_pmu_support_ctrl(cs, &attr)) {

        return 0;

    }



    err = kvm_vcpu_ioctl(cs, KVM_SET_DEVICE_ATTR, &attr);

    if (err < 0) {

        fprintf(stderr, "KVM_SET_DEVICE_ATTR failed: %s\n",

                strerror(-err));

        abort();

    }



    attr.group = KVM_ARM_VCPU_PMU_V3_CTRL;

    attr.attr = KVM_ARM_VCPU_PMU_V3_INIT;

    attr.addr = 0;

    attr.flags = 0;



    err = kvm_vcpu_ioctl(cs, KVM_SET_DEVICE_ATTR, &attr);

    if (err < 0) {

        fprintf(stderr, "KVM_SET_DEVICE_ATTR failed: %s\n",

                strerror(-err));

        abort();

    }



    return 1;

}



static inline void set_feature(uint64_t *features, int feature)

{

target-arm/kvm_arm.h

+7 −0
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@ int kvm_arm_sync_mpstate_to_qemu(ARMCPU *cpu); 


int kvm_arm_vgic_probe(void);



int kvm_arm_pmu_create(CPUState *cs, int irq);



#else



static inline int kvm_arm_vgic_probe(void)
@@ -201,6 +203,11 @@ static inline int kvm_arm_vgic_probe(void) 
    return 0;

}



static inline int kvm_arm_pmu_create(CPUState *cs, int irq)

{

    return 0;

}



#endif



static inline const char *gic_class_name(void)