From patchwork Thu Sep 22 15:13:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Huang X-Patchwork-Id: 673499 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sg19R4WMpz9s4x for ; Fri, 23 Sep 2016 01:48:11 +1000 (AEST) Received: from localhost ([::1]:51307 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bn6EL-0002Po-4g for incoming@patchwork.ozlabs.org; Thu, 22 Sep 2016 11:48:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bn5gt-0005hj-7N for qemu-devel@nongnu.org; Thu, 22 Sep 2016 11:13:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bn5gs-0006Fr-3Z for qemu-devel@nongnu.org; Thu, 22 Sep 2016 11:13:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44422) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bn5go-0006E8-DE; Thu, 22 Sep 2016 11:13:30 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ED86435BA6C; Thu, 22 Sep 2016 15:13:29 +0000 (UTC) Received: from apm-mustang-ev3-30.khw.lab.eng.bos.redhat.com (apm-mustang-ev3-30.khw.lab.eng.bos.redhat.com [10.16.184.124]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8MFDR61006139; Thu, 22 Sep 2016 11:13:29 -0400 From: Wei Huang To: qemu-arm@nongnu.org Date: Thu, 22 Sep 2016 11:13:23 -0400 Message-Id: <1474557203-4977-3-git-send-email-wei@redhat.com> In-Reply-To: <1474557203-4977-1-git-send-email-wei@redhat.com> References: <1474557203-4977-1-git-send-email-wei@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 22 Sep 2016 15:13:30 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH V5 2/2] arm: virt: add PMU property to mach-virt machine type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, drjones@redhat.com, qemu-devel@nongnu.org, abologna@redhat.com, shannon.zhao@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" CPU vPMU is now turned off by default, but it was ON in virt-2.7 machine type. To solve this problem, this patch adds a PMU option in machine state, which is used to control CPU's vPMU status. This PMU option is not exposed to command line and is turned on in virt-2.7 machine type to make sure it is backward compatible. Signed-off-by: Wei Huang Reviewed-by: Andrew Jones Tested-by: Andrea Bolognani --- hw/arm/virt.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index a781ad0..a211b22 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -84,6 +84,7 @@ typedef struct { MachineClass parent; VirtBoardInfo *daughterboard; bool disallow_affinity_adjustment; + bool pmu_default_on; } VirtMachineClass; typedef struct { @@ -1287,6 +1288,8 @@ static void machvirt_init(MachineState *machine) for (n = 0; n < smp_cpus; n++) { Object *cpuobj = object_new(typename); + ARMCPU *cpu = ARM_CPU(cpuobj); + if (!vmc->disallow_affinity_adjustment) { /* Adjust MPIDR like 64-bit KVM hosts, which incorporate the * GIC's target-list limitations. 32-bit KVM hosts currently @@ -1317,6 +1320,12 @@ static void machvirt_init(MachineState *machine) } } + if (cpu->has_pmu == ON_OFF_AUTO_AUTO && + object_property_find(cpuobj, "pmu", NULL)) { + cpu->has_pmu = vmc->pmu_default_on && kvm_enabled() ? + ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF; + } + if (object_property_find(cpuobj, "reset-cbar", NULL)) { object_property_set_int(cpuobj, vbi->memmap[VIRT_CPUPERIPHS].base, "reset-cbar", &error_abort); @@ -1514,6 +1523,9 @@ static void virt_2_7_instance_init(Object *obj) static void virt_machine_2_7_options(MachineClass *mc) { + VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); + + vmc->pmu_default_on = true; } DEFINE_VIRT_MACHINE_AS_LATEST(2, 7) @@ -1532,5 +1544,9 @@ static void virt_machine_2_6_options(MachineClass *mc) virt_machine_2_7_options(mc); SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_6); vmc->disallow_affinity_adjustment = true; + /* Disable PMU for 2.6 and down as PMU support was first introduced + * and enabled in 2.7. + */ + vmc->pmu_default_on = false; } DEFINE_VIRT_MACHINE(2, 6)