From patchwork Fri Sep 11 08:55:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 53411 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by patches.linaro.org (Postfix) with ESMTPS id CEB0822B26 for ; Fri, 11 Sep 2015 08:58:50 +0000 (UTC) Received: by lbcao8 with SMTP id ao8sf22163598lbc.1 for ; Fri, 11 Sep 2015 01:58:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:mime-version:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe:cc :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=uV/C5qKlNbeenle4ZQF7OZhK3YHj6gssVa6u5thkZKQ=; b=TsUcGNEhXwOLjoWgSwOzvMsfMlPUWME4QPNO3xWThopa+Kccy6mq15fZ3pUDndM2m2 7XZGJMZC2+zFSXR6DxcIw+TYjLkaD3yHsn1jbSB0cm7HMgryV4M7LHUdrKC6TNJ98UOE v35TEJzM7mI8nCXOKur3jztXlljdzhCHUghHqMNmUe99kTRanPUGR/1qji3OUzYS+7O0 jjQSml3ndFU/BJ/LL8dEy13vu5NScnHIEyaDVEK9DXNQUjCCgU9VoC1gKtNuw1yUFtXn 5Uy7FEvLmsmyvlHM9IC/wy+a6W8KmR5WY4BZsfonmVHNWNZJ136ZFk/GZwn2t416Kx9K a5cw== X-Gm-Message-State: ALoCoQkai4JpO9YHNWffN3gVf99NJ/lWirxEqfx/02fYOEYRbTOUNSkPjxW3XOMPKyiorOp0UFnh X-Received: by 10.112.172.70 with SMTP id ba6mr10939608lbc.1.1441961929913; Fri, 11 Sep 2015 01:58:49 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.225 with SMTP id e1ls306318laa.108.gmail; Fri, 11 Sep 2015 01:58:49 -0700 (PDT) X-Received: by 10.112.164.4 with SMTP id ym4mr41415880lbb.7.1441961929790; Fri, 11 Sep 2015 01:58:49 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id w8si351455lbb.172.2015.09.11.01.58.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Sep 2015 01:58:49 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by lanb10 with SMTP id b10so43484732lan.3 for ; Fri, 11 Sep 2015 01:58:49 -0700 (PDT) X-Received: by 10.152.178.165 with SMTP id cz5mr40413401lac.29.1441961929665; Fri, 11 Sep 2015 01:58:49 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1447450lbq; Fri, 11 Sep 2015 01:58:48 -0700 (PDT) X-Received: by 10.68.69.70 with SMTP id c6mr93896306pbu.28.1441961925750; Fri, 11 Sep 2015 01:58:45 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id bz4si972045pbd.70.2015.09.11.01.58.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Sep 2015 01:58:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZaK95-0001C6-83; Fri, 11 Sep 2015 08:57:23 +0000 Received: from merlin.infradead.org ([205.233.59.134]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZaK8w-00013O-PG for linux-arm-kernel@bombadil.infradead.org; Fri, 11 Sep 2015 08:57:14 +0000 Received: from szxga01-in.huawei.com ([58.251.152.64]) by merlin.infradead.org with esmtps (Exim 4.85 #2 (Red Hat Linux)) id 1ZaK8t-0001YV-Lk for linux-arm-kernel@lists.infradead.org; Fri, 11 Sep 2015 08:57:13 +0000 Received: from 172.24.1.49 (EHLO SZXEML423-HUB.china.huawei.com) ([172.24.1.49]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CUU27160; Fri, 11 Sep 2015 16:55:55 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by SZXEML423-HUB.china.huawei.com (10.82.67.154) with Microsoft SMTP Server id 14.3.235.1; Fri, 11 Sep 2015 16:55:46 +0800 From: Shannon Zhao To: Subject: [PATCH v2 10/22] KVM: ARM64: Add reset and access handlers for PMXEVCNTR register Date: Fri, 11 Sep 2015 16:55:03 +0800 Message-ID: <1441961715-11688-11-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1441961715-11688-1-git-send-email-zhaoshenglong@huawei.com> References: <1441961715-11688-1-git-send-email-zhaoshenglong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.16.142] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150911_045712_460705_A2D7F5F5 X-CRM114-Status: GOOD ( 10.63 ) X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.4.1 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [58.251.152.64 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [58.251.152.64 listed in wl.mailspike.net] -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Cc: wei@redhat.com, kvm@vger.kernel.org, marc.zyngier@arm.com, will.deacon@arm.com, peter.huangpeng@huawei.com, linux-arm-kernel@lists.infradead.org, zhaoshenglong@huawei.com, alex.bennee@linaro.org, christoffer.dall@linaro.org, shannon.zhao@linaro.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Shannon Zhao Since the reset value of PMXEVCNTR is UNKNOWN, use reset_unknown for its reset handler. Add access handler which emulates writing and reading PMXEVCNTR register. When reading PMXEVCNTR, call perf_event_read_value to get the count value of the perf event. Signed-off-by: Shannon Zhao --- arch/arm64/kvm/sys_regs.c | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 59b7bc9..a51c8de 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -280,6 +280,12 @@ static bool access_pmu_regs(struct kvm_vcpu *vcpu, if (p->is_write) { switch (r->reg) { + case PMXEVCNTR_EL0: { + val = PMEVCNTR0_EL0 + vcpu_sys_reg(vcpu, PMSELR_EL0); + vcpu_sys_reg(vcpu, val) = + *vcpu_reg(vcpu, p->Rt) & 0xffffffffUL; + break; + } case PMXEVTYPER_EL0: { val = vcpu_sys_reg(vcpu, PMSELR_EL0); kvm_pmu_set_counter_event_type(vcpu, @@ -303,7 +309,17 @@ static bool access_pmu_regs(struct kvm_vcpu *vcpu, break; } } else { - *vcpu_reg(vcpu, p->Rt) = vcpu_sys_reg(vcpu, r->reg); + switch (r->reg) { + case PMXEVCNTR_EL0: { + val = kvm_pmu_get_counter_value(vcpu, + vcpu_sys_reg(vcpu, PMSELR_EL0)); + *vcpu_reg(vcpu, p->Rt) = val; + break; + } + default: + *vcpu_reg(vcpu, p->Rt) = vcpu_sys_reg(vcpu, r->reg); + break; + } } return true; @@ -530,7 +546,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { access_pmu_regs, reset_unknown, PMXEVTYPER_EL0 }, /* PMXEVCNTR_EL0 */ { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1101), Op2(0b010), - trap_raz_wi }, + access_pmu_regs, reset_unknown, PMXEVCNTR_EL0 }, /* PMUSERENR_EL0 */ { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1110), Op2(0b000), trap_raz_wi }, @@ -714,6 +730,12 @@ static bool access_pmu_cp15_regs(struct kvm_vcpu *vcpu, if (p->is_write) { switch (r->reg) { + case c9_PMXEVCNTR: { + val = c14_PMEVCNTR0 + vcpu_cp15(vcpu, c9_PMSELR); + vcpu_cp15(vcpu, val) = + *vcpu_reg(vcpu, p->Rt) & 0xffffffffUL; + break; + } case c9_PMXEVTYPER: { val = vcpu_cp15(vcpu, c9_PMSELR); kvm_pmu_set_counter_event_type(vcpu, @@ -737,7 +759,17 @@ static bool access_pmu_cp15_regs(struct kvm_vcpu *vcpu, break; } } else { - *vcpu_reg(vcpu, p->Rt) = vcpu_cp15(vcpu, r->reg); + switch (r->reg) { + case c9_PMXEVCNTR: { + val = kvm_pmu_get_counter_value(vcpu, + vcpu_cp15(vcpu, c9_PMSELR)); + *vcpu_reg(vcpu, p->Rt) = val; + break; + } + default: + *vcpu_reg(vcpu, p->Rt) = vcpu_cp15(vcpu, r->reg); + break; + } } return true; @@ -785,7 +817,8 @@ static const struct sys_reg_desc cp15_regs[] = { { Op1( 0), CRn( 9), CRm(13), Op2( 0), trap_raz_wi }, { Op1( 0), CRn( 9), CRm(13), Op2( 1), access_pmu_cp15_regs, reset_unknown_cp15, c9_PMXEVTYPER }, - { Op1( 0), CRn( 9), CRm(13), Op2( 2), trap_raz_wi }, + { Op1( 0), CRn( 9), CRm(13), Op2( 2), access_pmu_cp15_regs, + reset_unknown_cp15, c9_PMXEVCNTR }, { Op1( 0), CRn( 9), CRm(14), Op2( 0), trap_raz_wi }, { Op1( 0), CRn( 9), CRm(14), Op2( 1), trap_raz_wi }, { Op1( 0), CRn( 9), CRm(14), Op2( 2), trap_raz_wi },