From patchwork Fri Mar 16 20:31:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Lindsay X-Patchwork-Id: 10290239 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 074F7602C2 for ; Fri, 16 Mar 2018 20:43:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC30B29089 for ; Fri, 16 Mar 2018 20:43:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0CFD29093; Fri, 16 Mar 2018 20:43:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 63B5929089 for ; Fri, 16 Mar 2018 20:43:03 +0000 (UTC) Received: from localhost ([::1]:59505 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewwBq-0006sy-Kl for patchwork-qemu-devel@patchwork.kernel.org; Fri, 16 Mar 2018 16:43:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eww1g-00068Q-5J for qemu-devel@nongnu.org; Fri, 16 Mar 2018 16:32:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eww1f-0003ep-D0 for qemu-devel@nongnu.org; Fri, 16 Mar 2018 16:32:32 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:56522) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eww1Z-0003WZ-RB; Fri, 16 Mar 2018 16:32:26 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B045F60FEE; Fri, 16 Mar 2018 20:32:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521232344; bh=8Ip2lN1UsQjJPYSqRZ/JB3sY3lBmzptrUBIFSp14MBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h1fBb5IcqVNyEA67Dc6Isa+Oh4aImwExoOYCrBoIhf8bq/2hacAwnyp8iEMVdwGv/ RVGGxidggzYjtyQ2okhb66g4sR2rwoOBoH3cffXlQ3SL/u0u+4QB8pnUABufNn4bco TCQy8woQ/m57X1bCUWQr26X+rxqaaaffqdwgFc9U= Received: from mossypile.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: alindsay@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 37CAD60F8D; Fri, 16 Mar 2018 20:32:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521232339; bh=8Ip2lN1UsQjJPYSqRZ/JB3sY3lBmzptrUBIFSp14MBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nKKsPCbKwtphSFbJbOmxt7nC70UK6NIoOuyGhp8JLdqE7qmLr0/UAsJoP9TtfWkul nqLTia6rG1zfoo3Ck3Wwl+w23vH/RM94Pg383dd4o2ANvAm5teOFfsLffKi5Yr8QYb TAtmyqk4C2wfJrJ+0gyMDvtEn6bhQygToH6d2ris= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 37CAD60F8D Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=alindsay@codeaurora.org From: Aaron Lindsay To: qemu-arm@nongnu.org, Peter Maydell , Alistair Francis , Wei Huang , Peter Crosthwaite Date: Fri, 16 Mar 2018 16:31:15 -0400 Message-Id: <1521232280-13089-18-git-send-email-alindsay@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1521232280-13089-1-git-send-email-alindsay@codeaurora.org> References: <1521232280-13089-1-git-send-email-alindsay@codeaurora.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 198.145.29.96 Subject: [Qemu-devel] [PATCH v3 17/22] target/arm: Split arm_ccnt_enabled into generic pmu_counter_enabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Spradling , qemu-devel@nongnu.org, Digant Desai Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Aaron Lindsay Reviewed-by: Peter Maydell --- target/arm/helper.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index f5e800e..2073d56 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1009,17 +1009,22 @@ static CPAccessResult pmreg_access_ccntr(CPUARMState *env, return pmreg_access(env, ri, isread); } -static inline bool arm_ccnt_enabled(CPUARMState *env) +static inline bool pmu_counter_enabled(CPUARMState *env, uint8_t counter) { /* Does not check PMCCFILTR_EL0, which is handled by pmu_counter_filtered */ - - if (!(env->cp15.c9_pmcr & PMCRE) || !(env->cp15.c9_pmcnten & (1 << 31))) { + if (!(env->cp15.c9_pmcr & PMCRE) || + !(env->cp15.c9_pmcnten & (1 << counter))) { return false; } return true; } +static inline bool arm_ccnt_enabled(CPUARMState *env) +{ + return pmu_counter_enabled(env, 31); +} + /* Returns true if the counter corresponding to the passed-in pmevtyper or * pmccfiltr value is filtered using the current state */ static inline bool pmu_counter_filtered(CPUARMState *env, uint64_t pmxevtyper)