From patchwork Mon Jul 6 02:17:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 50680 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CC40C229E5 for ; Mon, 6 Jul 2015 02:20:24 +0000 (UTC) Received: by lagh6 with SMTP id h6sf42464239lag.0 for ; Sun, 05 Jul 2015 19:20:23 -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:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:cc:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=/We8BfG3ojC31KGhNZ6+/Un9NpDa+wf8KCb+9EE8TwM=; b=Szb+EoOfioiJxBQ2+kWQ+6+O1IYG6UPlEkq5cf7GSnUnQEFOdURQg1BtknJw8SZXdq zZ/P+W5TOFFjUOOwJG7hLylN8QAnCUpOJMBBWP+bkCQC607QVo7kCFVbd4pqN3PUHROU Zyw5/GCBjPy2M9WMQKiEKla4TVtfr2gygrtkwEik3KwmRJRwsE2ysLXhbTKm+42j97IV H6ghl5Q0YV+udvTl29BGtRC2Eaw51t4q57XCOmrUmkk8BM6PscnwHd8q5ZP1yfZ+gAyZ yBDnj5AwlbhgbcX5QWKyiNSxq3vW96a+iiPDIJXFWBbxiYrNi8S7F0z6v0Jh7h+t5MJE gF9A== X-Gm-Message-State: ALoCoQlPODFKfSCGZbAb4fxQX9Bjoo76TNi8wE5hJ6UT0GAnCBjXZumF6nD3DE5akN2NFX4bajon X-Received: by 10.181.12.104 with SMTP id ep8mr27123738wid.7.1436149223800; Sun, 05 Jul 2015 19:20:23 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.111 with SMTP id q15ls546918laa.28.gmail; Sun, 05 Jul 2015 19:20:23 -0700 (PDT) X-Received: by 10.152.164.193 with SMTP id ys1mr46725028lab.65.1436149223497; Sun, 05 Jul 2015 19:20:23 -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 qs3si13932152lbb.164.2015.07.05.19.20.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Jul 2015 19:20:23 -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 lagh6 with SMTP id h6so137406913lag.2 for ; Sun, 05 Jul 2015 19:20:23 -0700 (PDT) X-Received: by 10.152.5.197 with SMTP id u5mr8039822lau.76.1436149223413; Sun, 05 Jul 2015 19:20:23 -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.108.230 with SMTP id hn6csp1426114lbb; Sun, 5 Jul 2015 19:20:22 -0700 (PDT) X-Received: by 10.67.2.34 with SMTP id bl2mr41155746pad.104.1436149221644; Sun, 05 Jul 2015 19:20:21 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id dv10si26385636pdb.202.2015.07.05.19.20.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Jul 2015 19:20:21 -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 1ZBw05-0006S7-1b; Mon, 06 Jul 2015 02:19:17 +0000 Received: from mail-pd0-f175.google.com ([209.85.192.175]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZBvzd-0005sS-0q for linux-arm-kernel@lists.infradead.org; Mon, 06 Jul 2015 02:18:49 +0000 Received: by pddu5 with SMTP id u5so9057018pdd.3 for ; Sun, 05 Jul 2015 19:18:32 -0700 (PDT) X-Received: by 10.67.11.9 with SMTP id ee9mr72878803pad.83.1436149112269; Sun, 05 Jul 2015 19:18:32 -0700 (PDT) Received: from localhost ([120.136.34.248]) by mx.google.com with ESMTPSA id oe10sm16227766pdb.19.2015.07.05.19.18.30 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 05 Jul 2015 19:18:31 -0700 (PDT) From: shannon.zhao@linaro.org To: kvmarm@lists.cs.columbia.edu Subject: [PATCH 08/18] KVM: ARM64: Add reset and access handlers for PMXEVTYPER_EL0 register Date: Mon, 6 Jul 2015 10:17:38 +0800 Message-Id: <1436149068-3784-9-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1436149068-3784-1-git-send-email-shannon.zhao@linaro.org> References: <1436149068-3784-1-git-send-email-shannon.zhao@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150705_191849_090501_AEEE6B0B X-CRM114-Status: GOOD ( 13.04 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.192.175 listed in wl.mailspike.net] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.192.175 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 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: kvm@vger.kernel.org, marc.zyngier@arm.com, will.deacon@arm.com, linux-arm-kernel@lists.infradead.org, zhaoshenglong@huawei.com, alex.bennee@linaro.org, christoffer.dall@linaro.org, shannon.zhao@linaro.org MIME-Version: 1.0 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: shannon.zhao@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.mail=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 PMXEVTYPER_EL0 is UNKNOWN, use reset_unknown for its reset handler. Add access handler which emulates writing and reading PMXEVTYPER_EL0 register. When writing to PMXEVTYPER_EL0, call kvm_pmu_set_counter_event_type create a perf event for the selected event type. Signed-off-by: Shannon Zhao --- arch/arm64/kvm/sys_regs.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 1df9ef3..b4f8dd9 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -331,6 +331,31 @@ static bool access_pmceid(struct kvm_vcpu *vcpu, } } +/* PMXEVTYPER_EL0 accessor. */ +static bool access_pmxevtyper(struct kvm_vcpu *vcpu, + const struct sys_reg_params *p, + const struct sys_reg_desc *r) +{ + unsigned long val; + + if (p->is_write) { + if (!p->is_aarch32) + vcpu_sys_reg(vcpu, r->reg) = *vcpu_reg(vcpu, p->Rt); + else + vcpu_cp15(vcpu, r->reg) = *vcpu_reg(vcpu, p->Rt); + kvm_pmu_set_counter_event_type(vcpu, *vcpu_reg(vcpu, p->Rt), + vcpu_sys_reg(vcpu, PMSELR_EL0)); + } else { + if (!p->is_aarch32) + val = vcpu_sys_reg(vcpu, r->reg); + else + val = vcpu_cp15(vcpu, r->reg); + *vcpu_reg(vcpu, p->Rt) = val; + } + + return true; +} + /* Silly macro to expand the DBG{BCR,BVR,WVR,WCR}n_EL1 registers in one go */ #define DBG_BCR_BVR_WCR_WVR_EL1(n) \ /* DBGBVRn_EL1 */ \ @@ -549,7 +574,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { trap_raz_wi }, /* PMXEVTYPER_EL0 */ { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1101), Op2(0b001), - trap_raz_wi }, + access_pmxevtyper, reset_unknown, PMXEVTYPER_EL0 }, /* PMXEVCNTR_EL0 */ { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1101), Op2(0b010), trap_raz_wi },