{"id":809651,"url":"http://patchwork.ozlabs.org/api/patches/809651/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504527967-29248-21-git-send-email-peter.maydell@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504527967-29248-21-git-send-email-peter.maydell@linaro.org>","list_archive_url":null,"date":"2017-09-04T12:25:51","name":"[PULL,20/36] target/arm/kvm: pmu: split init and set-irq stages","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7f730fc28509d15ed7e4f6c9851be4eb4ff47d32","submitter":{"id":5111,"url":"http://patchwork.ozlabs.org/api/people/5111/?format=json","name":"Peter Maydell","email":"peter.maydell@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504527967-29248-21-git-send-email-peter.maydell@linaro.org/mbox/","series":[{"id":1366,"url":"http://patchwork.ozlabs.org/api/series/1366/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1366","date":"2017-09-04T12:25:36","name":"[PULL,01/36] target/arm: Use MMUAccessType enum rather than int","version":1,"mbox":"http://patchwork.ozlabs.org/series/1366/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809651/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809651/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xm8j107r7z9rxl\n\tfor ;\n\tMon, 4 Sep 2017 22:45:57 +1000 (AEST)","from localhost ([::1]:59640 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1doqlH-0002l3-21\n\tfor incoming@patchwork.ozlabs.org; Mon, 04 Sep 2017 08:45:55 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:52702)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1doqSY-00056w-4v\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:46 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1doqSI-0004qN-GL\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:34 -0400","from orth.archaic.org.uk ([2001:8b0:1d0::2]:37124)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1doqSI-0004pl-5Q\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:18 -0400","from pm215 by orth.archaic.org.uk with local (Exim 4.89)\n\t(envelope-from ) id 1doqSH-0005Xq-7C\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 13:26:17 +0100"],"From":"Peter Maydell ","To":"qemu-devel@nongnu.org","Date":"Mon, 4 Sep 2017 13:25:51 +0100","Message-Id":"<1504527967-29248-21-git-send-email-peter.maydell@linaro.org>","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1504527967-29248-1-git-send-email-peter.maydell@linaro.org>","References":"<1504527967-29248-1-git-send-email-peter.maydell@linaro.org>","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2001:8b0:1d0::2","Subject":"[Qemu-devel] [PULL 20/36] target/arm/kvm: pmu: split init and\n\tset-irq stages","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Andrew Jones \n\nWhen adding a PMU with a userspace irqchip we skip the set-irq\nstage of device creation. Split the 'create' function into two\nfunctions 'init' and 'set-irq' so they may be called separately.\n\nSigned-off-by: Andrew Jones \nReviewed-by: Christoffer Dall \nMessage-id: 1500471597-2517-3-git-send-email-drjones@redhat.com\nSigned-off-by: Peter Maydell \n---\n target/arm/kvm_arm.h | 10 ++++++++--\n hw/arm/virt.c | 11 +++++++++--\n target/arm/kvm32.c | 8 +++++++-\n target/arm/kvm64.c | 52 +++++++++++++++++++++++++---------------------------\n 4 files changed, 49 insertions(+), 32 deletions(-)","diff":"diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h\nindex 633d088..cab5ea9 100644\n--- a/target/arm/kvm_arm.h\n+++ b/target/arm/kvm_arm.h\n@@ -195,7 +195,8 @@ int kvm_arm_sync_mpstate_to_qemu(ARMCPU *cpu);\n \n int kvm_arm_vgic_probe(void);\n \n-int kvm_arm_pmu_create(CPUState *cs, int irq);\n+int kvm_arm_pmu_set_irq(CPUState *cs, int irq);\n+int kvm_arm_pmu_init(CPUState *cs);\n \n #else\n \n@@ -204,7 +205,12 @@ static inline int kvm_arm_vgic_probe(void)\n return 0;\n }\n \n-static inline int kvm_arm_pmu_create(CPUState *cs, int irq)\n+static inline int kvm_arm_pmu_set_irq(CPUState *cs, int irq)\n+{\n+ return 0;\n+}\n+\n+static inline int kvm_arm_pmu_init(CPUState *cs)\n {\n return 0;\n }\ndiff --git a/hw/arm/virt.c b/hw/arm/virt.c\nindex a06ec13..d6e2486 100644\n--- a/hw/arm/virt.c\n+++ b/hw/arm/virt.c\n@@ -492,10 +492,17 @@ static void fdt_add_pmu_nodes(const VirtMachineState *vms)\n \n CPU_FOREACH(cpu) {\n armcpu = ARM_CPU(cpu);\n- if (!arm_feature(&armcpu->env, ARM_FEATURE_PMU) ||\n- (kvm_enabled() && !kvm_arm_pmu_create(cpu, PPI(VIRTUAL_PMU_IRQ)))) {\n+ if (!arm_feature(&armcpu->env, ARM_FEATURE_PMU)) {\n return;\n }\n+ if (kvm_enabled()) {\n+ if (!kvm_arm_pmu_set_irq(cpu, PPI(VIRTUAL_PMU_IRQ))) {\n+ return;\n+ }\n+ if (!kvm_arm_pmu_init(cpu)) {\n+ return;\n+ }\n+ }\n }\n \n if (vms->gic_version == 2) {\ndiff --git a/target/arm/kvm32.c b/target/arm/kvm32.c\nindex 069da0c..e3aab89 100644\n--- a/target/arm/kvm32.c\n+++ b/target/arm/kvm32.c\n@@ -522,7 +522,13 @@ bool kvm_arm_hw_debug_active(CPUState *cs)\n return false;\n }\n \n-int kvm_arm_pmu_create(CPUState *cs, int irq)\n+int kvm_arm_pmu_set_irq(CPUState *cs, int irq)\n+{\n+ qemu_log_mask(LOG_UNIMP, \"%s: not implemented\\n\", __func__);\n+ return 0;\n+}\n+\n+int kvm_arm_pmu_init(CPUState *cs)\n {\n qemu_log_mask(LOG_UNIMP, \"%s: not implemented\\n\", __func__);\n return 0;\ndiff --git a/target/arm/kvm64.c b/target/arm/kvm64.c\nindex a16abc8..e26638a 100644\n--- a/target/arm/kvm64.c\n+++ b/target/arm/kvm64.c\n@@ -381,46 +381,44 @@ static CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, target_ulong addr)\n return NULL;\n }\n \n-static bool kvm_arm_pmu_support_ctrl(CPUState *cs, struct kvm_device_attr *attr)\n-{\n- return kvm_vcpu_ioctl(cs, KVM_HAS_DEVICE_ATTR, attr) == 0;\n-}\n-\n-int kvm_arm_pmu_create(CPUState *cs, int irq)\n+static bool kvm_arm_pmu_set_attr(CPUState *cs, struct kvm_device_attr *attr)\n {\n int err;\n \n- struct kvm_device_attr attr = {\n- .group = KVM_ARM_VCPU_PMU_V3_CTRL,\n- .addr = (intptr_t)&irq,\n- .attr = KVM_ARM_VCPU_PMU_V3_IRQ,\n- .flags = 0,\n- };\n-\n- if (!kvm_arm_pmu_support_ctrl(cs, &attr)) {\n- return 0;\n+ err = kvm_vcpu_ioctl(cs, KVM_HAS_DEVICE_ATTR, attr);\n+ if (err != 0) {\n+ return false;\n }\n \n- err = kvm_vcpu_ioctl(cs, KVM_SET_DEVICE_ATTR, &attr);\n+ err = kvm_vcpu_ioctl(cs, KVM_SET_DEVICE_ATTR, attr);\n if (err < 0) {\n fprintf(stderr, \"KVM_SET_DEVICE_ATTR failed: %s\\n\",\n strerror(-err));\n abort();\n }\n \n- attr.group = KVM_ARM_VCPU_PMU_V3_CTRL;\n- attr.attr = KVM_ARM_VCPU_PMU_V3_INIT;\n- attr.addr = 0;\n- attr.flags = 0;\n+ return true;\n+}\n \n- err = kvm_vcpu_ioctl(cs, KVM_SET_DEVICE_ATTR, &attr);\n- if (err < 0) {\n- fprintf(stderr, \"KVM_SET_DEVICE_ATTR failed: %s\\n\",\n- strerror(-err));\n- abort();\n- }\n+int kvm_arm_pmu_init(CPUState *cs)\n+{\n+ struct kvm_device_attr attr = {\n+ .group = KVM_ARM_VCPU_PMU_V3_CTRL,\n+ .attr = KVM_ARM_VCPU_PMU_V3_INIT,\n+ };\n+\n+ return kvm_arm_pmu_set_attr(cs, &attr);\n+}\n+\n+int kvm_arm_pmu_set_irq(CPUState *cs, int irq)\n+{\n+ struct kvm_device_attr attr = {\n+ .group = KVM_ARM_VCPU_PMU_V3_CTRL,\n+ .addr = (intptr_t)&irq,\n+ .attr = KVM_ARM_VCPU_PMU_V3_IRQ,\n+ };\n \n- return 1;\n+ return kvm_arm_pmu_set_attr(cs, &attr);\n }\n \n static inline void set_feature(uint64_t *features, int feature)\n","prefixes":["PULL","20/36"]}