From patchwork Wed Apr 19 17:41:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Lindsay X-Patchwork-Id: 9688421 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 20DFA602DC for ; Wed, 19 Apr 2017 17:43:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 167FE28354 for ; Wed, 19 Apr 2017 17:43:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0AAD52841F; Wed, 19 Apr 2017 17:43:19 +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 E616328354 for ; Wed, 19 Apr 2017 17:43:17 +0000 (UTC) Received: from localhost ([::1]:49605 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0tdM-0008Ei-8Q for patchwork-qemu-devel@patchwork.kernel.org; Wed, 19 Apr 2017 13:43:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0tc3-0008BV-Oh for qemu-devel@nongnu.org; Wed, 19 Apr 2017 13:41:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0tc2-0004NV-Lp for qemu-devel@nongnu.org; Wed, 19 Apr 2017 13:41:55 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:37494) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0tby-0004Kl-E2; Wed, 19 Apr 2017 13:41:50 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 8408B6110F; Wed, 19 Apr 2017 17:41:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1492623709; bh=JglSadC0Al4BPQ25hgChOtMpAlVa9OJ8BceFBOsPFIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e8BlNJVfnPju4lBlapJsz226A4HuqhGTfYHR6qND/ngjo8H9MWA8KNoZ+Epq+JYmz u75wH8LH5DoH/tuP2iTZMOko/2srAP7LSWBjUBZHcvnV1QlVi3O4mCAxvQ7DXkxMOt fzgnW3oNTSdESrp7jPOE7E5Qywqxv1oZBI2jYLlc= 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 8BE71610DB; Wed, 19 Apr 2017 17:41:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1492623709; bh=JglSadC0Al4BPQ25hgChOtMpAlVa9OJ8BceFBOsPFIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e8BlNJVfnPju4lBlapJsz226A4HuqhGTfYHR6qND/ngjo8H9MWA8KNoZ+Epq+JYmz u75wH8LH5DoH/tuP2iTZMOko/2srAP7LSWBjUBZHcvnV1QlVi3O4mCAxvQ7DXkxMOt fzgnW3oNTSdESrp7jPOE7E5Qywqxv1oZBI2jYLlc= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 8BE71610DB 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:13 -0400 Message-Id: <1492623684-25799-3-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 02/13] target/arm: Check PMCNTEN for whether PMCCNTR is 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+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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 8cb7a94..8888391 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -964,7 +964,7 @@ static inline bool arm_ccnt_enabled(CPUARMState *env) { /* This does not support checking PMCCFILTR_EL0 register */ - if (!(env->cp15.c9_pmcr & PMCRE)) { + if (!(env->cp15.c9_pmcr & PMCRE) || !(env->cp15.c9_pmcnten & (1 << 31))) { return false; }