From nobody Tue Nov 11 03:22:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1560822168; cv=none; d=zoho.com; s=zohoarc; b=M8Qo0uqAcXYj7Br8GbRSrD2PgQIpE2+yT0aQRLmwWRPimbfXi1KXbcNmsS/d3VpZqvZnc08EHcctmF61WXhtukSE7LutyNLJ1jaLszFVPk6ZxEB22F1/nGUWAUKgfgUFBR3lJYSn7+Pa6ZQaC9lfuKHSmVRMGWj1KJVEUCcH4BA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560822168; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=AAeMeHVcUIHypc7v40WmzbSRx62vstzdbDATRhyjw9o=; b=Id6OrgymgyWeOklldmxRK0L4H5N+eV159iZWlyRDRLtB0zzWy4gexNVKbeWfUzEswvurhDBbRUttUEx7HrnrGq9g4GiIGdt0cFNDQIRoO7XaViQRnoA6Bb34I0TZTRVnuce8lUQjXsU7TVjqYd4IjzojLUE/1lPPi803H6yfLCw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1560822168537899.3079448504809; Mon, 17 Jun 2019 18:42:48 -0700 (PDT) Received: from localhost ([::1]:53000 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hd390-0006Vx-KU for importer@patchew.org; Mon, 17 Jun 2019 21:42:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41054) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hd30U-0006yL-Bu for qemu-devel@nongnu.org; Mon, 17 Jun 2019 21:33:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hd30K-0000He-5u for qemu-devel@nongnu.org; Mon, 17 Jun 2019 21:33:48 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:24430) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hd30J-0000A1-HE; Mon, 17 Jun 2019 21:33:43 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 18 Jun 2019 09:33:43 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP; 17 Jun 2019 18:33:13 -0700 Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.157.140]) by uls-op-cesaip02.wdc.com with ESMTP; 17 Jun 2019 18:33:43 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1560821624; x=1592357624; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ve7Ap2V5Mkzuo0d+Wcq3sQxhlCvQxeKzZZrn5vyIJDU=; b=ECp8H+q9NOjnPlJvWupXQmAadkLWhNBcEJ2h6cv3bATQBGLld+CPkxLh eoIwk/vmq7JOwkTFggWLDCdkcYQAxVOQc8MfvzIXs2+5T47PVRG43mujy R9RhcXrH58ha+OAcfdVwqWmVFsdMuaE5TAnOFLEXlDp51/c0LCe5T3YmZ Ak/o1SHBawA00xJ+TLQZ1j5kJs3ZV05nugmdKPyEDrKK7bBMF82/uSonc hO/qlqw5VOvuD3JP/LUmh1zdPJliPGtmZC0aOsYlJMzXAyMy9eH/E60kk tzzpQdKCGxyq2a15+J+ycQrXZnSTJcIOjhQ0D2HA8HQ416gMYXJdBct2s w==; X-IronPort-AV: E=Sophos;i="5.63,386,1557158400"; d="scan'208";a="112055106" IronPort-SDR: ZhQj4XHgkWXVSjUqRGOx0ABHujaYrrIWVqhsZdSar8fQMqxA792Hwrd9eJE/GScz6tb461x5rA VvQpkM0/0Wg0lLFXi+UQsfr/7Y2RFJOx8zvzFYqqtwXrt4Iiycl23neI5yafRduoepsoyywgTI 0c3AQmWDgWWpJokNzfzTspy2IJWmVkdbHJcVm3UPeZXgQ2SToKAz51bLzEY4wRcbC86MVKYZH5 xXGele0dZCtm4kPQ/fG1i6Aw9Cx2Agr+4lNOGTLe+yotAMCEfV5npNcmeAvzdecpB7bHyZxqMh 7+bLqEiKt9EDfx4fRH24qGDD IronPort-SDR: h2r49Tu76lOiElmHZIxKCo4Ci+Vm4kHWtUvtBTOi+ET5XNLkwZySy8+uOF+QQO51i5p/hBltGU 3e5ER8uFdAHtlsRWqBX4cimCldQZJ3iv3/6opkROw3mK6XbpeMoODmAz3JQHKUCFeMSqN0PoK4 p5HovBl88flZMEZKVqehgxBPK/RDRXFlxHUnQiC1SsYuFu8SoMs3gs8nVNWbSJ14ZOVokDgQ0x 91oWU9NlA8h22Hfnm9AoimYFJdCDVRXMAlmQIhtnFaIFiXU9ZLTxLCPuMx6pCwVvWgnXnHy2Uk bxg= From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Date: Mon, 17 Jun 2019 18:31:22 -0700 Message-Id: <4ae1c7156ed0e8b0d2441c9e5954dfe623792d13.1560821342.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.144 Subject: [Qemu-devel] [PATCH v1 8/9] target/riscv: Add support for disabling/enabling Counters X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, palmer@sifive.com, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Add support for disabling/enabling the "Counters" extension. Signed-off-by: Alistair Francis --- target/riscv/cpu.c | 1 + target/riscv/cpu.h | 1 + target/riscv/csr.c | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index ddbe922958..5af1c9b38c 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -440,6 +440,7 @@ static Property riscv_cpu_properties[] =3D { DEFINE_PROP_BOOL("c", RISCVCPU, cfg.ext_c, true), DEFINE_PROP_BOOL("s", RISCVCPU, cfg.ext_s, true), DEFINE_PROP_BOOL("u", RISCVCPU, cfg.ext_u, true), + DEFINE_PROP_BOOL("Counters", RISCVCPU, cfg.ext_counters, true), DEFINE_PROP_STRING("priv_spec", RISCVCPU, cfg.priv_spec), DEFINE_PROP_BOOL("mmu", RISCVCPU, cfg.mmu, true), DEFINE_PROP_BOOL("pmp", RISCVCPU, cfg.pmp, true), diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index a558c353f0..786f620564 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -221,6 +221,7 @@ typedef struct RISCVCPU { bool ext_c; bool ext_s; bool ext_u; + bool ext_counters; =20 char *priv_spec; char *user_spec; diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 437387fd28..a9aa8ab1b5 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -56,8 +56,15 @@ static int fs(CPURISCVState *env, int csrno) static int ctr(CPURISCVState *env, int csrno) { #if !defined(CONFIG_USER_ONLY) + CPUState *cs =3D env_cpu(env); + RISCVCPU *cpu =3D RISCV_CPU(cs); uint32_t ctr_en =3D ~0u; =20 + if (!cpu->cfg.ext_counters) { + /* The Counters extensions is not enabled */ + return -1; + } + if (env->priv < PRV_M) { ctr_en &=3D env->mcounteren; } --=20 2.22.0