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 <[email protected]>
> ---
> 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
>
