From nobody Sun Feb 8 04:18:02 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1648034197; cv=none; d=zohomail.com; s=zohoarc; b=ltR5wNcOo+pTf+3bqQcgxj4vaQDcNMacObMeUyfopfzb9DnMr6XeHw/qB1T3moAzm9OJL2NTF24IivzDLesA5HWxWSjg9gzjNhmVYRY/UEVLL5E/csL5e3nJuLGaDmbFMLNwhYOemtiVSQci1+X3fTjWCVrZSmQhHqVXvcWV6/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648034197; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=7MiFWbxn0OlxTDdKDRVVlxJUDcW9QG+46FFdHfSR7F0=; b=h1yLqkFQB1ub6OYI+th/h/5Xf7JJh4IiXCigeKGBYXgy+rv/TAnjYkQLDjt5IldaJyMWiZtU4qCIJpLAiaqsgx9BmN3KgAnTeVwuhKPCyT4ROfTl55rF8hUJuhjswxb0MKMchVIHvDuqgk33UY3DtJ2IGMqibmxMs+SAMFPw8wA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648034197875894.1146765841775; Wed, 23 Mar 2022 04:16:37 -0700 (PDT) Received: from localhost ([::1]:55322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWyyi-0007FZ-G4 for importer@patchew.org; Wed, 23 Mar 2022 07:16:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWyvg-00053R-Rk for qemu-devel@nongnu.org; Wed, 23 Mar 2022 07:13:31 -0400 Received: from [2607:f8b0:4864:20::633] (port=38469 helo=mail-pl1-x633.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nWyve-0007Nu-94 for qemu-devel@nongnu.org; Wed, 23 Mar 2022 07:13:28 -0400 Received: by mail-pl1-x633.google.com with SMTP id n18so1195083plg.5 for ; Wed, 23 Mar 2022 04:13:25 -0700 (PDT) Received: from ThinkPad-T490.dc1.ventanamicro.com ([171.50.204.174]) by smtp.googlemail.com with ESMTPSA id f31-20020a631f1f000000b003742e45f7d7sm19798002pgf.32.2022.03.23.04.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 04:13:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7MiFWbxn0OlxTDdKDRVVlxJUDcW9QG+46FFdHfSR7F0=; b=R3kUvDwn6npkY5IXVH6FS+Ctl2YOU6T9lm1z330NODeAcvPQN79DOtYH98KDLQoi6M 78r0DzLx8vvtqlLlA8dRYhGYsjMfC2ey1r8ywUJLKWxKeNfJwZjngiDurcOgIeGEuRSY zDRIehYUrhAAeVzbpeH9x8QUvXx3aI97FQv7zB9zojysydR5mohG5VrmSbsIr9cbol57 bBfYYVVa4Yxgb2qamxSZ4UPsuC74WE/nq0JjLwmetPfOoyZUs8o6WsvBTJtjEKMgzmKo mfkln+62odvKGEjs7lQJYH4qcK7qnQumxC/c/2xKCKQDlGe75u0tHZWkHHUVe1cYqQFt NlFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7MiFWbxn0OlxTDdKDRVVlxJUDcW9QG+46FFdHfSR7F0=; b=dbj27NVgPyZ8Z1TE8ZoZVK+sDEOEsuNz9wVZMN9xZN9C9S5+e9W2ZLtO+G/LZN4oWH JRYs/KK2o0lrdPuGZi+u8gMn48eVMmVCQxeYWUh6boEdx3vR4ezEBIqW/NeeljbcFcM0 N7+zfA2IHe4QEBuLShOXa1sH3vQ/UKQiFSryOSKyyI7IYu94/836RDqI6jOBYDI4bTwD dEpQyLOPSx9LhCtpRs04gFmocUa98HEfaRinqpX9tfeSx+lXOabApsIcMpTLWvoBG74y 0mngQQOLPpNwTsyUBBiENvVjEaHBdal46ac21w2EbPggzmBAZ/o9txZtJ+EUa1rNsIXt 4y/A== X-Gm-Message-State: AOAM53091hKgKeKVj83Fo3aOBZwDRudsREnXJL8w6Nb0EbYO4Hq435tB lvojj6xydcgB2rPN2Scmbf8eXw1F9Nc3oGOQ X-Google-Smtp-Source: ABdhPJyMEhopSH8L9V51ONCYqzJKodwX6A9rJmxPjgxr8ghMvXd7+WP4OZwayN1O1wkzxcrIkZXN+Q== X-Received: by 2002:a17:903:2281:b0:154:50ab:72c6 with SMTP id b1-20020a170903228100b0015450ab72c6mr16602255plh.51.1648034004048; Wed, 23 Mar 2022 04:13:24 -0700 (PDT) From: Mayuresh Chitale To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [RFC PATCH v2 1/4] target/riscv: Add smstateen support Date: Wed, 23 Mar 2022 16:43:06 +0530 Message-Id: <20220323111309.9109-2-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220323111309.9109-1-mchitale@ventanamicro.com> References: <20220323111309.9109-1-mchitale@ventanamicro.com> X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::633 (failed) Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=mchitale@ventanamicro.com; helo=mail-pl1-x633.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mayuresh Chitale , alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1648034198887100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Smstateen extension specifies a mechanism to close the potential covert channels that could cause security issues. This patch adds the CSRs defined in the specification and the corresponding predicates and read/write functions. Signed-off-by: Mayuresh Chitale --- target/riscv/cpu.c | 2 + target/riscv/cpu.h | 4 + target/riscv/cpu_bits.h | 36 +++++++ target/riscv/csr.c | 210 ++++++++++++++++++++++++++++++++++++++++ target/riscv/machine.c | 22 ++++- 5 files changed, 273 insertions(+), 1 deletion(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 8e338daf72..832602d91f 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -807,6 +807,7 @@ static Property riscv_cpu_properties[] =3D { DEFINE_PROP_BOOL("mmu", RISCVCPU, cfg.mmu, true), DEFINE_PROP_BOOL("pmp", RISCVCPU, cfg.pmp, true), DEFINE_PROP_BOOL("sstc", RISCVCPU, cfg.ext_sstc, true), + DEFINE_PROP_BOOL("smstateen", RISCVCPU, cfg.ext_smstateen, true), =20 DEFINE_PROP_STRING("priv_spec", RISCVCPU, cfg.priv_spec), DEFINE_PROP_STRING("vext_spec", RISCVCPU, cfg.vext_spec), @@ -970,6 +971,7 @@ static void riscv_isa_string_ext(RISCVCPU *cpu, char **= isa_str, int max_str_len) ISA_EDATA_ENTRY(svinval, ext_svinval), ISA_EDATA_ENTRY(svnapot, ext_svnapot), ISA_EDATA_ENTRY(svpbmt, ext_svpbmt), + ISA_EDATA_ENTRY(smstateen, ext_smstateen), }; =20 for (i =3D 0; i < ARRAY_SIZE(isa_edata_arr); i++) { diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index ea23666e8e..8e61edca6f 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -338,6 +338,9 @@ struct CPURISCVState { =20 /* CSRs for execution enviornment configuration */ uint64_t menvcfg; + uint64_t mstateen[SMSTATEEN_MAX_COUNT]; + uint64_t hstateen[SMSTATEEN_MAX_COUNT]; + uint64_t sstateen[SMSTATEEN_MAX_COUNT]; target_ulong senvcfg; uint64_t henvcfg; #endif @@ -416,6 +419,7 @@ struct RISCVCPUConfig { bool ext_zve32f; bool ext_zve64f; bool ext_sscofpmf; + bool ext_smstateen; =20 /* Vendor-specific custom extensions */ bool ext_XVentanaCondOps; diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index 7454f4087f..66edb26686 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -205,6 +205,12 @@ /* Supervisor Configuration CSRs */ #define CSR_SENVCFG 0x10A =20 +/* Supervisor state CSRs */ +#define CSR_SSTATEEN0 0x10C +#define CSR_SSTATEEN1 0x10D +#define CSR_SSTATEEN2 0x10E +#define CSR_SSTATEEN3 0x10F + /* Supervisor Trap Handling */ #define CSR_SSCRATCH 0x140 #define CSR_SEPC 0x141 @@ -258,6 +264,16 @@ #define CSR_HENVCFG 0x60A #define CSR_HENVCFGH 0x61A =20 +/* Hypervisor state CSRs */ +#define CSR_HSTATEEN0 0x60C +#define CSR_HSTATEEN0H 0x61C +#define CSR_HSTATEEN1 0x60D +#define CSR_HSTATEEN1H 0x61D +#define CSR_HSTATEEN2 0x60E +#define CSR_HSTATEEN2H 0x61E +#define CSR_HSTATEEN3 0x60F +#define CSR_HSTATEEN3H 0x61F + /* Virtual CSRs */ #define CSR_VSSTATUS 0x200 #define CSR_VSIE 0x204 @@ -309,6 +325,26 @@ #define CSR_MENVCFG 0x30A #define CSR_MENVCFGH 0x31A =20 +/* Machine state CSRs */ +#define CSR_MSTATEEN0 0x30C +#define CSR_MSTATEEN0H 0x31C +#define CSR_MSTATEEN1 0x30D +#define CSR_MSTATEEN1H 0x31D +#define CSR_MSTATEEN2 0x30E +#define CSR_MSTATEEN2H 0x31E +#define CSR_MSTATEEN3 0x30F +#define CSR_MSTATEEN3H 0x31F + +/* Common defines for all smstateen */ +#define SMSTATEEN_MAX_COUNT 4 +#define SMSTATEEN0_CS 0 +#define SMSTATEEN0_FCSR 0 +#define SMSTATEEN0_IMSIC 58 +#define SMSTATEEN0_AIA 59 +#define SMSTATEEN0_SVSLCT 60 +#define SMSTATEEN0_HSENVCFG 62 +#define SMSTATEEN_STATEN 63 + /* Enhanced Physical Memory Protection (ePMP) */ #define CSR_MSECCFG 0x747 #define CSR_MSECCFGH 0x757 diff --git a/target/riscv/csr.c b/target/riscv/csr.c index d3d16d71de..215c8ecef1 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -265,6 +265,42 @@ static RISCVException hmode32(CPURISCVState *env, int = csrno) =20 } =20 +static RISCVException mstateen(CPURISCVState *env, int csrno) +{ + CPUState *cs =3D env_cpu(env); + RISCVCPU *cpu =3D RISCV_CPU(cs); + + if (!cpu->cfg.ext_smstateen) { + return RISCV_EXCP_ILLEGAL_INST; + } + + return any(env, csrno); +} + +static RISCVException hstateen(CPURISCVState *env, int csrno) +{ + CPUState *cs =3D env_cpu(env); + RISCVCPU *cpu =3D RISCV_CPU(cs); + + if (!cpu->cfg.ext_smstateen) { + return RISCV_EXCP_ILLEGAL_INST; + } + + return hmode(env, csrno); +} + +static RISCVException sstateen(CPURISCVState *env, int csrno) +{ + CPUState *cs =3D env_cpu(env); + RISCVCPU *cpu =3D RISCV_CPU(cs); + + if (!cpu->cfg.ext_smstateen) { + return RISCV_EXCP_ILLEGAL_INST; + } + + return smode(env, csrno); +} + /* Checks if PointerMasking registers could be accessed */ static RISCVException pointer_masking(CPURISCVState *env, int csrno) { @@ -1882,6 +1918,129 @@ static RISCVException write_henvcfgh(CPURISCVState = *env, int csrno, return RISCV_EXCP_NONE; } =20 +static inline void write_smstateen(CPURISCVState *env, uint64_t *reg, + uint64_t wr_mask, uint64_t new_val) +{ + *reg =3D (*reg & ~wr_mask) | (new_val & wr_mask); +} + +static RISCVException read_mstateen(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val =3D env->mstateen[csrno - CSR_MSTATEEN0]; + + return RISCV_EXCP_NONE; +} + +static RISCVException write_mstateen(CPURISCVState *env, int csrno, + target_ulong new_val) +{ + uint64_t *reg; + uint64_t wr_mask =3D 1UL << SMSTATEEN_STATEN; + + reg =3D &env->mstateen[csrno - CSR_MSTATEEN0]; + write_smstateen(env, reg, wr_mask, new_val); + + return RISCV_EXCP_NONE; +} + +static RISCVException read_mstateenh(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val =3D env->mstateen[csrno - CSR_MSTATEEN0H - 0x10] >> 32; + + return RISCV_EXCP_NONE; +} + +static RISCVException write_mstateenh(CPURISCVState *env, int csrno, + target_ulong new_val) +{ + uint64_t *reg; + uint64_t val; + uint64_t wr_mask =3D 1UL << SMSTATEEN_STATEN; + + reg =3D &env->mstateen[csrno - CSR_MSTATEEN0H - 0x10]; + val =3D (uint64_t)new_val << 32; + val |=3D *reg & 0xFFFFFFFF; + write_smstateen(env, reg, wr_mask, val); + + return RISCV_EXCP_NONE; +} + +static RISCVException read_hstateen(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val =3D env->hstateen[csrno - CSR_HSTATEEN0]; + + return RISCV_EXCP_NONE; +} + +static RISCVException write_hstateen(CPURISCVState *env, int csrno, + target_ulong new_val) +{ + uint64_t *reg; + uint64_t wr_mask =3D 1UL << SMSTATEEN_STATEN; + int index =3D csrno - CSR_HSTATEEN0; + + reg =3D &env->hstateen[index]; + wr_mask &=3D env->mstateen[index]; + write_smstateen(env, reg, wr_mask, new_val); + + return RISCV_EXCP_NONE; +} + +static RISCVException read_hstateenh(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val =3D env->hstateen[csrno - CSR_HSTATEEN0H - 0x10] >> 32; + + return RISCV_EXCP_NONE; +} + +static RISCVException write_hstateenh(CPURISCVState *env, int csrno, + target_ulong new_val) +{ + uint64_t *reg; + uint64_t val; + uint64_t wr_mask =3D 1UL << SMSTATEEN_STATEN; + int index =3D csrno - CSR_HSTATEEN0H - 0x10; + + reg =3D &env->hstateen[index]; + val =3D (uint64_t)new_val << 32; + val |=3D *reg & 0xFFFFFFFF; + wr_mask &=3D env->mstateen[index]; + + write_smstateen(env, reg, wr_mask, val); + return RISCV_EXCP_NONE; +} + +static RISCVException read_sstateen(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val =3D env->sstateen[csrno - CSR_SSTATEEN0]; + + return RISCV_EXCP_NONE; +} + +static RISCVException write_sstateen(CPURISCVState *env, int csrno, + target_ulong new_val) +{ + uint64_t *reg; + uint64_t wr_mask =3D 0; + int index =3D csrno - CSR_SSTATEEN0; + bool virt =3D riscv_cpu_virt_enabled(env); + + reg =3D &env->sstateen[index]; + if (virt) { + wr_mask &=3D env->mstateen[index]; + } else { + wr_mask &=3D env->hstateen[index]; + } + write_smstateen(env, reg, wr_mask, new_val); + + return RISCV_EXCP_NONE; +} + static RISCVException rmw_mip64(CPURISCVState *env, int csrno, uint64_t *ret_val, uint64_t new_val, uint64_t wr_mask) @@ -3664,6 +3823,57 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] =3D { [CSR_HENVCFGH] =3D { "henvcfgh", hmode32, read_henvcfgh, write_henvcfg= h, .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, =20 + /* Smstateen extension CSRs */ + [CSR_MSTATEEN0] =3D { "mstateen0", mstateen, read_mstateen, write_msta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_MSTATEEN0H] =3D { "mstateen0h", mstateen, read_mstateenh, + write_mstateenh, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_MSTATEEN1] =3D { "mstateen1", mstateen, read_mstateen, write_msta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_MSTATEEN1H] =3D { "mstateen1h", mstateen, read_mstateenh, + write_mstateenh, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_MSTATEEN2] =3D { "mstateen2", mstateen, read_mstateen, write_msta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_MSTATEEN2H] =3D { "mstateen2h", mstateen, read_mstateenh, + write_mstateenh, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_MSTATEEN3] =3D { "mstateen3", mstateen, read_mstateen, write_msta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_MSTATEEN3H] =3D { "mstateen3h", mstateen, read_mstateenh, + write_mstateenh, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + + [CSR_HSTATEEN0] =3D { "hstateen0", hstateen, read_hstateen, write_hsta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_HSTATEEN0H] =3D { "hstateen0h", hstateen, read_hstateenh, + write_hstateenh, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_HSTATEEN1] =3D { "hstateen1", hstateen, read_hstateen, write_hsta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_HSTATEEN1H] =3D { "hstateen1h", hstateen, read_hstateenh, + write_hstateenh, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_HSTATEEN2] =3D { "hstateen2", hstateen, read_hstateen, write_hsta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_HSTATEEN2H] =3D { "hstateen2h", hstateen, read_hstateenh, + write_hstateenh, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_HSTATEEN3] =3D { "hstateen3", hstateen, read_hstateen, write_hsta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_HSTATEEN3H] =3D { "hstateen3h", hstateen, read_hstateenh, + write_hstateenh, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + + [CSR_SSTATEEN0] =3D { "sstateen0", sstateen, read_sstateen, write_ssta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_SSTATEEN1] =3D { "sstateen1", sstateen, read_sstateen, write_ssta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_SSTATEEN2] =3D { "sstateen2", sstateen, read_sstateen, write_ssta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_SSTATEEN3] =3D { "sstateen3", sstateen, read_sstateen, write_ssta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, /* Supervisor Trap Setup */ [CSR_SSTATUS] =3D { "sstatus", smode, read_sstatus, write_sst= atus, NULL, read_sstatus_i128 = }, diff --git a/target/riscv/machine.c b/target/riscv/machine.c index aa968dc29c..e376f82ca0 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -232,6 +232,26 @@ static int riscv_cpu_post_load(void *opaque, int versi= on_id) return 0; } =20 +static bool smstateen_needed(void *opaque) +{ + RISCVCPU *cpu =3D opaque; + + return cpu->cfg.ext_smstateen; +} + +static const VMStateDescription vmstate_smstateen =3D { + .name =3D "cpu/smtateen", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D smstateen_needed, + .fields =3D (VMStateField[]) { + VMSTATE_UINT64_ARRAY(env.mstateen, RISCVCPU, 4), + VMSTATE_UINT64_ARRAY(env.hstateen, RISCVCPU, 4), + VMSTATE_UINT64_ARRAY(env.sstateen, RISCVCPU, 4), + VMSTATE_END_OF_LIST() + } +}; + static bool envcfg_needed(void *opaque) { RISCVCPU *cpu =3D opaque; @@ -331,7 +351,6 @@ const VMStateDescription vmstate_riscv_cpu =3D { VMSTATE_UINT64(env.mtohost, RISCVCPU), VMSTATE_UINT64(env.mtimecmp, RISCVCPU), VMSTATE_UINT64(env.stimecmp, RISCVCPU), - VMSTATE_END_OF_LIST() }, .subsections =3D (const VMStateDescription * []) { @@ -342,6 +361,7 @@ const VMStateDescription vmstate_riscv_cpu =3D { &vmstate_rv128, &vmstate_kvmtimer, &vmstate_envcfg, + &vmstate_smstateen, NULL } }; --=20 2.17.1 From nobody Sun Feb 8 04:18:02 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1648034272; cv=none; d=zohomail.com; s=zohoarc; b=CaBQcQAJDAU6lEb+iydYyoWmGyzrhF0XVCr08E4w5dQDnJgmzLd+ygsFmHMxYOF7bK8IdSdwFEbl2IQKJ0eUgIyHKQIoLAH6S1CVbaWohSb/79PvTlnEhFfQwKnc25Hqd1Bb5OReSJ1wJ5WTSkJu/Owdmj1mGdd1ecwuhAV2xi0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648034272; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=XeY/LdOI5V1/0Ddlwu8s7tnxZRoRztRhYh1B5DcK790=; b=crcEopxmJkAvExkCvKKmgk5s4w20BfP2AuU668q/EeDTO3GlvhfZnyKFPUHCOvnNv+vKQoA09+UCtFf3ouKgLfvKpeQOzK+QF4BXCdORk1DM4Bnos+O7NZ3XQJi8KnL8WZDu26cKq24jV6cBlYiHpkEVNnbazRYBsa6ambJfSy8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648034272612692.5865233475314; Wed, 23 Mar 2022 04:17:52 -0700 (PDT) Received: from localhost ([::1]:56710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWyzx-0008Gg-BO for importer@patchew.org; Wed, 23 Mar 2022 07:17:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWyvy-000591-Hl for qemu-devel@nongnu.org; Wed, 23 Mar 2022 07:13:46 -0400 Received: from [2607:f8b0:4864:20::1032] (port=53799 helo=mail-pj1-x1032.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nWyvo-0007cU-Jf for qemu-devel@nongnu.org; Wed, 23 Mar 2022 07:13:45 -0400 Received: by mail-pj1-x1032.google.com with SMTP id bx5so1331150pjb.3 for ; Wed, 23 Mar 2022 04:13:28 -0700 (PDT) Received: from ThinkPad-T490.dc1.ventanamicro.com ([171.50.204.174]) by smtp.googlemail.com with ESMTPSA id f31-20020a631f1f000000b003742e45f7d7sm19798002pgf.32.2022.03.23.04.13.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 04:13:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XeY/LdOI5V1/0Ddlwu8s7tnxZRoRztRhYh1B5DcK790=; b=CAu3riG+SFl8xUqPvamJDRc2iltoY96muA0/VAfL8nVXrcOGAZhfXhd4JuPnvJ9S9W sWELXIxcnBNI/kA3+hIcKom1zHwcyUR0LANgDSw/WLQasZhV6a8JmtqP4Or1lsUPvlZN tJ40m3F/otardDoEx80Xh6+G0Ps3IJGJR9lUSUCqtZjBRaNnNPgNkbaDCljgNvXNlxt4 3OuPRaoeh15Z2tHMEcs+L/ws+7EAd8Pgu1/ZBCJsdIuysJHRJ4MOQRp3uOILFc+ZqmmR AXDwM/TjLQrKFgQ6jbhfxA3+aZ+52Rywfvx8zrIlbZ0IxQmeZM6xfFRcJ12L4+X9BqqF wLsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XeY/LdOI5V1/0Ddlwu8s7tnxZRoRztRhYh1B5DcK790=; b=rpyWWi0QyFSn3Caf9ShqFdvJ/wQ64COvfhsG2xww91QLYOSWQoV9++Ah4V6vhEyXuv DY32IYmLReQVapUV9pfJR6wJlzgMs7nTNYEsa32+AVoUwxFUyOM2OD1VOw1Vwny37lSM C7kHRdEp/kfS8ICW4Fdk5FiThF5vjv0o1T3bcKQWCRR1IewJ33qsnJT8abTkMgdTvxQy 1HPh5D2J2xziPpsMaFIWtn1asXqFrdnxg1SAaePebl+kquU/TyCohk/aFMC9/JVL1t+0 NXdVOuem0dPzNXRumil0R0dgfXw7rn89G0urK+JAANp1tUDxW+x7PMNE3Lt1Iwtg/aCD z3wQ== X-Gm-Message-State: AOAM531+mQkse3NOgWv4Qu1jMEBVnt8RSh4i54QNJE3/71gByOXKm720 HzAm5M66RDp+YStwi5gzaD6EhACGpqoSYVZ3 X-Google-Smtp-Source: ABdhPJyuGdGhpe+uayrba0aQgrmB2yGuz9W2r5+9yaa1XvwB1b2Vecs02DajpjdaR75zazvJ6SpllQ== X-Received: by 2002:a17:903:1cc:b0:154:31c6:4e00 with SMTP id e12-20020a17090301cc00b0015431c64e00mr21082320plh.114.1648034007364; Wed, 23 Mar 2022 04:13:27 -0700 (PDT) From: Mayuresh Chitale To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [RFC PATCH v2 2/4] target/riscv: smstateen check for h/senvcfg Date: Wed, 23 Mar 2022 16:43:07 +0530 Message-Id: <20220323111309.9109-3-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220323111309.9109-1-mchitale@ventanamicro.com> References: <20220323111309.9109-1-mchitale@ventanamicro.com> X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1032 (failed) Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=mchitale@ventanamicro.com; helo=mail-pj1-x1032.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mayuresh Chitale , alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1648034304764100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Accesses to henvcfg, henvcfgh and senvcfg are allowed only if corresponding bit in mstateen0/hstateen0 is enabled. Otherwise an illegal instruction trap is generated. Signed-off-by: Mayuresh Chitale --- target/riscv/csr.c | 82 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 76 insertions(+), 6 deletions(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 215c8ecef1..2388f0226f 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -39,6 +39,35 @@ void riscv_set_csr_ops(int csrno, riscv_csr_operations *= ops) } =20 /* Predicates */ +static RISCVException smstateen_acc_ok(CPURISCVState *env, int mode, int b= it) +{ + CPUState *cs =3D env_cpu(env); + RISCVCPU *cpu =3D RISCV_CPU(cs); + bool virt =3D riscv_cpu_virt_enabled(env); + + if (!cpu->cfg.ext_smstateen) { + return RISCV_EXCP_NONE; + } + + if (!(env->mstateen[0] & 1UL << bit)) { + return RISCV_EXCP_ILLEGAL_INST; + } + + if (virt) { + if (!(env->hstateen[0] & 1UL << bit)) { + return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; + } + } + + if (mode =3D=3D PRV_U) { + if (!(env->sstateen[0] & 1UL << bit)) { + return RISCV_EXCP_ILLEGAL_INST; + } + } + + return RISCV_EXCP_NONE; +} + static RISCVException fs(CPURISCVState *env, int csrno) { #if !defined(CONFIG_USER_ONLY) @@ -1865,6 +1894,13 @@ static RISCVException write_menvcfgh(CPURISCVState *= env, int csrno, static RISCVException read_senvcfg(CPURISCVState *env, int csrno, target_ulong *val) { + RISCVException ret; + + ret =3D smstateen_acc_ok(env, PRV_S, SMSTATEEN0_HSENVCFG); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + *val =3D env->senvcfg; return RISCV_EXCP_NONE; } @@ -1873,15 +1909,27 @@ static RISCVException write_senvcfg(CPURISCVState *= env, int csrno, target_ulong val) { uint64_t mask =3D SENVCFG_FIOM | SENVCFG_CBIE | SENVCFG_CBCFE | SENVCF= G_CBZE; + RISCVException ret; =20 - env->senvcfg =3D (env->senvcfg & ~mask) | (val & mask); + ret =3D smstateen_acc_ok(env, PRV_S, SMSTATEEN0_HSENVCFG); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } =20 + env->senvcfg =3D (env->senvcfg & ~mask) | (val & mask); return RISCV_EXCP_NONE; } =20 static RISCVException read_henvcfg(CPURISCVState *env, int csrno, target_ulong *val) { + RISCVException ret; + + ret =3D smstateen_acc_ok(env, PRV_S, SMSTATEEN0_HSENVCFG); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + *val =3D env->henvcfg; return RISCV_EXCP_NONE; } @@ -1890,6 +1938,12 @@ static RISCVException write_henvcfg(CPURISCVState *e= nv, int csrno, target_ulong val) { uint64_t mask =3D HENVCFG_FIOM | HENVCFG_CBIE | HENVCFG_CBCFE | HENVCF= G_CBZE; + RISCVException ret; + + ret =3D smstateen_acc_ok(env, PRV_S, SMSTATEEN0_HSENVCFG); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } =20 if (riscv_cpu_mxl(env) =3D=3D MXL_RV64) { mask |=3D HENVCFG_PBMTE | HENVCFG_STCE; @@ -1903,6 +1957,13 @@ static RISCVException write_henvcfg(CPURISCVState *e= nv, int csrno, static RISCVException read_henvcfgh(CPURISCVState *env, int csrno, target_ulong *val) { + RISCVException ret; + + ret =3D smstateen_acc_ok(env, PRV_S, SMSTATEEN0_HSENVCFG); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + *val =3D env->henvcfg >> 32; return RISCV_EXCP_NONE; } @@ -1912,9 +1973,14 @@ static RISCVException write_henvcfgh(CPURISCVState *= env, int csrno, { uint64_t mask =3D HENVCFG_PBMTE | HENVCFG_STCE; uint64_t valh =3D (uint64_t)val << 32; + RISCVException ret; =20 - env->henvcfg =3D (env->henvcfg & ~mask) | (valh & mask); + ret =3D smstateen_acc_ok(env, PRV_S, SMSTATEEN0_HSENVCFG); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } =20 + env->henvcfg =3D (env->henvcfg & ~mask) | (valh & mask); return RISCV_EXCP_NONE; } =20 @@ -1936,7 +2002,8 @@ static RISCVException write_mstateen(CPURISCVState *e= nv, int csrno, target_ulong new_val) { uint64_t *reg; - uint64_t wr_mask =3D 1UL << SMSTATEEN_STATEN; + uint64_t wr_mask =3D (1UL << SMSTATEEN_STATEN) | + (1UL << SMSTATEEN0_HSENVCFG); =20 reg =3D &env->mstateen[csrno - CSR_MSTATEEN0]; write_smstateen(env, reg, wr_mask, new_val); @@ -1957,7 +2024,8 @@ static RISCVException write_mstateenh(CPURISCVState *= env, int csrno, { uint64_t *reg; uint64_t val; - uint64_t wr_mask =3D 1UL << SMSTATEEN_STATEN; + uint64_t wr_mask =3D (1UL << SMSTATEEN_STATEN) | + (1UL << SMSTATEEN0_HSENVCFG); =20 reg =3D &env->mstateen[csrno - CSR_MSTATEEN0H - 0x10]; val =3D (uint64_t)new_val << 32; @@ -1979,7 +2047,8 @@ static RISCVException write_hstateen(CPURISCVState *e= nv, int csrno, target_ulong new_val) { uint64_t *reg; - uint64_t wr_mask =3D 1UL << SMSTATEEN_STATEN; + uint64_t wr_mask =3D (1UL << SMSTATEEN_STATEN) | + (1UL << SMSTATEEN0_HSENVCFG); int index =3D csrno - CSR_HSTATEEN0; =20 reg =3D &env->hstateen[index]; @@ -2002,8 +2071,9 @@ static RISCVException write_hstateenh(CPURISCVState *= env, int csrno, { uint64_t *reg; uint64_t val; - uint64_t wr_mask =3D 1UL << SMSTATEEN_STATEN; int index =3D csrno - CSR_HSTATEEN0H - 0x10; + uint64_t wr_mask =3D (1UL << SMSTATEEN_STATEN) | + (1UL << SMSTATEEN0_HSENVCFG); =20 reg =3D &env->hstateen[index]; val =3D (uint64_t)new_val << 32; --=20 2.17.1 From nobody Sun Feb 8 04:18:02 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1648034459; cv=none; d=zohomail.com; s=zohoarc; b=cv+ntuGqsRAfeoY0+7TUrqazm1cqZjgW5m+csVZ3AWLGyCuZ0ku21OqfkLwftZq1r8urERYMj7lXn8q3wEAWgi+AMgkEWy1IqCbcDz3r2vcVsjXrkjH8f1E3uLUFnnZD0/ltqPBRFStfsKr5o69BjQRRPqBpH8tsm6sKHZyIh5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648034459; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=VoEILtSFhp+UciYDcIHgF0YUSGOihXo4pPvWpk3MjZA=; b=Ftq634/96uyhvk1BA0NMjGDChHQ6kHonTwFNVG0Y9Jbl9v7OwOPM0c9GJAoIOUOklq652foFm3eKmK7Nnnel6ctIt9/XPUbptQ+YPTvsfwqU6BFRXHE8k7phXw5TT8o/2LAxsNX+SR/mAlfra01eAgx/fLej1O9g1JNH8tOFOug= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648034459154249.7597618022594; Wed, 23 Mar 2022 04:20:59 -0700 (PDT) Received: from localhost ([::1]:34636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWz2w-0004DP-1h for importer@patchew.org; Wed, 23 Mar 2022 07:20:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35670) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWyvy-000590-HO for qemu-devel@nongnu.org; Wed, 23 Mar 2022 07:13:46 -0400 Received: from [2607:f8b0:4864:20::1029] (port=55899 helo=mail-pj1-x1029.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nWyvw-0007lE-H1 for qemu-devel@nongnu.org; Wed, 23 Mar 2022 07:13:46 -0400 Received: by mail-pj1-x1029.google.com with SMTP id jx9so1323126pjb.5 for ; Wed, 23 Mar 2022 04:13:32 -0700 (PDT) Received: from ThinkPad-T490.dc1.ventanamicro.com ([171.50.204.174]) by smtp.googlemail.com with ESMTPSA id f31-20020a631f1f000000b003742e45f7d7sm19798002pgf.32.2022.03.23.04.13.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 04:13:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VoEILtSFhp+UciYDcIHgF0YUSGOihXo4pPvWpk3MjZA=; b=ZqOp8zevlvuiNd4KHmDy5ecjTCYQco9I/ObxHGX4cFEA+011+BggHcJTob14inflFv gd3cqeEp2ZSmeiljAKDgiHXtURT3vaVmxMD1eimF11jaunEG3diBg5/Ymuu/Me+G6WXg NljYKEm3Tfs1ZANOXz0JP4jQlSySztldYuZbcbMHS1yF3M+/C6pcYL/wC2Zir1Jyl7Bz 1iMU21AFRdaKdAutijDctbfgRi4XDSx0LimN7/gk1Dlv3H/oshXfzsBWmahi3nwNpNuC REBQ1WxOxuXDilu2k8R0okZnTw7hExbY1KgEoB+hqokfOg/Jt59bkH3Kj3vRdsa+sgjY telg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VoEILtSFhp+UciYDcIHgF0YUSGOihXo4pPvWpk3MjZA=; b=5RM4miwW9U3NZ/0mLif/bWGreHXq2A8w2Oo+riI1H5nZWw8JXF8vaXweKMwaBXq/F9 6bXhCQWKbOkMR1XBhS+Bw7HW0mZ2u5wkPntFxI7DrPP4yQMI4ZJ/BWYUVU9c9et4ynBI pfiiR2mp7rTLzNUbRgerx61WYyJ7lH5gfNawO/ZsDnZnWVVvya35vKO/uAaCV/0dH1p5 VSqBYGf7hGYX3xbekldoiPLgLSXaZWwzxljT9Jcr024YRNrv6/SUJBzlwKR5JDcYPJq2 02mcrsIhNZ6VC8feY6sZKnpjNRuAr344kY5KP+hojPoPT5zStJiwFYveuBPvJC5W87d7 MEaQ== X-Gm-Message-State: AOAM532J4QGOUH7UR5gieSGJ7Xfz35G4qebcPlcMuiaRppB9HQc81Dix zXOTudYGY1dUAH00R4fBDz2dIv2tH9GIK/8V X-Google-Smtp-Source: ABdhPJzpT/i6XTTuVx7Z5at5qgPjj6tEshag768PxTcSQi8E7/2pgdhqvpw0aBBGHMnFsmXxxM3x8A== X-Received: by 2002:a17:902:f54d:b0:154:6794:ab38 with SMTP id h13-20020a170902f54d00b001546794ab38mr12880391plf.114.1648034010905; Wed, 23 Mar 2022 04:13:30 -0700 (PDT) From: Mayuresh Chitale To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [RFC PATCH v2 3/4] target/riscv: smstateen check for fcsr Date: Wed, 23 Mar 2022 16:43:08 +0530 Message-Id: <20220323111309.9109-4-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220323111309.9109-1-mchitale@ventanamicro.com> References: <20220323111309.9109-1-mchitale@ventanamicro.com> X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1029 (failed) Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=mchitale@ventanamicro.com; helo=mail-pj1-x1029.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mayuresh Chitale , alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1648034460603100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If smstateen is implemented and sstateen0.fcsr is clear then the floating point operations must return illegal instruction exception. Signed-off-by: Mayuresh Chitale --- target/riscv/csr.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 2388f0226f..5959adc9b3 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -75,6 +75,10 @@ static RISCVException fs(CPURISCVState *env, int csrno) !RISCV_CPU(env_cpu(env))->cfg.ext_zfinx) { return RISCV_EXCP_ILLEGAL_INST; } + + if (!env->debugger && !riscv_cpu_fp_enabled(env)) { + return smstateen_acc_ok(env, PRV_U, SMSTATEEN0_FCSR); + } #endif return RISCV_EXCP_NONE; } @@ -2006,6 +2010,10 @@ static RISCVException write_mstateen(CPURISCVState *= env, int csrno, (1UL << SMSTATEEN0_HSENVCFG); =20 reg =3D &env->mstateen[csrno - CSR_MSTATEEN0]; + if (riscv_has_ext(env, RVF)) { + wr_mask |=3D 1UL << SMSTATEEN0_FCSR; + } + write_smstateen(env, reg, wr_mask, new_val); =20 return RISCV_EXCP_NONE; @@ -2030,6 +2038,10 @@ static RISCVException write_mstateenh(CPURISCVState = *env, int csrno, reg =3D &env->mstateen[csrno - CSR_MSTATEEN0H - 0x10]; val =3D (uint64_t)new_val << 32; val |=3D *reg & 0xFFFFFFFF; + if (riscv_has_ext(env, RVF)) { + wr_mask |=3D 1UL << SMSTATEEN0_FCSR; + } + write_smstateen(env, reg, wr_mask, val); =20 return RISCV_EXCP_NONE; @@ -2051,6 +2063,10 @@ static RISCVException write_hstateen(CPURISCVState *= env, int csrno, (1UL << SMSTATEEN0_HSENVCFG); int index =3D csrno - CSR_HSTATEEN0; =20 + if (riscv_has_ext(env, RVF)) { + wr_mask |=3D 1UL << SMSTATEEN0_FCSR; + } + reg =3D &env->hstateen[index]; wr_mask &=3D env->mstateen[index]; write_smstateen(env, reg, wr_mask, new_val); @@ -2075,6 +2091,10 @@ static RISCVException write_hstateenh(CPURISCVState = *env, int csrno, uint64_t wr_mask =3D (1UL << SMSTATEEN_STATEN) | (1UL << SMSTATEEN0_HSENVCFG); =20 + if (riscv_has_ext(env, RVF)) { + wr_mask |=3D 1UL << SMSTATEEN0_FCSR; + } + reg =3D &env->hstateen[index]; val =3D (uint64_t)new_val << 32; val |=3D *reg & 0xFFFFFFFF; @@ -2100,6 +2120,10 @@ static RISCVException write_sstateen(CPURISCVState *= env, int csrno, int index =3D csrno - CSR_SSTATEEN0; bool virt =3D riscv_cpu_virt_enabled(env); =20 + if (riscv_has_ext(env, RVF)) { + wr_mask |=3D 1UL << SMSTATEEN0_FCSR; + } + reg =3D &env->sstateen[index]; if (virt) { wr_mask &=3D env->mstateen[index]; --=20 2.17.1 From nobody Sun Feb 8 04:18:02 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1648034614; cv=none; d=zohomail.com; s=zohoarc; b=fMvop1Q3m7VQuYcGXvtjE+GcBrdlb23pyvJpKUuR1BR3HkqMmcr2bjZfl67tjTXbkGsG5AgynJd9iV2hOHh+Gk6F32e8WcDELjjuSCBiUAkeKMQ8vAFZczjOukNWLMuaAJNItfqf5avWbxqKP/2uKsZYDgL28O6o4SCZqA7arP4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648034614; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=kv18HE4X/ytZ3EFkK1RN6LsKO/HJwj+GsN1n2H+zSX0=; b=WHEkGz8GilyU3oDaFLbV/c51/cKksl6rUmy2UauWtIJi1rbzQ9VKMxqFcbLtijzbSv9uUy2bzmI3hQZjkmVgG37idfFqfQPuXDQ4qzliFZyj6TrQoSpiuW9pBAPdf0m/OA0OM1zqu9Cxxb9B26G5/kk9HtFdboVmOavBcnGyx+U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648034614616464.0499920564391; Wed, 23 Mar 2022 04:23:34 -0700 (PDT) Received: from localhost ([::1]:43118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWz5T-0001YW-AQ for importer@patchew.org; Wed, 23 Mar 2022 07:23:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWyw0-0005CH-IW for qemu-devel@nongnu.org; Wed, 23 Mar 2022 07:13:50 -0400 Received: from [2607:f8b0:4864:20::62e] (port=45845 helo=mail-pl1-x62e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nWyvy-0007ms-7j for qemu-devel@nongnu.org; Wed, 23 Mar 2022 07:13:48 -0400 Received: by mail-pl1-x62e.google.com with SMTP id k6so1173115plg.12 for ; Wed, 23 Mar 2022 04:13:35 -0700 (PDT) Received: from ThinkPad-T490.dc1.ventanamicro.com ([171.50.204.174]) by smtp.googlemail.com with ESMTPSA id f31-20020a631f1f000000b003742e45f7d7sm19798002pgf.32.2022.03.23.04.13.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 04:13:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kv18HE4X/ytZ3EFkK1RN6LsKO/HJwj+GsN1n2H+zSX0=; b=A93G/0t+gtwlS6ElA2T4CTJNxGicVR3EvYM6VBzJp07otN4mzVaYEPse8YBYwUmhG+ ptn59qCN3J/DleMDes3sRhaMyg7FLN+LIiEYD0sjIPHABtI5ZC5VH4f/Lcu9zcU2/6TX LwzD4UuJ9sRmwT1XVHuKxSAO0kr++XPLWJmGM/+7Kg/AT5ZCFBAtNFqm/lgV1Ac6xCE3 dEhAp+ZWkVU0/BT3P1ub2g65+MO59sK1TIz/4cE/59Y7cVOXPBc5TPujvvLadOr54a0S MVVdEepuM+ET2zHFG854W3L210pumDn6wmvB48cGXz0oGGaY3oWeEqSUcCsCpDdmeOvv 8C4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kv18HE4X/ytZ3EFkK1RN6LsKO/HJwj+GsN1n2H+zSX0=; b=sckoK4DMpyK+d0niwQZXA/dnEv3PFoXEPFaFvByTIhJLxWc9QDlE+gRKHtB0U9givv bg+q2sAY69ofFq32D7b+YDSrKt6UjQBrtc056r5U9b09UlGPWx68Wr3di4P58iGvoKB4 BwHd3euzklJ3IlgzFCiqvwogzgATfzhPH0pRTr+TafI4sAqrTwDQJyt6ButtQURYy0C5 fvB/mRKow2DKx/dJXYnJeyEYXKXTsPXdZELzJTTKv159a3/nxHjHgSdocqvyV/vqUeaq WqfT/OZz2dEfDARpAAYOnTA+KXMaKImIh/bWYx0VhtBgbXdB8X1sxxdia0dgIN0z7oR/ XUZQ== X-Gm-Message-State: AOAM532vaTmT6C/I3PBpSPndHoosYZaHNxR9d5Ta0UBx5PBh09Ob2pY9 ZLYs9BriQp7K9Kww3vClOS3wG2tkru/EvIwG X-Google-Smtp-Source: ABdhPJw2eebFZRs8fvs6eRM++kfjoYlYC+F7iftUj0mki2WXexaIwYJCl1VYmcJakYzbpkARk2u74Q== X-Received: by 2002:a17:902:c949:b0:154:5215:1db1 with SMTP id i9-20020a170902c94900b0015452151db1mr16005176pla.163.1648034014177; Wed, 23 Mar 2022 04:13:34 -0700 (PDT) From: Mayuresh Chitale To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [RFC PATCH v2 4/4] target/riscv: smstateen check for AIA/IMSIC Date: Wed, 23 Mar 2022 16:43:09 +0530 Message-Id: <20220323111309.9109-5-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220323111309.9109-1-mchitale@ventanamicro.com> References: <20220323111309.9109-1-mchitale@ventanamicro.com> X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::62e (failed) Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=mchitale@ventanamicro.com; helo=mail-pl1-x62e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mayuresh Chitale , alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1648034616981100003 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If smstateen is implemented then accesses to AIA registers CSRS, IMSIC CSRs and other IMSIC registers is controlled by setting of corresponding bits in mstateen/hstateen registers. Otherwise an illegal instruction trap or virtual instruction trap is generated. Signed-off-by: Mayuresh Chitale --- target/riscv/csr.c | 248 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 246 insertions(+), 2 deletions(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 5959adc9b3..cfdda8dc2b 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -68,6 +68,53 @@ static RISCVException smstateen_acc_ok(CPURISCVState *en= v, int mode, int bit) return RISCV_EXCP_NONE; } =20 +static RISCVException smstateen_aia_acc_ok(CPURISCVState *env, int csrno) +{ + int bit, mode; + + switch (csrno) { + case CSR_SSETEIPNUM: + case CSR_SCLREIPNUM: + case CSR_SSETEIENUM: + case CSR_SCLREIENUM: + case CSR_STOPEI: + case CSR_VSSETEIPNUM: + case CSR_VSCLREIPNUM: + case CSR_VSSETEIENUM: + case CSR_VSCLREIENUM: + case CSR_VSTOPEI: + case CSR_HSTATUS: + mode =3D PRV_S; + bit =3D SMSTATEEN0_IMSIC; + break; + + case CSR_SIEH: + case CSR_SIPH: + case CSR_HVIPH: + case CSR_HVICTL: + case CSR_HVIPRIO1: + case CSR_HVIPRIO2: + case CSR_HVIPRIO1H: + case CSR_HVIPRIO2H: + case CSR_VSIEH: + case CSR_VSIPH: + mode =3D PRV_S; + bit =3D SMSTATEEN0_AIA; + break; + + case CSR_SISELECT: + case CSR_VSISELECT: + mode =3D PRV_S; + bit =3D SMSTATEEN0_SVSLCT; + break; + + default: + return RISCV_EXCP_NONE; + } + + return smstateen_acc_ok(env, mode, bit); +} + static RISCVException fs(CPURISCVState *env, int csrno) { #if !defined(CONFIG_USER_ONLY) @@ -1402,6 +1449,13 @@ static int rmw_xiselect(CPURISCVState *env, int csrn= o, target_ulong *val, target_ulong new_val, target_ulong wr_mask) { target_ulong *iselect; + RISCVException ret; + + /* Check if smstateen is enabled and this access is allowed */ + ret =3D smstateen_aia_acc_ok(env, csrno); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } =20 /* Translate CSR number for VS-mode */ csrno =3D aia_xlate_vs_csrno(env, csrno); @@ -1484,7 +1538,9 @@ static int rmw_xireg(CPURISCVState *env, int csrno, t= arget_ulong *val, bool virt; uint8_t *iprio; int ret =3D -EINVAL; - target_ulong priv, isel, vgein; + target_ulong priv, isel, vgein =3D 0; + CPUState *cs =3D env_cpu(env); + RISCVCPU *cpu =3D RISCV_CPU(cs); =20 /* Translate CSR number for VS-mode */ csrno =3D aia_xlate_vs_csrno(env, csrno); @@ -1513,11 +1569,20 @@ static int rmw_xireg(CPURISCVState *env, int csrno,= target_ulong *val, }; =20 /* Find the selected guest interrupt file */ - vgein =3D (virt) ? get_field(env->hstatus, HSTATUS_VGEIN) : 0; + if (virt) { + if (!cpu->cfg.ext_smstateen || + (env->hstateen[0] & 1UL << SMSTATEEN0_IMSIC)) { + vgein =3D get_field(env->hstatus, HSTATUS_VGEIN); + } + } =20 if (ISELECT_IPRIO0 <=3D isel && isel <=3D ISELECT_IPRIO15) { /* Local interrupt priority registers not available for VS-mode */ if (!virt) { + if (priv =3D=3D PRV_S && cpu->cfg.ext_smstateen && + !(env->hstateen[0] & 1UL << SMSTATEEN0_AIA)) { + goto done; + } ret =3D rmw_iprio(riscv_cpu_mxl_bits(env), isel, iprio, val, new_val, wr_mask, (priv =3D=3D PRV_M) ? IRQ_M_EXT : IRQ_S_EXT); @@ -1551,6 +1616,13 @@ static int rmw_xsetclreinum(CPURISCVState *env, int = csrno, target_ulong *val, int ret =3D -EINVAL; bool set, pend, virt; target_ulong priv, isel, vgein, xlen, nval, wmask; + RISCVException excp; + + /* Check if smstateen is enabled and this access is allowed */ + excp =3D smstateen_aia_acc_ok(env, csrno); + if (excp !=3D RISCV_EXCP_NONE) { + return excp; + } =20 /* Translate CSR number for VS-mode */ csrno =3D aia_xlate_vs_csrno(env, csrno); @@ -1669,6 +1741,13 @@ static int rmw_xtopei(CPURISCVState *env, int csrno,= target_ulong *val, bool virt; int ret =3D -EINVAL; target_ulong priv, vgein; + RISCVException excp; + + /* Check if smstateen is enabled and this access is allowed */ + excp =3D smstateen_aia_acc_ok(env, csrno); + if (excp !=3D RISCV_EXCP_NONE) { + return excp; + } =20 /* Translate CSR number for VS-mode */ csrno =3D aia_xlate_vs_csrno(env, csrno); @@ -2014,6 +2093,12 @@ static RISCVException write_mstateen(CPURISCVState *= env, int csrno, wr_mask |=3D 1UL << SMSTATEEN0_FCSR; } =20 + if (riscv_feature(env, RISCV_FEATURE_AIA)) { + wr_mask |=3D (1UL << SMSTATEEN0_IMSIC) + | (1UL << SMSTATEEN0_AIA) + | (1UL << SMSTATEEN0_SVSLCT); + } + write_smstateen(env, reg, wr_mask, new_val); =20 return RISCV_EXCP_NONE; @@ -2042,6 +2127,12 @@ static RISCVException write_mstateenh(CPURISCVState = *env, int csrno, wr_mask |=3D 1UL << SMSTATEEN0_FCSR; } =20 + if (riscv_feature(env, RISCV_FEATURE_AIA)) { + wr_mask |=3D (1UL << SMSTATEEN0_IMSIC) + | (1UL << SMSTATEEN0_AIA) + | (1UL << SMSTATEEN0_SVSLCT); + } + write_smstateen(env, reg, wr_mask, val); =20 return RISCV_EXCP_NONE; @@ -2067,6 +2158,12 @@ static RISCVException write_hstateen(CPURISCVState *= env, int csrno, wr_mask |=3D 1UL << SMSTATEEN0_FCSR; } =20 + if (riscv_feature(env, RISCV_FEATURE_AIA)) { + wr_mask |=3D (1UL << SMSTATEEN0_IMSIC) + | (1UL << SMSTATEEN0_AIA) + | (1UL << SMSTATEEN0_SVSLCT); + } + reg =3D &env->hstateen[index]; wr_mask &=3D env->mstateen[index]; write_smstateen(env, reg, wr_mask, new_val); @@ -2095,6 +2192,12 @@ static RISCVException write_hstateenh(CPURISCVState = *env, int csrno, wr_mask |=3D 1UL << SMSTATEEN0_FCSR; } =20 + if (riscv_feature(env, RISCV_FEATURE_AIA)) { + wr_mask |=3D (1UL << SMSTATEEN0_IMSIC) + | (1UL << SMSTATEEN0_AIA) + | (1UL << SMSTATEEN0_SVSLCT); + } + reg =3D &env->hstateen[index]; val =3D (uint64_t)new_val << 32; val |=3D *reg & 0xFFFFFFFF; @@ -2288,6 +2391,12 @@ static RISCVException rmw_vsieh(CPURISCVState *env, = int csrno, uint64_t rval; RISCVException ret; =20 + /* Check if smstateen is enabled and this access is allowed */ + ret =3D smstateen_aia_acc_ok(env, csrno); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + ret =3D rmw_vsie64(env, csrno, &rval, ((uint64_t)new_val) << 32, ((uint64_t)wr_mask) << 32); if (ret_val) { @@ -2342,6 +2451,12 @@ static RISCVException rmw_sieh(CPURISCVState *env, i= nt csrno, uint64_t rval; RISCVException ret; =20 + /* Check if smstateen is enabled and this access is allowed */ + ret =3D smstateen_aia_acc_ok(env, csrno); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + ret =3D rmw_sie64(env, csrno, &rval, ((uint64_t)new_val) << 32, ((uint64_t)wr_mask) << 32); if (ret_val) { @@ -2504,6 +2619,12 @@ static RISCVException rmw_vsiph(CPURISCVState *env, = int csrno, uint64_t rval; RISCVException ret; =20 + /* Check if smstateen is enabled and this access is allowed */ + ret =3D smstateen_aia_acc_ok(env, csrno); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + ret =3D rmw_vsip64(env, csrno, &rval, ((uint64_t)new_val) << 32, ((uint64_t)wr_mask) << 32); if (ret_val) { @@ -2558,6 +2679,12 @@ static RISCVException rmw_siph(CPURISCVState *env, i= nt csrno, uint64_t rval; RISCVException ret; =20 + /* Check if smstateen is enabled and this access is allowed */ + ret =3D smstateen_aia_acc_ok(env, csrno); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + ret =3D rmw_sip64(env, csrno, &rval, ((uint64_t)new_val) << 32, ((uint64_t)wr_mask) << 32); if (ret_val) { @@ -2748,6 +2875,10 @@ static RISCVException read_hstatus(CPURISCVState *en= v, int csrno, static RISCVException write_hstatus(CPURISCVState *env, int csrno, target_ulong val) { + if (smstateen_aia_acc_ok(env, csrno) !=3D RISCV_EXCP_NONE) { + val &=3D ~HSTATUS_VGEIN; + } + env->hstatus =3D val; if (riscv_cpu_mxl(env) !=3D MXL_RV32 && get_field(val, HSTATUS_VSXL) != =3D 2) { qemu_log_mask(LOG_UNIMP, "QEMU does not support mixed HSXLEN optio= ns."); @@ -2808,6 +2939,12 @@ static RISCVException rmw_hidelegh(CPURISCVState *en= v, int csrno, uint64_t rval; RISCVException ret; =20 + /* Check if smstateen is enabled and this access is allowed */ + ret =3D smstateen_aia_acc_ok(env, csrno); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + ret =3D rmw_hideleg64(env, csrno, &rval, ((uint64_t)new_val) << 32, ((uint64_t)wr_mask) << 32); if (ret_val) { @@ -2854,6 +2991,12 @@ static RISCVException rmw_hviph(CPURISCVState *env, = int csrno, uint64_t rval; RISCVException ret; =20 + /* Check if smstateen is enabled and this access is allowed */ + ret =3D smstateen_aia_acc_ok(env, csrno); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + ret =3D rmw_hvip64(env, csrno, &rval, ((uint64_t)new_val) << 32, ((uint64_t)wr_mask) << 32); if (ret_val) { @@ -2908,6 +3051,13 @@ static RISCVException write_hcounteren(CPURISCVState= *env, int csrno, static RISCVException read_hgeie(CPURISCVState *env, int csrno, target_ulong *val) { + RISCVException ret; + + ret =3D smstateen_acc_ok(env, PRV_S, SMSTATEEN0_IMSIC); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + if (val) { *val =3D env->hgeie; } @@ -2917,6 +3067,13 @@ static RISCVException read_hgeie(CPURISCVState *env,= int csrno, static RISCVException write_hgeie(CPURISCVState *env, int csrno, target_ulong val) { + RISCVException ret; + + ret =3D smstateen_acc_ok(env, PRV_S, SMSTATEEN0_IMSIC); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + /* Only GEILEN:1 bits implemented and BIT0 is never implemented */ val &=3D ((((target_ulong)1) << env->geilen) - 1) << 1; env->hgeie =3D val; @@ -2956,6 +3113,13 @@ static RISCVException write_htinst(CPURISCVState *en= v, int csrno, static RISCVException read_hgeip(CPURISCVState *env, int csrno, target_ulong *val) { + RISCVException ret; + + ret =3D smstateen_acc_ok(env, PRV_S, SMSTATEEN0_IMSIC); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + if (val) { *val =3D env->hgeip; } @@ -3026,12 +3190,28 @@ static RISCVException write_htimedeltah(CPURISCVSta= te *env, int csrno, =20 static int read_hvictl(CPURISCVState *env, int csrno, target_ulong *val) { + RISCVException ret; + + /* Check if smstateen is enabled and this access is allowed */ + ret =3D smstateen_aia_acc_ok(env, csrno); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + *val =3D env->hvictl; return RISCV_EXCP_NONE; } =20 static int write_hvictl(CPURISCVState *env, int csrno, target_ulong val) { + RISCVException ret =3D RISCV_EXCP_NONE; + + /* Check if smstateen is enabled and this access is allowed */ + ret =3D smstateen_aia_acc_ok(env, csrno); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + env->hvictl =3D val & HVICTL_VALID_MASK; return RISCV_EXCP_NONE; } @@ -3090,41 +3270,105 @@ static int write_hvipriox(CPURISCVState *env, int = first_index, =20 static int read_hviprio1(CPURISCVState *env, int csrno, target_ulong *val) { + RISCVException ret; + + /* Check if smstateen is enabled and this access is allowed */ + ret =3D smstateen_aia_acc_ok(env, csrno); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + return read_hvipriox(env, 0, env->hviprio, val); } =20 static int write_hviprio1(CPURISCVState *env, int csrno, target_ulong val) { + RISCVException ret; + + /* Check if smstateen is enabled and this access is allowed */ + ret =3D smstateen_aia_acc_ok(env, csrno); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + return write_hvipriox(env, 0, env->hviprio, val); } =20 static int read_hviprio1h(CPURISCVState *env, int csrno, target_ulong *val) { + RISCVException ret; + + /* Check if smstateen is enabled and this access is allowed */ + ret =3D smstateen_aia_acc_ok(env, csrno); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + return read_hvipriox(env, 4, env->hviprio, val); } =20 static int write_hviprio1h(CPURISCVState *env, int csrno, target_ulong val) { + RISCVException ret; + + /* Check if smstateen is enabled and this access is allowed */ + ret =3D smstateen_aia_acc_ok(env, csrno); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + return write_hvipriox(env, 4, env->hviprio, val); } =20 static int read_hviprio2(CPURISCVState *env, int csrno, target_ulong *val) { + RISCVException ret; + + /* Check if smstateen is enabled and this access is allowed */ + ret =3D smstateen_aia_acc_ok(env, csrno); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + return read_hvipriox(env, 8, env->hviprio, val); } =20 static int write_hviprio2(CPURISCVState *env, int csrno, target_ulong val) { + RISCVException ret; + + /* Check if smstateen is enabled and this access is allowed */ + ret =3D smstateen_aia_acc_ok(env, csrno); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + return write_hvipriox(env, 8, env->hviprio, val); } =20 static int read_hviprio2h(CPURISCVState *env, int csrno, target_ulong *val) { + RISCVException ret; + + /* Check if smstateen is enabled and this access is allowed */ + ret =3D smstateen_aia_acc_ok(env, csrno); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + return read_hvipriox(env, 12, env->hviprio, val); } =20 static int write_hviprio2h(CPURISCVState *env, int csrno, target_ulong val) { + RISCVException ret; + + /* Check if smstateen is enabled and this access is allowed */ + ret =3D smstateen_aia_acc_ok(env, csrno); + if (ret !=3D RISCV_EXCP_NONE) { + return ret; + } + return write_hvipriox(env, 12, env->hviprio, val); } =20 --=20 2.17.1