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 v3 04/12] arm: pmu: Add a pmu struct
Date: Thu, 12 Mar 2020 16:42:53 +0100 [thread overview]
Message-ID: <20200312154301.9130-5-eric.auger@redhat.com> (raw)
In-Reply-To: <20200312154301.9130-1-eric.auger@redhat.com>
This struct aims at storing information potentially used by
all tests such as the pmu version, the read-only part of the
PMCR, the number of implemented event counters, ...
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
---
v2 -> v3:
- Fix pmcr_ro and add a comment
---
arm/pmu.c | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/arm/pmu.c b/arm/pmu.c
index 44f3543..d827e82 100644
--- a/arm/pmu.c
+++ b/arm/pmu.c
@@ -33,7 +33,14 @@
#define NR_SAMPLES 10
-static unsigned int pmu_version;
+struct pmu {
+ unsigned int version;
+ unsigned int nb_implemented_counters;
+ uint32_t pmcr_ro;
+};
+
+static struct pmu pmu;
+
#if defined(__arm__)
#define ID_DFR0_PERFMON_SHIFT 24
#define ID_DFR0_PERFMON_MASK 0xf
@@ -242,7 +249,7 @@ static bool check_cpi(int cpi)
static void pmccntr64_test(void)
{
#ifdef __arm__
- if (pmu_version == 0x3) {
+ if (pmu.version == 0x3) {
if (ERRATA(9e3f7a296940)) {
write_sysreg(0xdead, PMCCNTR64);
report(read_sysreg(PMCCNTR64) == 0xdead, "pmccntr64");
@@ -257,18 +264,24 @@ static bool pmu_probe(void)
{
uint32_t pmcr;
- pmu_version = get_pmu_version();
- if (pmu_version == 0 || pmu_version == 0xf)
+ pmu.version = get_pmu_version();
+ if (pmu.version == 0 || pmu.version == 0xf)
return false;
- report_info("PMU version: %d", pmu_version);
+ report_info("PMU version: %d", pmu.version);
pmcr = get_pmcr();
- report_info("PMU implementer/ID code/counters: %#x(\"%c\")/%#x/%d",
+ report_info("PMU implementer/ID code: %#x(\"%c\")/%#x",
(pmcr >> PMU_PMCR_IMP_SHIFT) & PMU_PMCR_IMP_MASK,
((pmcr >> PMU_PMCR_IMP_SHIFT) & PMU_PMCR_IMP_MASK) ? : ' ',
- (pmcr >> PMU_PMCR_ID_SHIFT) & PMU_PMCR_ID_MASK,
- (pmcr >> PMU_PMCR_N_SHIFT) & PMU_PMCR_N_MASK);
+ (pmcr >> PMU_PMCR_ID_SHIFT) & PMU_PMCR_ID_MASK);
+
+ /* store read-only and RES0 fields of the PMCR bottom-half*/
+ pmu.pmcr_ro = pmcr & 0xFFFFFF00;
+ pmu.nb_implemented_counters =
+ (pmcr >> PMU_PMCR_N_SHIFT) & PMU_PMCR_N_MASK;
+ report_info("Implements %d event counters",
+ pmu.nb_implemented_counters);
return true;
}
--
2.20.1
next prev parent reply other threads:[~2020-03-12 15:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 15:42 [kvm-unit-tests PATCH v3 00/12] KVM: arm64: PMUv3 Event Counter Tests Eric Auger
2020-03-12 15:42 ` [kvm-unit-tests PATCH v3 01/12] arm64: Provide read/write_sysreg_s Eric Auger
2020-03-12 15:42 ` [kvm-unit-tests PATCH v3 02/12] arm: pmu: Let pmu tests take a sub-test parameter Eric Auger
2020-03-12 15:42 ` [kvm-unit-tests PATCH v3 03/12] arm: pmu: Don't check PMCR.IMP anymore Eric Auger
2020-03-12 15:42 ` Eric Auger [this message]
2020-03-12 15:42 ` [kvm-unit-tests PATCH v3 05/12] arm: pmu: Introduce defines for PMU versions Eric Auger
2020-03-12 15:42 ` [kvm-unit-tests PATCH v3 06/12] arm: pmu: Check Required Event Support Eric Auger
2020-03-12 15:42 ` [kvm-unit-tests PATCH v3 07/12] arm: pmu: Basic event counter Tests Eric Auger
2020-03-12 15:42 ` [kvm-unit-tests PATCH v3 08/12] arm: pmu: Test SW_INCR event count Eric Auger
2020-03-12 15:42 ` [kvm-unit-tests PATCH v3 09/12] arm: pmu: Test chained counters Eric Auger
2020-03-12 15:42 ` [kvm-unit-tests PATCH v3 10/12] arm: pmu: test 32-bit <-> 64-bit transitions Eric Auger
2020-03-12 15:43 ` [kvm-unit-tests PATCH v3 11/12] arm: gic: Introduce gic_irq_set_clr_enable() helper Eric Auger
2020-03-12 15:43 ` [kvm-unit-tests PATCH v3 12/12] arm: pmu: Test overflow interrupts 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=20200312154301.9130-5-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).