From: Andrew Jones <drjones@redhat.com>
To: Eric Auger <eric.auger@redhat.com>
Cc: eric.auger.pro@gmail.com, maz@kernel.org,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
qemu-devel@nongnu.org, qemu-arm@nongnu.org,
andrew.murray@arm.com, andre.przywara@arm.com,
peter.maydell@linaro.org
Subject: Re: [kvm-unit-tests RFC 03/10] pmu: Add a pmu struct
Date: Fri, 13 Dec 2019 19:59:15 +0100 [thread overview]
Message-ID: <20191213185915.7txbnxybupszis7r@kamzik.brq.redhat.com> (raw)
In-Reply-To: <20191206172724.947-4-eric.auger@redhat.com>
On Fri, Dec 06, 2019 at 06:27:17PM +0100, Eric Auger wrote:
> 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>
> ---
> arm/pmu.c | 29 ++++++++++++++++++++++++-----
> 1 file changed, 24 insertions(+), 5 deletions(-)
>
> diff --git a/arm/pmu.c b/arm/pmu.c
> index 2ad6469..8e95251 100644
> --- a/arm/pmu.c
> +++ b/arm/pmu.c
> @@ -33,7 +33,15 @@
>
> #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
> @@ -265,7 +273,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("pmccntr64", read_sysreg(PMCCNTR64) == 0xdead);
> @@ -278,9 +286,20 @@ static void pmccntr64_test(void)
> /* Return FALSE if no PMU found, otherwise return TRUE */
> static bool pmu_probe(void)
> {
> - pmu_version = get_pmu_version();
> - report_info("PMU version: %d", pmu_version);
> - return pmu_version != 0 && pmu_version != 0xf;
> + uint32_t pmcr;
> +
> + pmu.version = get_pmu_version();
> + report_info("PMU version: %d", pmu.version);
> +
> + if (pmu.version == 0 || pmu.version == 0xF)
^ stray space
> + return false;
> +
> + pmcr = get_pmcr();
> + pmu.pmcr_ro = pmcr & 0xFFFFFF80;
> + 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;
> }
>
> int main(int argc, char *argv[])
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-12-13 20:40 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-06 17:27 [kvm-unit-tests RFC 00/10] KVM: arm64: PMUv3 Event Counter Tests Eric Auger
2019-12-06 17:27 ` [kvm-unit-tests RFC 01/10] arm64: Provide read/write_sysreg_s Eric Auger
2019-12-06 17:36 ` Alexandru Elisei
2019-12-06 17:27 ` [kvm-unit-tests RFC 02/10] pmu: Let pmu tests take a sub-test parameter Eric Auger
2019-12-06 17:27 ` [kvm-unit-tests RFC 03/10] pmu: Add a pmu struct Eric Auger
2019-12-13 18:59 ` Andrew Jones [this message]
2019-12-06 17:27 ` [kvm-unit-tests RFC 04/10] pmu: Check Required Event Support Eric Auger
2019-12-13 19:10 ` Andrew Jones
2019-12-06 17:27 ` [kvm-unit-tests RFC 05/10] pmu: Basic event counter Tests Eric Auger
2019-12-06 17:27 ` [kvm-unit-tests RFC 06/10] pmu: Test chained counter Eric Auger
2019-12-06 17:27 ` [kvm-unit-tests RFC 07/10] arm: pmu: test 32-bit <-> 64-bit transitions Eric Auger
2019-12-06 17:27 ` [kvm-unit-tests RFC 08/10] arm: gic: Provide per-IRQ helper functions Eric Auger
2019-12-06 17:27 ` [kvm-unit-tests RFC 09/10] arm/arm64: gic: Introduce setup_irq() helper Eric Auger
2019-12-06 17:27 ` [kvm-unit-tests RFC 10/10] 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=20191213185915.7txbnxybupszis7r@kamzik.brq.redhat.com \
--to=drjones@redhat.com \
--cc=andre.przywara@arm.com \
--cc=andrew.murray@arm.com \
--cc=eric.auger.pro@gmail.com \
--cc=eric.auger@redhat.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).