From nobody Tue Feb 10 04:13:18 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=1617269327; cv=none; d=zohomail.com; s=zohoarc; b=Q0F29mAdupTQKK+65p5h8tlaVbfoo+WYF6Zl/zgV/kD2zDy6uMOMZzhY1lt0qBkb/X1nxHv2dWyvhZRpJpwABODhzIAoy23sZr3CL2vHbOTugKWgQ1FrImgRkQv7/DFjLnuAIk52MjdsdC/enRpWj7kyXJHGXh33GMQTL3ltiE0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617269327; 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=w+sxb2pmXx2NKUNxTUJUqBUs0FQUfA8tBTXis1GCdoI=; b=g3509AdP3IhKf7ufV/WVP4/Gw7B3RPbBV5TzqGGJdoHbBa08g5x9whg4j1mWCw51RvNmuvWuwFN5J74ssKHofUUYqEo0LUWYhrLX9h1x+krqELhrYnKxkZbLyEp+EroHpp+t08iFE7uMZJR1pwY43dCubQqD7rjyfsa0YBrLWvQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 1617269327712302.9208444922674; Thu, 1 Apr 2021 02:28:47 -0700 (PDT) Received: from localhost ([::1]:54986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRtd7-0005Et-VE for importer@patchew.org; Thu, 01 Apr 2021 05:28:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRtbf-0003rO-Nf for qemu-devel@nongnu.org; Thu, 01 Apr 2021 05:27:15 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:33771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRtbd-0000gT-Bu for qemu-devel@nongnu.org; Thu, 01 Apr 2021 05:27:15 -0400 Received: by mail-pf1-x434.google.com with SMTP id x26so1036511pfn.0 for ; Thu, 01 Apr 2021 02:27:12 -0700 (PDT) Received: from frankchang-ThinkPad-T490.internal.sifive.com (114-34-229-221.HINET-IP.hinet.net. [114.34.229.221]) by smtp.gmail.com with ESMTPSA id i7sm4751319pgq.16.2021.04.01.02.27.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 02:27:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=w+sxb2pmXx2NKUNxTUJUqBUs0FQUfA8tBTXis1GCdoI=; b=IhD+kcduQSaKJ53ewRhUW5qeN1dcW8NRqvtcslxk44pMGsGpXIvV+lNzCveHQty7ke dVX032ZNN8wbv77O1aj6ovxnmifnv6TPoj4+Qqo6EQSkEHd5NjjSU7cgPNjZkzpv+NvL c0wB/OP8+cit6/si+PDBlytKpWX/4Qo7oE1FmyzzM1NYwowtYx4zNArg0GRZhgiXyV6+ qUrsTF3fNgQg9qziPBbXDYqhBa63gaymwEpWdwT6oTp+4ClUd6MqHYIuPAXeFMuoFZ+w Ns0bOVn3jCOQth4d+uLN9ovFd+xVkoDNzXE3fkfIppL4t0J6Ld38DfkJSOtPfj3wAj1C 1OcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=w+sxb2pmXx2NKUNxTUJUqBUs0FQUfA8tBTXis1GCdoI=; b=M+nflL+Ui8Dv7CjKOmGnp0IfiXhXAOiHtmDPCncXHi7n6/4YnBSwETiEKCzLGhBx8Y 3qiqgd8NZJxA65X5hmZbL02HqZ1kyg5mVXVJwqaS9iI8fu9wbo5dneQPkr+dNiQ0lVCF V50x23qCMbzbgsQZI0uZuvqkPncSA62hu+bulLlwm0m8odtFTuqCWuymMjPn2C+O3eGw yP9VXneRAKoFbk26Gx1lh9lrIl3FjV9lRnQbnEQs0d6IhSMA1uQezsnMw9WTuQUrGgJC P4V/WB7+Ij5n245RzBR+I+UvKlL4epXPACphYt5+OxEjtnL0S8NnNwM51DBedPFgkwpg kZEw== X-Gm-Message-State: AOAM530oMi5ihsRMV8rTdKMwXZ9jpLP15DcrBbOpAOrDeCwMCd0VOykm zN9uOY+5poWxmsG418zZyVTrCN+CrIlWAii5 X-Google-Smtp-Source: ABdhPJy5RYF3QRkILgdlyZOaHui6ssblsvayBfDhD/0o6lEEkGdjmaMT6PchHPyF3Lwvd4nkSZT3FA== X-Received: by 2002:a63:2214:: with SMTP id i20mr6551391pgi.189.1617269231183; Thu, 01 Apr 2021 02:27:11 -0700 (PDT) From: frank.chang@sifive.com To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [RFC v2 2/4] target/riscv: add RNMI CSRs Date: Thu, 1 Apr 2021 17:26:49 +0800 Message-Id: <20210401092659.12014-3-frank.chang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210401092659.12014-1-frank.chang@sifive.com> References: <20210401092659.12014-1-frank.chang@sifive.com> 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::434; envelope-from=frank.chang@sifive.com; helo=mail-pf1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: Frank Chang , Alistair Francis , Palmer Dabbelt , Sagar Karandikar , Bastian Koppelmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Frank Chang Signed-off-by: Frank Chang --- target/riscv/cpu.h | 4 +++ target/riscv/cpu_bits.h | 9 +++++++ target/riscv/csr.c | 59 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 7d2bb7e7003..674ee4dc999 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -180,6 +180,10 @@ struct CPURISCVState { target_ulong mtval; /* since: priv-1.10.0 */ =20 /* NMI */ + target_ulong mnscratch; + target_ulong mnepc; + target_ulong mncause; /* mncause without bit XLEN-1 set to 1 */ + target_ulong mnstatus; bool nmie; target_ulong nmip; target_ulong rnmi_irqvec; diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index 8e5f0be599a..a376ede0cc5 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -166,6 +166,12 @@ #define CSR_MTVAL 0x343 #define CSR_MIP 0x344 =20 +/* NMI */ +#define CSR_MNSCRATCH 0x350 +#define CSR_MNEPC 0x351 +#define CSR_MNCAUSE 0x352 +#define CSR_MNSTATUS 0x353 + /* Legacy Machine Trap Handling (priv v1.9.1) */ #define CSR_MBADADDR 0x343 =20 @@ -558,6 +564,9 @@ #define RISCV_EXCP_INT_FLAG 0x80000000 #define RISCV_EXCP_INT_MASK 0x7fffffff =20 +/* RNMI mnstatus CSR mask */ +#define MNSTATUS_MPP MSTATUS_MPP + /* Interrupt causes */ #define IRQ_U_SOFT 0 #define IRQ_S_SOFT 1 diff --git a/target/riscv/csr.c b/target/riscv/csr.c index d2585395bfb..489d6d90e68 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -188,6 +188,11 @@ static int pmp(CPURISCVState *env, int csrno) { return -!riscv_feature(env, RISCV_FEATURE_PMP); } + +static int nmi(CPURISCVState *env, int csrno) +{ + return -!riscv_feature(env, RISCV_FEATURE_RNMI); +} #endif =20 /* User Floating-Point CSRs */ @@ -713,6 +718,54 @@ static int write_mbadaddr(CPURISCVState *env, int csrn= o, target_ulong val) return 0; } =20 +static int read_mnscratch(CPURISCVState *env, int csrno, target_ulong *val) +{ + *val =3D env->mnscratch; + return 0; +} + +static int write_mnscratch(CPURISCVState *env, int csrno, target_ulong val) +{ + env->mnscratch =3D val; + return 0; +} + +static int read_mnepc(CPURISCVState *env, int csrno, target_ulong *val) +{ + *val =3D env->mnepc; + return 0; +} + +static int write_mnepc(CPURISCVState *env, int csrno, target_ulong val) +{ + env->mnepc =3D val; + return 0; +} + +static int read_mncause(CPURISCVState *env, int csrno, target_ulong *val) +{ + *val =3D env->mncause; + return 0; +} + +static int write_mncause(CPURISCVState *env, int csrno, target_ulong val) +{ + env->mncause =3D val; + return 0; +} + +static int read_mnstatus(CPURISCVState *env, int csrno, target_ulong *val) +{ + *val =3D env->mnstatus; + return 0; +} + +static int write_mnstatus(CPURISCVState *env, int csrno, target_ulong val) +{ + env->mnstatus =3D val & MNSTATUS_MPP; + return 0; +} + static int rmw_mip(CPURISCVState *env, int csrno, target_ulong *ret_value, target_ulong new_value, target_ulong write_mask) { @@ -1428,6 +1481,12 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] =3D { [CSR_MBADADDR] =3D { "mbadaddr", any, read_mbadaddr, write_mbadaddr }, [CSR_MIP] =3D { "mip", any, NULL, NULL, rmw_mip }, =20 + /* NMI */ + [CSR_MNSCRATCH] =3D { "mnscratch", nmi, read_mnscratch, write_mnscratc= h }, + [CSR_MNEPC] =3D { "mnepc", nmi, read_mnepc, write_mnepc = }, + [CSR_MNCAUSE] =3D { "mncause", nmi, read_mncause, write_mncause = }, + [CSR_MNSTATUS] =3D { "mnstatus", nmi, read_mnstatus, write_mnstatus= }, + /* Supervisor Trap Setup */ [CSR_SSTATUS] =3D { "sstatus", smode, read_sstatus, write_sst= atus }, [CSR_SIE] =3D { "sie", smode, read_sie, write_sie= }, --=20 2.17.1