From patchwork Fri Sep 11 08:55:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 53424 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id 7172E22B26 for ; Fri, 11 Sep 2015 09:07:48 +0000 (UTC) Received: by wisv5 with SMTP id v5sf16235217wis.0 for ; Fri, 11 Sep 2015 02:07:47 -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=4yodoXuj8jXArp7/YndR2DLdAfP5xFOM10YU8GOpQfc=; b=aWccrNJ6fG3Kj6TrQIgPkSN3qrVhGZgFyr1LhIAuFB5bti72gwKG2VDZ7vjiYY1T/A lAXZtT0Y5wgwOR2sB3eg3s3b+rEKc0zo8JbPYuBs4w2XhFufJYN34M+3ioV6BRRcnt4U zshzjVJf/GdRrOFwd5yKtXA8ZRSnsm4uMpTCDimke+inGLLftZruZzmR+oC4Pc9k64Tj +v85PsNL2ICQ0J9JmgMp4X5y44dLDbWSwiqKcJFGTyKznn/uyI9dMH1PsRvOCxY3qedc V0BnkUVRP2kuzbfU+SmTg6nYMcIxqpR/qo+tCYmJtN7ZSnsrV/aUa4GwJ93bMG+JAi4r 66bQ== X-Gm-Message-State: ALoCoQnsQLnoBvObg8euERSLxxANRh7Mx6BnrhRKoPn6w7ivjtHYCxPrf6Mwfpl8CbrhcTgaeihF X-Received: by 10.112.139.65 with SMTP id qw1mr10946566lbb.24.1441962467717; Fri, 11 Sep 2015 02:07:47 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.163 with SMTP id w3ls344485lae.21.gmail; Fri, 11 Sep 2015 02:07:47 -0700 (PDT) X-Received: by 10.152.21.229 with SMTP id y5mr19640724lae.44.1441962467462; Fri, 11 Sep 2015 02:07:47 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id l7si381277lbd.125.2015.09.11.02.07.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Sep 2015 02:07:47 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbcao8 with SMTP id ao8so36229241lbc.3 for ; Fri, 11 Sep 2015 02:07:47 -0700 (PDT) X-Received: by 10.152.43.137 with SMTP id w9mr16464905lal.56.1441962467325; Fri, 11 Sep 2015 02:07:47 -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 w3csp1453048lbq; Fri, 11 Sep 2015 02:07:46 -0700 (PDT) X-Received: by 10.107.19.234 with SMTP id 103mr2007685iot.41.1441962466423; Fri, 11 Sep 2015 02:07:46 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [198.137.202.9]) by mx.google.com with ESMTPS id gb7si750046igd.85.2015.09.11.02.07.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Sep 2015 02:07:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 198.137.202.9 as permitted sender) client-ip=198.137.202.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 1ZaKH3-0002RG-Bf; Fri, 11 Sep 2015 09:05:37 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZaK96-0001Da-Ou for linux-arm-kernel@bombadil.infradead.org; Fri, 11 Sep 2015 08:57:24 +0000 Received: from szxga01-in.huawei.com ([58.251.152.64]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZaK92-0005Zy-3p for linux-arm-kernel@lists.infradead.org; Fri, 11 Sep 2015 08:57:23 +0000 Received: from 172.24.1.48 (EHLO SZXEML423-HUB.china.huawei.com) ([172.24.1.48]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CUU27180; Fri, 11 Sep 2015 16:56:00 +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:51 +0800 From: Shannon Zhao To: Subject: [PATCH v2 16/22] KVM: ARM64: Add reset and access handlers for PMUSERENR register Date: Fri, 11 Sep 2015 16:55:09 +0800 Message-ID: <1441961715-11688-17-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_095720_947305_BBB826CA X-CRM114-Status: GOOD ( 13.07 ) X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.4.0 on casper.infradead.org summary: Content analysis details: (-4.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [58.251.152.64 listed in wl.mailspike.net] -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 SPF_PASS SPF: sender matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -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.217.170 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 PMUSERENR is zero, use reset_val(_cp15) with zero for its reset handler. Signed-off-by: Shannon Zhao --- arch/arm64/kvm/sys_regs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 11fc183..b47cd0b 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -597,7 +597,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { access_pmu_regs, reset_unknown, PMXEVCNTR_EL0 }, /* PMUSERENR_EL0 */ { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1110), Op2(0b000), - trap_raz_wi }, + access_pmu_regs, reset_unknown, PMUSERENR_EL0 }, /* PMOVSSET_EL0 */ { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1110), Op2(0b011), access_pmu_regs, reset_unknown, PMOVSSET_EL0 }, @@ -919,7 +919,8 @@ static const struct sys_reg_desc cp15_regs[] = { reset_unknown_cp15, c9_PMXEVTYPER }, { 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( 0), access_pmu_cp15_regs, + reset_val_cp15, c9_PMUSERENR, 0 }, { Op1( 0), CRn( 9), CRm(14), Op2( 1), access_pmu_cp15_regs, reset_unknown_cp15, c9_PMINTENSET }, { Op1( 0), CRn( 9), CRm(14), Op2( 2), access_pmu_cp15_regs,