All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marc Zyngier <maz@kernel.org>
To: linux-arm-kernel@lists.infradead.org,
	kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org
Cc: James Morse <james.morse@arm.com>,
	Julien Thierry <julien.thierry.kdev@gmail.com>,
	Suzuki K Poulose <suzuki.poulose@arm.com>,
	Alexandru Elisei <alexandru.elisei@arm.com>,
	Eric Auger <eric.auger@redhat.com>,
	kernel-team@android.com
Subject: [PATCH v2 7/7] KVM: arm64: Use symbolic names for the PMU versions
Date: Mon, 25 Jan 2021 12:26:38 +0000	[thread overview]
Message-ID: <20210125122638.2947058-8-maz@kernel.org> (raw)
In-Reply-To: <20210125122638.2947058-1-maz@kernel.org>

Instead of using a bunch of magic numbers, use the existing definitions
that have been added since 8673e02e58410 ("arm64: perf: Add support
for ARMv8.5-PMU 64-bit counters")

Signed-off-by: Marc Zyngier <maz@kernel.org>
---
 arch/arm64/kvm/pmu-emul.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c
index 72cd704a8368..cb16ca2eee92 100644
--- a/arch/arm64/kvm/pmu-emul.c
+++ b/arch/arm64/kvm/pmu-emul.c
@@ -23,11 +23,11 @@ static void kvm_pmu_stop_counter(struct kvm_vcpu *vcpu, struct kvm_pmc *pmc);
 static u32 kvm_pmu_event_mask(struct kvm *kvm)
 {
 	switch (kvm->arch.pmuver) {
-	case 1:			/* ARMv8.0 */
+	case ID_AA64DFR0_PMUVER_8_0:
 		return GENMASK(9, 0);
-	case 4:			/* ARMv8.1 */
-	case 5:			/* ARMv8.4 */
-	case 6:			/* ARMv8.5 */
+	case ID_AA64DFR0_PMUVER_8_1:
+	case ID_AA64DFR0_PMUVER_8_4:
+	case ID_AA64DFR0_PMUVER_8_5:
 		return GENMASK(15, 0);
 	default:		/* Shouldn't be here, just for sanity */
 		WARN_ONCE(1, "Unknown PMU version %d\n", kvm->arch.pmuver);
-- 
2.29.2


WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <maz@kernel.org>
To: linux-arm-kernel@lists.infradead.org,
	kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org
Cc: kernel-team@android.com
Subject: [PATCH v2 7/7] KVM: arm64: Use symbolic names for the PMU versions
Date: Mon, 25 Jan 2021 12:26:38 +0000	[thread overview]
Message-ID: <20210125122638.2947058-8-maz@kernel.org> (raw)
In-Reply-To: <20210125122638.2947058-1-maz@kernel.org>

Instead of using a bunch of magic numbers, use the existing definitions
that have been added since 8673e02e58410 ("arm64: perf: Add support
for ARMv8.5-PMU 64-bit counters")

Signed-off-by: Marc Zyngier <maz@kernel.org>
---
 arch/arm64/kvm/pmu-emul.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c
index 72cd704a8368..cb16ca2eee92 100644
--- a/arch/arm64/kvm/pmu-emul.c
+++ b/arch/arm64/kvm/pmu-emul.c
@@ -23,11 +23,11 @@ static void kvm_pmu_stop_counter(struct kvm_vcpu *vcpu, struct kvm_pmc *pmc);
 static u32 kvm_pmu_event_mask(struct kvm *kvm)
 {
 	switch (kvm->arch.pmuver) {
-	case 1:			/* ARMv8.0 */
+	case ID_AA64DFR0_PMUVER_8_0:
 		return GENMASK(9, 0);
-	case 4:			/* ARMv8.1 */
-	case 5:			/* ARMv8.4 */
-	case 6:			/* ARMv8.5 */
+	case ID_AA64DFR0_PMUVER_8_1:
+	case ID_AA64DFR0_PMUVER_8_4:
+	case ID_AA64DFR0_PMUVER_8_5:
 		return GENMASK(15, 0);
 	default:		/* Shouldn't be here, just for sanity */
 		WARN_ONCE(1, "Unknown PMU version %d\n", kvm->arch.pmuver);
-- 
2.29.2

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <maz@kernel.org>
To: linux-arm-kernel@lists.infradead.org,
	kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>,
	kernel-team@android.com, Eric Auger <eric.auger@redhat.com>,
	James Morse <james.morse@arm.com>,
	Alexandru Elisei <alexandru.elisei@arm.com>,
	Julien Thierry <julien.thierry.kdev@gmail.com>
Subject: [PATCH v2 7/7] KVM: arm64: Use symbolic names for the PMU versions
Date: Mon, 25 Jan 2021 12:26:38 +0000	[thread overview]
Message-ID: <20210125122638.2947058-8-maz@kernel.org> (raw)
In-Reply-To: <20210125122638.2947058-1-maz@kernel.org>

Instead of using a bunch of magic numbers, use the existing definitions
that have been added since 8673e02e58410 ("arm64: perf: Add support
for ARMv8.5-PMU 64-bit counters")

Signed-off-by: Marc Zyngier <maz@kernel.org>
---
 arch/arm64/kvm/pmu-emul.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c
index 72cd704a8368..cb16ca2eee92 100644
--- a/arch/arm64/kvm/pmu-emul.c
+++ b/arch/arm64/kvm/pmu-emul.c
@@ -23,11 +23,11 @@ static void kvm_pmu_stop_counter(struct kvm_vcpu *vcpu, struct kvm_pmc *pmc);
 static u32 kvm_pmu_event_mask(struct kvm *kvm)
 {
 	switch (kvm->arch.pmuver) {
-	case 1:			/* ARMv8.0 */
+	case ID_AA64DFR0_PMUVER_8_0:
 		return GENMASK(9, 0);
-	case 4:			/* ARMv8.1 */
-	case 5:			/* ARMv8.4 */
-	case 6:			/* ARMv8.5 */
+	case ID_AA64DFR0_PMUVER_8_1:
+	case ID_AA64DFR0_PMUVER_8_4:
+	case ID_AA64DFR0_PMUVER_8_5:
 		return GENMASK(15, 0);
 	default:		/* Shouldn't be here, just for sanity */
 		WARN_ONCE(1, "Unknown PMU version %d\n", kvm->arch.pmuver);
-- 
2.29.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2021-01-26 20:24 UTC|newest]

Thread overview: 87+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-25 12:26 [PATCH v2 0/7] KVM: arm64: More PMU/debug ID register fixes Marc Zyngier
2021-01-25 12:26 ` Marc Zyngier
2021-01-25 12:26 ` Marc Zyngier
2021-01-25 12:26 ` [PATCH v2 1/7] KVM: arm64: Fix missing RES1 in emulation of DBGBIDR Marc Zyngier
2021-01-25 12:26   ` Marc Zyngier
2021-01-25 12:26   ` Marc Zyngier
2021-01-26 17:32   ` Alexandru Elisei
2021-01-26 17:32     ` Alexandru Elisei
2021-01-26 17:32     ` Alexandru Elisei
2021-01-25 12:26 ` [PATCH v2 2/7] KVM: arm64: Fix AArch32 PMUv3 capping Marc Zyngier
2021-01-25 12:26   ` Marc Zyngier
2021-01-25 12:26   ` Marc Zyngier
2021-01-26 17:35   ` Alexandru Elisei
2021-01-26 17:35     ` Alexandru Elisei
2021-01-26 17:35     ` Alexandru Elisei
2021-01-25 12:26 ` [PATCH v2 3/7] KVM: arm64: Add handling of AArch32 PCMEID{2,3} PMUv3 registers Marc Zyngier
2021-01-25 12:26   ` [PATCH v2 3/7] KVM: arm64: Add handling of AArch32 PCMEID{2, 3} " Marc Zyngier
2021-01-25 12:26   ` Marc Zyngier
2021-01-25 12:26 ` [PATCH v2 4/7] KVM: arm64: Refactor filtering of ID registers Marc Zyngier
2021-01-25 12:26   ` Marc Zyngier
2021-01-25 12:26   ` Marc Zyngier
2021-01-27 12:12   ` Alexandru Elisei
2021-01-27 12:12     ` Alexandru Elisei
2021-01-27 12:12     ` Alexandru Elisei
2021-01-25 12:26 ` [PATCH v2 5/7] KVM: arm64: Limit the debug architecture to ARMv8.0 Marc Zyngier
2021-01-25 12:26   ` Marc Zyngier
2021-01-25 12:26   ` Marc Zyngier
2021-01-27 12:18   ` Alexandru Elisei
2021-01-27 12:18     ` Alexandru Elisei
2021-01-27 12:18     ` Alexandru Elisei
2021-01-25 12:26 ` [PATCH v2 6/7] KVM: arm64: Upgrade PMU support to ARMv8.4 Marc Zyngier
2021-01-25 12:26   ` Marc Zyngier
2021-01-25 12:26   ` Marc Zyngier
2021-01-27 14:09   ` Alexandru Elisei
2021-01-27 14:09     ` Alexandru Elisei
2021-01-27 14:09     ` Alexandru Elisei
2021-01-27 14:35     ` Marc Zyngier
2021-01-27 14:35       ` Marc Zyngier
2021-01-27 14:35       ` Marc Zyngier
2021-01-27 17:00       ` Alexandru Elisei
2021-01-27 17:00         ` Alexandru Elisei
2021-01-27 17:00         ` Alexandru Elisei
2021-01-27 17:23         ` Marc Zyngier
2021-01-27 17:23           ` Marc Zyngier
2021-01-27 17:23           ` Marc Zyngier
2021-01-27 17:41   ` Alexandru Elisei
2021-01-27 17:41     ` Alexandru Elisei
2021-01-27 17:41     ` Alexandru Elisei
2021-02-03 10:32     ` Marc Zyngier
2021-02-03 10:32       ` Marc Zyngier
2021-02-03 10:32       ` Marc Zyngier
2021-02-03 17:29       ` Alexandru Elisei
2021-02-03 17:29         ` Alexandru Elisei
2021-02-03 17:29         ` Alexandru Elisei
2021-01-27 17:53   ` Auger Eric
2021-01-27 17:53     ` Auger Eric
2021-01-27 17:53     ` Auger Eric
2021-02-03 10:36     ` Marc Zyngier
2021-02-03 10:36       ` Marc Zyngier
2021-02-03 10:36       ` Marc Zyngier
2021-02-03 11:07       ` Auger Eric
2021-02-03 11:07         ` Auger Eric
2021-02-03 11:07         ` Auger Eric
2021-02-03 11:20         ` Marc Zyngier
2021-02-03 11:20           ` Marc Zyngier
2021-02-03 11:20           ` Marc Zyngier
2021-02-03 12:39           ` Auger Eric
2021-02-03 12:39             ` Auger Eric
2021-02-03 12:39             ` Auger Eric
2021-02-03 13:28             ` Marc Zyngier
2021-02-03 13:28               ` Marc Zyngier
2021-02-03 13:28               ` Marc Zyngier
2021-02-04 12:32               ` Alexandru Elisei
2021-02-04 12:32                 ` Alexandru Elisei
2021-02-04 12:32                 ` Alexandru Elisei
2021-02-04 14:21                 ` Marc Zyngier
2021-02-04 14:21                   ` Marc Zyngier
2021-02-04 14:21                   ` Marc Zyngier
2021-01-25 12:26 ` Marc Zyngier [this message]
2021-01-25 12:26   ` [PATCH v2 7/7] KVM: arm64: Use symbolic names for the PMU versions Marc Zyngier
2021-01-25 12:26   ` Marc Zyngier
2021-01-27 14:28   ` Alexandru Elisei
2021-01-27 14:28     ` Alexandru Elisei
2021-01-27 14:28     ` Alexandru Elisei
2021-01-27 17:56   ` Auger Eric
2021-01-27 17:56     ` Auger Eric
2021-01-27 17:56     ` Auger Eric

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=20210125122638.2947058-8-maz@kernel.org \
    --to=maz@kernel.org \
    --cc=alexandru.elisei@arm.com \
    --cc=eric.auger@redhat.com \
    --cc=james.morse@arm.com \
    --cc=julien.thierry.kdev@gmail.com \
    --cc=kernel-team@android.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=suzuki.poulose@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: link
Be 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.