From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com, maz@kernel.org,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
qemu-devel@nongnu.org, qemu-arm@nongnu.org
Cc: drjones@redhat.com, andrew.murray@arm.com,
andre.przywara@arm.com, peter.maydell@linaro.org,
alexandru.elisei@arm.com
Subject: [kvm-unit-tests PATCH v4 05/12] arm: pmu: Introduce defines for PMU versions
Date: Fri, 3 Apr 2020 09:13:19 +0200 [thread overview]
Message-ID: <20200403071326.29932-6-eric.auger@redhat.com> (raw)
In-Reply-To: <20200403071326.29932-1-eric.auger@redhat.com>
Introduce some defines encoding the different PMU versions.
v3 is encoded differently in 32 and 64 bits.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
arm/pmu.c | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/arm/pmu.c b/arm/pmu.c
index d827e82..a04588a 100644
--- a/arm/pmu.c
+++ b/arm/pmu.c
@@ -45,6 +45,15 @@ static struct pmu pmu;
#define ID_DFR0_PERFMON_SHIFT 24
#define ID_DFR0_PERFMON_MASK 0xf
+#define ID_DFR0_PMU_NOTIMPL 0b0000
+#define ID_DFR0_PMU_V1 0b0001
+#define ID_DFR0_PMU_V2 0b0010
+#define ID_DFR0_PMU_V3 0b0011
+#define ID_DFR0_PMU_V3_8_1 0b0100
+#define ID_DFR0_PMU_V3_8_4 0b0101
+#define ID_DFR0_PMU_V3_8_5 0b0110
+#define ID_DFR0_PMU_IMPDEF 0b1111
+
#define PMCR __ACCESS_CP15(c9, 0, c12, 0)
#define ID_DFR0 __ACCESS_CP15(c0, 0, c1, 2)
#define PMSELR __ACCESS_CP15(c9, 0, c12, 5)
@@ -105,6 +114,13 @@ static inline void precise_instrs_loop(int loop, uint32_t pmcr)
#define ID_AA64DFR0_PERFMON_SHIFT 8
#define ID_AA64DFR0_PERFMON_MASK 0xf
+#define ID_DFR0_PMU_NOTIMPL 0b0000
+#define ID_DFR0_PMU_V3 0b0001
+#define ID_DFR0_PMU_V3_8_1 0b0100
+#define ID_DFR0_PMU_V3_8_4 0b0101
+#define ID_DFR0_PMU_V3_8_5 0b0110
+#define ID_DFR0_PMU_IMPDEF 0b1111
+
static inline uint32_t get_id_aa64dfr0(void) { return read_sysreg(id_aa64dfr0_el1); }
static inline uint32_t get_pmcr(void) { return read_sysreg(pmcr_el0); }
static inline void set_pmcr(uint32_t v) { write_sysreg(v, pmcr_el0); }
@@ -116,7 +132,7 @@ static inline void set_pmccfiltr(uint32_t v) { write_sysreg(v, pmccfiltr_el0); }
static inline uint8_t get_pmu_version(void)
{
uint8_t ver = (get_id_aa64dfr0() >> ID_AA64DFR0_PERFMON_SHIFT) & ID_AA64DFR0_PERFMON_MASK;
- return ver == 1 ? 3 : ver;
+ return ver;
}
/*
@@ -249,7 +265,7 @@ static bool check_cpi(int cpi)
static void pmccntr64_test(void)
{
#ifdef __arm__
- if (pmu.version == 0x3) {
+ if (pmu.version == ID_DFR0_PMU_V3) {
if (ERRATA(9e3f7a296940)) {
write_sysreg(0xdead, PMCCNTR64);
report(read_sysreg(PMCCNTR64) == 0xdead, "pmccntr64");
@@ -262,13 +278,13 @@ static void pmccntr64_test(void)
/* Return FALSE if no PMU found, otherwise return TRUE */
static bool pmu_probe(void)
{
- uint32_t pmcr;
+ uint32_t pmcr = get_pmcr();
pmu.version = get_pmu_version();
- if (pmu.version == 0 || pmu.version == 0xf)
+ if (pmu.version == ID_DFR0_PMU_NOTIMPL || pmu.version == ID_DFR0_PMU_IMPDEF)
return false;
- report_info("PMU version: %d", pmu.version);
+ report_info("PMU version: 0x%x", pmu.version);
pmcr = get_pmcr();
report_info("PMU implementer/ID code: %#x(\"%c\")/%#x",
--
2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com, maz@kernel.org,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
qemu-devel@nongnu.org, qemu-arm@nongnu.org
Cc: peter.maydell@linaro.org, andrew.murray@arm.com,
drjones@redhat.com, alexandru.elisei@arm.com,
andre.przywara@arm.com
Subject: [kvm-unit-tests PATCH v4 05/12] arm: pmu: Introduce defines for PMU versions
Date: Fri, 3 Apr 2020 09:13:19 +0200 [thread overview]
Message-ID: <20200403071326.29932-6-eric.auger@redhat.com> (raw)
In-Reply-To: <20200403071326.29932-1-eric.auger@redhat.com>
Introduce some defines encoding the different PMU versions.
v3 is encoded differently in 32 and 64 bits.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
arm/pmu.c | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/arm/pmu.c b/arm/pmu.c
index d827e82..a04588a 100644
--- a/arm/pmu.c
+++ b/arm/pmu.c
@@ -45,6 +45,15 @@ static struct pmu pmu;
#define ID_DFR0_PERFMON_SHIFT 24
#define ID_DFR0_PERFMON_MASK 0xf
+#define ID_DFR0_PMU_NOTIMPL 0b0000
+#define ID_DFR0_PMU_V1 0b0001
+#define ID_DFR0_PMU_V2 0b0010
+#define ID_DFR0_PMU_V3 0b0011
+#define ID_DFR0_PMU_V3_8_1 0b0100
+#define ID_DFR0_PMU_V3_8_4 0b0101
+#define ID_DFR0_PMU_V3_8_5 0b0110
+#define ID_DFR0_PMU_IMPDEF 0b1111
+
#define PMCR __ACCESS_CP15(c9, 0, c12, 0)
#define ID_DFR0 __ACCESS_CP15(c0, 0, c1, 2)
#define PMSELR __ACCESS_CP15(c9, 0, c12, 5)
@@ -105,6 +114,13 @@ static inline void precise_instrs_loop(int loop, uint32_t pmcr)
#define ID_AA64DFR0_PERFMON_SHIFT 8
#define ID_AA64DFR0_PERFMON_MASK 0xf
+#define ID_DFR0_PMU_NOTIMPL 0b0000
+#define ID_DFR0_PMU_V3 0b0001
+#define ID_DFR0_PMU_V3_8_1 0b0100
+#define ID_DFR0_PMU_V3_8_4 0b0101
+#define ID_DFR0_PMU_V3_8_5 0b0110
+#define ID_DFR0_PMU_IMPDEF 0b1111
+
static inline uint32_t get_id_aa64dfr0(void) { return read_sysreg(id_aa64dfr0_el1); }
static inline uint32_t get_pmcr(void) { return read_sysreg(pmcr_el0); }
static inline void set_pmcr(uint32_t v) { write_sysreg(v, pmcr_el0); }
@@ -116,7 +132,7 @@ static inline void set_pmccfiltr(uint32_t v) { write_sysreg(v, pmccfiltr_el0); }
static inline uint8_t get_pmu_version(void)
{
uint8_t ver = (get_id_aa64dfr0() >> ID_AA64DFR0_PERFMON_SHIFT) & ID_AA64DFR0_PERFMON_MASK;
- return ver == 1 ? 3 : ver;
+ return ver;
}
/*
@@ -249,7 +265,7 @@ static bool check_cpi(int cpi)
static void pmccntr64_test(void)
{
#ifdef __arm__
- if (pmu.version == 0x3) {
+ if (pmu.version == ID_DFR0_PMU_V3) {
if (ERRATA(9e3f7a296940)) {
write_sysreg(0xdead, PMCCNTR64);
report(read_sysreg(PMCCNTR64) == 0xdead, "pmccntr64");
@@ -262,13 +278,13 @@ static void pmccntr64_test(void)
/* Return FALSE if no PMU found, otherwise return TRUE */
static bool pmu_probe(void)
{
- uint32_t pmcr;
+ uint32_t pmcr = get_pmcr();
pmu.version = get_pmu_version();
- if (pmu.version == 0 || pmu.version == 0xf)
+ if (pmu.version == ID_DFR0_PMU_NOTIMPL || pmu.version == ID_DFR0_PMU_IMPDEF)
return false;
- report_info("PMU version: %d", pmu.version);
+ report_info("PMU version: 0x%x", pmu.version);
pmcr = get_pmcr();
report_info("PMU implementer/ID code: %#x(\"%c\")/%#x",
--
2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com, maz@kernel.org,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
qemu-devel@nongnu.org, qemu-arm@nongnu.org
Cc: andrew.murray@arm.com, andre.przywara@arm.com
Subject: [kvm-unit-tests PATCH v4 05/12] arm: pmu: Introduce defines for PMU versions
Date: Fri, 3 Apr 2020 09:13:19 +0200 [thread overview]
Message-ID: <20200403071326.29932-6-eric.auger@redhat.com> (raw)
In-Reply-To: <20200403071326.29932-1-eric.auger@redhat.com>
Introduce some defines encoding the different PMU versions.
v3 is encoded differently in 32 and 64 bits.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
arm/pmu.c | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/arm/pmu.c b/arm/pmu.c
index d827e82..a04588a 100644
--- a/arm/pmu.c
+++ b/arm/pmu.c
@@ -45,6 +45,15 @@ static struct pmu pmu;
#define ID_DFR0_PERFMON_SHIFT 24
#define ID_DFR0_PERFMON_MASK 0xf
+#define ID_DFR0_PMU_NOTIMPL 0b0000
+#define ID_DFR0_PMU_V1 0b0001
+#define ID_DFR0_PMU_V2 0b0010
+#define ID_DFR0_PMU_V3 0b0011
+#define ID_DFR0_PMU_V3_8_1 0b0100
+#define ID_DFR0_PMU_V3_8_4 0b0101
+#define ID_DFR0_PMU_V3_8_5 0b0110
+#define ID_DFR0_PMU_IMPDEF 0b1111
+
#define PMCR __ACCESS_CP15(c9, 0, c12, 0)
#define ID_DFR0 __ACCESS_CP15(c0, 0, c1, 2)
#define PMSELR __ACCESS_CP15(c9, 0, c12, 5)
@@ -105,6 +114,13 @@ static inline void precise_instrs_loop(int loop, uint32_t pmcr)
#define ID_AA64DFR0_PERFMON_SHIFT 8
#define ID_AA64DFR0_PERFMON_MASK 0xf
+#define ID_DFR0_PMU_NOTIMPL 0b0000
+#define ID_DFR0_PMU_V3 0b0001
+#define ID_DFR0_PMU_V3_8_1 0b0100
+#define ID_DFR0_PMU_V3_8_4 0b0101
+#define ID_DFR0_PMU_V3_8_5 0b0110
+#define ID_DFR0_PMU_IMPDEF 0b1111
+
static inline uint32_t get_id_aa64dfr0(void) { return read_sysreg(id_aa64dfr0_el1); }
static inline uint32_t get_pmcr(void) { return read_sysreg(pmcr_el0); }
static inline void set_pmcr(uint32_t v) { write_sysreg(v, pmcr_el0); }
@@ -116,7 +132,7 @@ static inline void set_pmccfiltr(uint32_t v) { write_sysreg(v, pmccfiltr_el0); }
static inline uint8_t get_pmu_version(void)
{
uint8_t ver = (get_id_aa64dfr0() >> ID_AA64DFR0_PERFMON_SHIFT) & ID_AA64DFR0_PERFMON_MASK;
- return ver == 1 ? 3 : ver;
+ return ver;
}
/*
@@ -249,7 +265,7 @@ static bool check_cpi(int cpi)
static void pmccntr64_test(void)
{
#ifdef __arm__
- if (pmu.version == 0x3) {
+ if (pmu.version == ID_DFR0_PMU_V3) {
if (ERRATA(9e3f7a296940)) {
write_sysreg(0xdead, PMCCNTR64);
report(read_sysreg(PMCCNTR64) == 0xdead, "pmccntr64");
@@ -262,13 +278,13 @@ static void pmccntr64_test(void)
/* Return FALSE if no PMU found, otherwise return TRUE */
static bool pmu_probe(void)
{
- uint32_t pmcr;
+ uint32_t pmcr = get_pmcr();
pmu.version = get_pmu_version();
- if (pmu.version == 0 || pmu.version == 0xf)
+ if (pmu.version == ID_DFR0_PMU_NOTIMPL || pmu.version == ID_DFR0_PMU_IMPDEF)
return false;
- report_info("PMU version: %d", pmu.version);
+ report_info("PMU version: 0x%x", pmu.version);
pmcr = get_pmcr();
report_info("PMU implementer/ID code: %#x(\"%c\")/%#x",
--
2.20.1
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2020-04-03 7:14 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 7:13 [kvm-unit-tests PATCH v4 00/12] KVM: arm64: PMUv3 Event Counter Tests Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` [kvm-unit-tests PATCH v4 01/12] arm64: Provide read/write_sysreg_s Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` [kvm-unit-tests PATCH v4 02/12] arm: pmu: Let pmu tests take a sub-test parameter Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` [kvm-unit-tests PATCH v4 03/12] arm: pmu: Don't check PMCR.IMP anymore Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` [kvm-unit-tests PATCH v4 04/12] arm: pmu: Add a pmu struct Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` Eric Auger [this message]
2020-04-03 7:13 ` [kvm-unit-tests PATCH v4 05/12] arm: pmu: Introduce defines for PMU versions Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` [kvm-unit-tests PATCH v4 06/12] arm: pmu: Check Required Event Support Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` [kvm-unit-tests PATCH v4 07/12] arm: pmu: Basic event counter Tests Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` Eric Auger
2022-09-19 14:30 ` Zenghui Yu
2022-09-19 14:30 ` Zenghui Yu via
2022-09-19 14:30 ` Zenghui Yu
2022-09-19 15:10 ` Andrew Jones
2022-09-19 15:10 ` Andrew Jones
2022-09-20 9:23 ` Eric Auger
2022-09-20 9:23 ` Eric Auger
2022-09-20 11:16 ` Zenghui Yu
2022-09-20 11:16 ` Zenghui Yu via
2022-09-20 11:16 ` Zenghui Yu
2020-04-03 7:13 ` [kvm-unit-tests PATCH v4 08/12] arm: pmu: Test SW_INCR event count Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` Eric Auger
2022-09-19 14:31 ` Zenghui Yu
2022-09-19 14:31 ` Zenghui Yu via
2022-09-19 14:31 ` Zenghui Yu
2020-04-03 7:13 ` [kvm-unit-tests PATCH v4 09/12] arm: pmu: Test chained counters Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` [kvm-unit-tests PATCH v4 10/12] arm: pmu: test 32-bit <-> 64-bit transitions Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` Eric Auger
2022-09-19 14:31 ` Zenghui Yu
2022-09-19 14:31 ` Zenghui Yu via
2022-09-19 14:31 ` Zenghui Yu
2020-04-03 7:13 ` [kvm-unit-tests PATCH v4 11/12] arm: gic: Introduce gic_irq_set_clr_enable() helper Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` [kvm-unit-tests PATCH v4 12/12] arm: pmu: Test overflow interrupts Eric Auger
2020-04-03 7:13 ` Eric Auger
2020-04-03 7:13 ` Eric Auger
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=20200403071326.29932-6-eric.auger@redhat.com \
--to=eric.auger@redhat.com \
--cc=alexandru.elisei@arm.com \
--cc=andre.przywara@arm.com \
--cc=andrew.murray@arm.com \
--cc=drjones@redhat.com \
--cc=eric.auger.pro@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=maz@kernel.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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.