From patchwork Wed Apr 19 17:41:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Lindsay X-Patchwork-Id: 752393 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w7Tv06t46z9s65 for ; Thu, 20 Apr 2017 03:46:04 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="LnhA+thE"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="LnhA+thE"; dkim-atps=neutral Received: from localhost ([::1]:49631 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0tg2-00031z-1Q for incoming@patchwork.ozlabs.org; Wed, 19 Apr 2017 13:46:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0tc7-0008Fd-0e for qemu-devel@nongnu.org; Wed, 19 Apr 2017 13:42:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0tc6-0004QC-64 for qemu-devel@nongnu.org; Wed, 19 Apr 2017 13:41:59 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:37790) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0tc3-0004O8-PD; Wed, 19 Apr 2017 13:41:55 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id E3E01610DB; Wed, 19 Apr 2017 17:41:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1492623714; bh=G3xQpV6ot2prIAzHjIemeeOj5wOqK7Z+PT4TmM/rl+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LnhA+thEPUgdbPE+r90TSh5DFsBfYSB5Bkr6k2PMtEdi+yygG+Rwz39XOgfjtI1BN uFKF8SiwJdnM5IYvkmJkaXrbZa8SZcgJQCzzqwm79EfMERFxGQPpYtSbXEyHGTxxjZ XTBIgkTqQFOmENNghfvI29cFax+Mf60K+4AjixK0= 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 F3D9561110; Wed, 19 Apr 2017 17:41:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1492623714; bh=G3xQpV6ot2prIAzHjIemeeOj5wOqK7Z+PT4TmM/rl+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LnhA+thEPUgdbPE+r90TSh5DFsBfYSB5Bkr6k2PMtEdi+yygG+Rwz39XOgfjtI1BN uFKF8SiwJdnM5IYvkmJkaXrbZa8SZcgJQCzzqwm79EfMERFxGQPpYtSbXEyHGTxxjZ XTBIgkTqQFOmENNghfvI29cFax+Mf60K+4AjixK0= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org F3D9561110 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: Peter Maydell , qemu-arm@nongnu.org Date: Wed, 19 Apr 2017 13:41:19 -0400 Message-Id: <1492623684-25799-9-git-send-email-alindsay@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1492623684-25799-1-git-send-email-alindsay@codeaurora.org> References: <1492623684-25799-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 08/13] 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: mspradli@codeaurora.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Aaron Lindsay --- 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 9c01269..5d07f72 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -975,17 +975,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)