From: Shannon Zhao <shannon.zhao@linaro.org> To: kvmarm@lists.cs.columbia.edu Cc: linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, marc.zyngier@arm.com, christoffer.dall@linaro.org, will.deacon@arm.com, wei@redhat.com, alex.bennee@linaro.org, peter.huangpeng@huawei.com, shannon.zhao@linaro.org Subject: [PATCH v3 05/20] KVM: ARM64: Add reset and access handlers for PMSELR register Date: Thu, 24 Sep 2015 15:31:10 -0700 [thread overview] Message-ID: <1443133885-3366-6-git-send-email-shannon.zhao@linaro.org> (raw) In-Reply-To: <1443133885-3366-1-git-send-email-shannon.zhao@linaro.org> Since the reset value of PMSELR_EL0 is UNKNOWN, use reset_unknown for its reset handler. As it doesn't need to deal with the acsessing action specially, it uses default case to emulate writing and reading PMSELR register. Add a helper for CP15 registers reset to UNKNOWN. Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> --- arch/arm64/kvm/sys_regs.c | 5 +++-- arch/arm64/kvm/sys_regs.h | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 60c0842..f73aea9 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -700,7 +700,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { trap_raz_wi }, /* PMSELR_EL0 */ { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b101), - trap_raz_wi }, + access_pmu_regs, reset_unknown, PMSELR_EL0 }, /* PMCEID0_EL0 */ { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b110), trap_raz_wi }, @@ -980,7 +980,8 @@ static const struct sys_reg_desc cp15_regs[] = { { Op1( 0), CRn( 9), CRm(12), Op2( 1), trap_raz_wi }, { Op1( 0), CRn( 9), CRm(12), Op2( 2), trap_raz_wi }, { Op1( 0), CRn( 9), CRm(12), Op2( 3), trap_raz_wi }, - { Op1( 0), CRn( 9), CRm(12), Op2( 5), trap_raz_wi }, + { Op1( 0), CRn( 9), CRm(12), Op2( 5), access_pmu_cp15_regs, + reset_unknown_cp15, c9_PMSELR }, { Op1( 0), CRn( 9), CRm(12), Op2( 6), trap_raz_wi }, { Op1( 0), CRn( 9), CRm(12), Op2( 7), trap_raz_wi }, { Op1( 0), CRn( 9), CRm(13), Op2( 0), trap_raz_wi }, diff --git a/arch/arm64/kvm/sys_regs.h b/arch/arm64/kvm/sys_regs.h index eaa324e..8afeff7 100644 --- a/arch/arm64/kvm/sys_regs.h +++ b/arch/arm64/kvm/sys_regs.h @@ -110,6 +110,14 @@ static inline void reset_unknown(struct kvm_vcpu *vcpu, vcpu_sys_reg(vcpu, r->reg) = 0x1de7ec7edbadc0deULL; } +static inline void reset_unknown_cp15(struct kvm_vcpu *vcpu, + const struct sys_reg_desc *r) +{ + BUG_ON(!r->reg); + BUG_ON(r->reg >= NR_COPRO_REGS); + vcpu_cp15(vcpu, r->reg) = 0xdecafbad; +} + static inline void reset_val(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r) { BUG_ON(!r->reg); -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: shannon.zhao@linaro.org (Shannon Zhao) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 05/20] KVM: ARM64: Add reset and access handlers for PMSELR register Date: Thu, 24 Sep 2015 15:31:10 -0700 [thread overview] Message-ID: <1443133885-3366-6-git-send-email-shannon.zhao@linaro.org> (raw) In-Reply-To: <1443133885-3366-1-git-send-email-shannon.zhao@linaro.org> Since the reset value of PMSELR_EL0 is UNKNOWN, use reset_unknown for its reset handler. As it doesn't need to deal with the acsessing action specially, it uses default case to emulate writing and reading PMSELR register. Add a helper for CP15 registers reset to UNKNOWN. Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> --- arch/arm64/kvm/sys_regs.c | 5 +++-- arch/arm64/kvm/sys_regs.h | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 60c0842..f73aea9 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -700,7 +700,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { trap_raz_wi }, /* PMSELR_EL0 */ { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b101), - trap_raz_wi }, + access_pmu_regs, reset_unknown, PMSELR_EL0 }, /* PMCEID0_EL0 */ { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b110), trap_raz_wi }, @@ -980,7 +980,8 @@ static const struct sys_reg_desc cp15_regs[] = { { Op1( 0), CRn( 9), CRm(12), Op2( 1), trap_raz_wi }, { Op1( 0), CRn( 9), CRm(12), Op2( 2), trap_raz_wi }, { Op1( 0), CRn( 9), CRm(12), Op2( 3), trap_raz_wi }, - { Op1( 0), CRn( 9), CRm(12), Op2( 5), trap_raz_wi }, + { Op1( 0), CRn( 9), CRm(12), Op2( 5), access_pmu_cp15_regs, + reset_unknown_cp15, c9_PMSELR }, { Op1( 0), CRn( 9), CRm(12), Op2( 6), trap_raz_wi }, { Op1( 0), CRn( 9), CRm(12), Op2( 7), trap_raz_wi }, { Op1( 0), CRn( 9), CRm(13), Op2( 0), trap_raz_wi }, diff --git a/arch/arm64/kvm/sys_regs.h b/arch/arm64/kvm/sys_regs.h index eaa324e..8afeff7 100644 --- a/arch/arm64/kvm/sys_regs.h +++ b/arch/arm64/kvm/sys_regs.h @@ -110,6 +110,14 @@ static inline void reset_unknown(struct kvm_vcpu *vcpu, vcpu_sys_reg(vcpu, r->reg) = 0x1de7ec7edbadc0deULL; } +static inline void reset_unknown_cp15(struct kvm_vcpu *vcpu, + const struct sys_reg_desc *r) +{ + BUG_ON(!r->reg); + BUG_ON(r->reg >= NR_COPRO_REGS); + vcpu_cp15(vcpu, r->reg) = 0xdecafbad; +} + static inline void reset_val(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r) { BUG_ON(!r->reg); -- 2.1.4
next prev parent reply other threads:[~2015-09-24 22:32 UTC|newest] Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-09-24 22:31 [PATCH v3 00/20] KVM: ARM64: Add guest PMU support Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-09-24 22:31 ` [PATCH v3 01/20] ARM64: Move PMU register related defines to asm/pmu.h Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-09-24 22:31 ` [PATCH v3 02/20] KVM: ARM64: Define PMU data structure for each vcpu Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-09-24 22:31 ` [PATCH v3 03/20] KVM: ARM64: Add offset defines for PMU registers Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-10-07 8:25 ` Marc Zyngier 2015-10-07 8:25 ` Marc Zyngier 2015-09-24 22:31 ` [PATCH v3 04/20] KVM: ARM64: Add reset and access handlers for PMCR_EL0 register Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-10-16 5:35 ` Wei Huang 2015-10-16 5:35 ` Wei Huang 2015-10-21 6:27 ` Shannon Zhao 2015-10-21 6:27 ` Shannon Zhao 2015-10-21 6:27 ` Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao [this message] 2015-09-24 22:31 ` [PATCH v3 05/20] KVM: ARM64: Add reset and access handlers for PMSELR register Shannon Zhao 2015-09-24 22:31 ` [PATCH v3 06/20] KVM: ARM64: Add reset and access handlers for PMCEID0 and PMCEID1 register Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-09-24 22:31 ` [PATCH v3 07/20] KVM: ARM64: PMU: Add perf event map and introduce perf event creating function Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-10-16 6:08 ` Wei Huang 2015-10-16 6:08 ` Wei Huang 2015-10-21 6:32 ` Shannon Zhao 2015-10-21 6:32 ` Shannon Zhao 2015-10-21 6:32 ` Shannon Zhao 2015-09-24 22:31 ` [PATCH v3 08/20] KVM: ARM64: Add reset and access handlers for PMXEVTYPER register Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-09-24 22:31 ` [PATCH v3 09/20] KVM: ARM64: Add reset and access handlers for PMXEVCNTR register Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-09-24 22:31 ` [PATCH v3 10/20] KVM: ARM64: Add reset and access handlers for PMCCNTR register Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-10-16 15:06 ` Wei Huang 2015-10-16 15:06 ` Wei Huang 2015-10-21 6:48 ` Shannon Zhao 2015-10-21 6:48 ` Shannon Zhao 2015-10-21 6:48 ` Shannon Zhao 2015-09-24 22:31 ` [PATCH v3 11/20] KVM: ARM64: Add reset and access handlers for PMCNTENSET and PMCNTENCLR register Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-09-24 22:31 ` [PATCH v3 12/20] KVM: ARM64: Add reset and access handlers for PMINTENSET and PMINTENCLR register Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-09-24 22:31 ` [PATCH v3 13/20] KVM: ARM64: Add reset and access handlers for PMOVSSET and PMOVSCLR register Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-09-24 22:31 ` [PATCH v3 14/20] KVM: ARM64: Add reset and access handlers for PMUSERENR register Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-09-24 22:31 ` [PATCH v3 15/20] KVM: ARM64: Add reset and access handlers for PMSWINC register Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-10-16 15:25 ` Wei Huang 2015-10-16 15:25 ` Wei Huang 2015-10-21 7:02 ` Shannon Zhao 2015-10-21 7:02 ` Shannon Zhao 2015-10-21 7:02 ` Shannon Zhao 2015-09-24 22:31 ` [PATCH v3 16/20] KVM: ARM64: Add access handlers for PMEVCNTRn and PMEVTYPERn register Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-09-24 22:31 ` [PATCH v3 17/20] KVM: ARM64: Add PMU overflow interrupt routing Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-10-07 8:17 ` Marc Zyngier 2015-10-07 8:17 ` Marc Zyngier 2015-09-24 22:31 ` [PATCH v3 18/20] KVM: ARM64: Reset PMU state when resetting vcpu Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-10-16 15:28 ` Wei Huang 2015-10-16 15:28 ` Wei Huang 2015-09-24 22:31 ` [PATCH v3 19/20] KVM: ARM64: Free perf event of PMU when destroying vcpu Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-09-24 22:31 ` [PATCH v3 20/20] KVM: ARM64: Add a new kvm ARM PMU device Shannon Zhao 2015-09-24 22:31 ` Shannon Zhao 2015-10-16 4:55 ` [PATCH v3 00/20] KVM: ARM64: Add guest PMU support Wei Huang 2015-10-16 4:55 ` Wei Huang 2015-10-16 17:01 ` Christopher Covington 2015-10-16 17:01 ` Christopher Covington 2015-10-21 7:26 ` Shannon Zhao 2015-10-21 7:26 ` Shannon Zhao 2015-10-21 7:26 ` Shannon Zhao 2015-10-26 11:33 ` Christoffer Dall 2015-10-26 11:33 ` Christoffer Dall 2015-10-27 1:15 ` Shannon Zhao 2015-10-27 1:15 ` Shannon Zhao
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1443133885-3366-6-git-send-email-shannon.zhao@linaro.org \ --to=shannon.zhao@linaro.org \ --cc=alex.bennee@linaro.org \ --cc=christoffer.dall@linaro.org \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ --cc=peter.huangpeng@huawei.com \ --cc=wei@redhat.com \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.