From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A039AC3F2D1 for ; Wed, 4 Mar 2020 18:02:25 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 5ECA424673 for ; Wed, 4 Mar 2020 18:02:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5ECA424673 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 199784AF67; Wed, 4 Mar 2020 13:02:25 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XiCg7YE+ELHb; Wed, 4 Mar 2020 13:02:24 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 078E74AF52; Wed, 4 Mar 2020 13:02:24 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 2A12E4AF46 for ; Wed, 4 Mar 2020 13:02:23 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7RSGzmGc-rUz for ; Wed, 4 Mar 2020 13:02:22 -0500 (EST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 063B04AC68 for ; Wed, 4 Mar 2020 13:02:22 -0500 (EST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B521C31B; Wed, 4 Mar 2020 10:02:21 -0800 (PST) Received: from donnerap.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 604163F6C4; Wed, 4 Mar 2020 10:02:20 -0800 (PST) Date: Wed, 4 Mar 2020 18:02:15 +0000 From: Andre Przywara To: Eric Auger Subject: Re: [kvm-unit-tests PATCH v2 3/9] arm: pmu: Add a pmu struct Message-ID: <20200304180158.4d9e3b8c@donnerap.cambridge.arm.com> In-Reply-To: <20200130112510.15154-4-eric.auger@redhat.com> References: <20200130112510.15154-1-eric.auger@redhat.com> <20200130112510.15154-4-eric.auger@redhat.com> Organization: ARM X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; aarch64-unknown-linux-gnu) MIME-Version: 1.0 Cc: kvm@vger.kernel.org, maz@kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org, andrew.murray@arm.com, kvmarm@lists.cs.columbia.edu, eric.auger.pro@gmail.com X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu Archived-At: List-Archive: On Thu, 30 Jan 2020 12:25:04 +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 As I stated already in v1: Reviewed-by: Andre Przywara Cheers, Andre > --- > arm/pmu.c | 30 +++++++++++++++++++++++++----- > 1 file changed, 25 insertions(+), 5 deletions(-) > > diff --git a/arm/pmu.c b/arm/pmu.c > index e5e012d..d24857e 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 > @@ -265,7 +272,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"); > @@ -278,9 +285,22 @@ 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) > + 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[]) _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm