From patchwork Wed Jan 30 17:35:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 10789097 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7575D13BF for ; Wed, 30 Jan 2019 17:41:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 639A82FA5B for ; Wed, 30 Jan 2019 17:41:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 567202FBDA; Wed, 30 Jan 2019 17:41:29 +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=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E2DE92FA5B for ; Wed, 30 Jan 2019 17:41:28 +0000 (UTC) Received: from localhost ([127.0.0.1]:41879 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gotrc-0008Dz-7Z for patchwork-qemu-devel@patchwork.kernel.org; Wed, 30 Jan 2019 12:41:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gotn6-0004ga-N9 for qemu-devel@nongnu.org; Wed, 30 Jan 2019 12:36:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gotn4-00007T-8W for qemu-devel@nongnu.org; Wed, 30 Jan 2019 12:36:48 -0500 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:43626) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gotn3-0008R7-VE for qemu-devel@nongnu.org; Wed, 30 Jan 2019 12:36:46 -0500 Received: by mail-pg1-x536.google.com with SMTP id v28so110578pgk.10 for ; Wed, 30 Jan 2019 09:36:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=subject:date:message-id:in-reply-to:references:cc:from:to; bh=5dQJ4zl+5rKPankU26RpnFJFlJ1SfResswif75QqVIo=; b=TpHv87u9wzTFwORoLI6ebDaHjcM226wXoCWh8CKEzVO1WClHp24bg0sBE3891XLm5L sWB2QHn8MPqD6tvx8Yk06gy3EeyjK+l2QsyDjqFPKNteCDTztJpn84uGxti8ASMQy1Nt X6+q56XL9UliqRIPYjCxJdCvClmqA51mkMpZgkJ3pSe+L07ztE5QkzgzUjRXfLQL2FUJ ff10ocY5e06TMvr+d7wKRxTN/DKumFIbnG9w8vZwAaAeRKMk6TI32c9QMom8q2YilMH9 yMfZvzpBEdDCX06IhFhA7aCJ/ltTCjDb9lP1Q/BHUK7LmgG61pMvU8J2JCv0dm2ZEbeQ lZJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:date:message-id:in-reply-to:references :cc:from:to; bh=5dQJ4zl+5rKPankU26RpnFJFlJ1SfResswif75QqVIo=; b=IL3ms3LM5vxXc63bbLKb/SpSQaeayOWHsi3m786t5pz6dLrPg8Q8m23nmw1D1eGo1z gE7GRfnYhkjPnywj/dLJt/EwTP+8m9xHGIiy/b2IMxDPIPIeVETGMhgkUy27i0zaMgrH B8CN+5HTVNhnnPP7Kdg8uRaq1xlsgurnjR1gXjSXOeu9HL2i0OqIobdioJts7uy0wMGx 8UzASf0j7y2a45VTnRCOZDuSj8jZEIaa1tDbZuworbZCwNl4JvhfnY60sJypFcf6w51V djB9PeeZPD+ijRmSKV1so8AnuTRCnWeLtbE7ISis0qYtTXFAau/zGkuOFqsjWoo66spQ CWsQ== X-Gm-Message-State: AJcUukc0451pOk31N2oN3zRDpLSbPmfXWOn+W/KOUNUv0ZXovInxxWwJ ATVUaKS3Y/NZc/geRWcrBd4nmVU+zGI= X-Google-Smtp-Source: ALg8bN6iKxMm+D9NIHE4CymkXmDv6Sju4RdwY4V8VQ7tia4Cgw+agn/Lj3J/E6zsZvXF0hUoGq/coA== X-Received: by 2002:a62:35c7:: with SMTP id c190mr32291386pfa.76.1548869780830; Wed, 30 Jan 2019 09:36:20 -0800 (PST) Received: from localhost ([12.206.222.5]) by smtp.gmail.com with ESMTPSA id w128sm3562912pfw.79.2019.01.30.09.36.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 09:36:19 -0800 (PST) Date: Wed, 30 Jan 2019 09:35:54 -0800 Message-Id: <20190130173601.3268-4-palmer@sifive.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20190130173601.3268-1-palmer@sifive.com> References: <20190130173601.3268-1-palmer@sifive.com> From: Palmer Dabbelt To: qemu-riscv@nongnu.org X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::536 Subject: [Qemu-devel] [PULL 03/10] RISC-V: Implement mstatus.TSR/TW/TVM 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: Michael Clark , Alistair Francis , qemu-devel@nongnu.org, Palmer Dabbelt Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Michael Clark This adds the necessary minimum to support S-mode virtualization for priv ISA >= v1.10 Signed-off-by: Michael Clark Signed-off-by: Alistair Francis Co-authored-by: Matthew Suozzo Co-authored-by: Michael Clark Signed-off-by: Palmer Dabbelt --- target/riscv/csr.c | 17 +++++++++++++---- target/riscv/op_helper.c | 25 +++++++++++++++++++++---- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 571414768992..390d3a9a5634 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -305,7 +305,8 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val) } mask = MSTATUS_SIE | MSTATUS_SPIE | MSTATUS_MIE | MSTATUS_MPIE | MSTATUS_SPP | MSTATUS_FS | MSTATUS_MPRV | MSTATUS_SUM | - MSTATUS_MPP | MSTATUS_MXR; + MSTATUS_MPP | MSTATUS_MXR | MSTATUS_TVM | MSTATUS_TSR | + MSTATUS_TW; } /* silenty discard mstatus.mpp writes for unsupported modes */ @@ -642,7 +643,11 @@ static int read_satp(CPURISCVState *env, int csrno, target_ulong *val) if (!riscv_feature(env, RISCV_FEATURE_MMU)) { *val = 0; } else if (env->priv_ver >= PRIV_VERSION_1_10_0) { - *val = env->satp; + if (env->priv == PRV_S && get_field(env->mstatus, MSTATUS_TVM)) { + return -1; + } else { + *val = env->satp; + } } else { *val = env->sptbr; } @@ -663,8 +668,12 @@ static int write_satp(CPURISCVState *env, int csrno, target_ulong val) validate_vm(env, get_field(val, SATP_MODE)) && ((val ^ env->satp) & (SATP_MODE | SATP_ASID | SATP_PPN))) { - tlb_flush(CPU(riscv_env_get_cpu(env))); - env->satp = val; + if (env->priv == PRV_S && get_field(env->mstatus, MSTATUS_TVM)) { + return -1; + } else { + tlb_flush(CPU(riscv_env_get_cpu(env))); + env->satp = val; + } } return 0; } diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index 81bd1a77ea90..77c79ba36e0b 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -82,6 +82,11 @@ target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb) do_raise_exception_err(env, RISCV_EXCP_INST_ADDR_MIS, GETPC()); } + if (env->priv_ver >= PRIV_VERSION_1_10_0 && + get_field(env->mstatus, MSTATUS_TSR)) { + do_raise_exception_err(env, RISCV_EXCP_ILLEGAL_INST, GETPC()); + } + target_ulong mstatus = env->mstatus; target_ulong prev_priv = get_field(mstatus, MSTATUS_SPP); mstatus = set_field(mstatus, @@ -125,16 +130,28 @@ void helper_wfi(CPURISCVState *env) { CPUState *cs = CPU(riscv_env_get_cpu(env)); - cs->halted = 1; - cs->exception_index = EXCP_HLT; - cpu_loop_exit(cs); + if (env->priv == PRV_S && + env->priv_ver >= PRIV_VERSION_1_10_0 && + get_field(env->mstatus, MSTATUS_TW)) { + do_raise_exception_err(env, RISCV_EXCP_ILLEGAL_INST, GETPC()); + } else { + cs->halted = 1; + cs->exception_index = EXCP_HLT; + cpu_loop_exit(cs); + } } void helper_tlb_flush(CPURISCVState *env) { RISCVCPU *cpu = riscv_env_get_cpu(env); CPUState *cs = CPU(cpu); - tlb_flush(cs); + if (env->priv == PRV_S && + env->priv_ver >= PRIV_VERSION_1_10_0 && + get_field(env->mstatus, MSTATUS_TVM)) { + do_raise_exception_err(env, RISCV_EXCP_ILLEGAL_INST, GETPC()); + } else { + tlb_flush(cs); + } } #endif /* !CONFIG_USER_ONLY */