From: Palmer Dabbelt <palmer@sifive.com> To: Alistair Francis <Alistair.Francis@wdc.com> Cc: qemu-riscv@nongnu.org, Anup Patel <Anup.Patel@wdc.com>, qemu-devel@nongnu.org, Atish Patra <Atish.Patra@wdc.com>, Alistair Francis <Alistair.Francis@wdc.com>, alistair23@gmail.com Subject: Re: [Qemu-devel] [PATCH v1 02/28] target/riscv: Add the virtulisation mode Date: Tue, 10 Sep 2019 06:44:00 -0700 (PDT) Message-ID: <mhng-9017291b-1ed2-4cea-ab34-03825a8c8a8c@palmer-si-x1e> (raw) In-Reply-To: <1c1d359caa6633349158debc38e07156a10b63e8.1566603412.git.alistair.francis@wdc.com> On Fri, 23 Aug 2019 16:37:54 PDT (-0700), Alistair Francis wrote: > Signed-off-by: Alistair Francis <alistair.francis@wdc.com> > --- > target/riscv/cpu.h | 4 ++++ > target/riscv/cpu_bits.h | 6 ++++++ > target/riscv/cpu_helper.c | 23 +++++++++++++++++++++++ > 3 files changed, 33 insertions(+) > > diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h > index 7f54fb8c87..0ef1ecb0e0 100644 > --- a/target/riscv/cpu.h > +++ b/target/riscv/cpu.h > @@ -117,6 +117,8 @@ struct CPURISCVState { > > #ifndef CONFIG_USER_ONLY > target_ulong priv; > + /* This contains QEMU specific information about the virt state. */ > + target_ulong virt; > target_ulong resetvec; > > target_ulong mhartid; > @@ -257,6 +259,8 @@ int riscv_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg); > int riscv_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); > bool riscv_cpu_exec_interrupt(CPUState *cs, int interrupt_request); > bool riscv_cpu_fp_enabled(CPURISCVState *env); > +bool riscv_cpu_virt_enabled(CPURISCVState *env); > +void riscv_cpu_set_virt_enabled(CPURISCVState *env, bool enable); > int riscv_cpu_mmu_index(CPURISCVState *env, bool ifetch); > hwaddr riscv_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); > void riscv_cpu_do_unaligned_access(CPUState *cs, vaddr addr, > diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h > index e99834856c..1fbde516be 100644 > --- a/target/riscv/cpu_bits.h > +++ b/target/riscv/cpu_bits.h > @@ -422,6 +422,12 @@ > #define PRV_H 2 /* Reserved */ > #define PRV_M 3 > > +/* Virtulisation modes */ > +#define VIRT_OFF 0 > +#define VIRT_ON 1 > +#define VIRT_MODE_SHIFT 0 > +#define VIRT_MODE_MASK (1 << VIRT_MODE_SHIFT) > + > /* RV32 satp CSR field masks */ > #define SATP32_MODE 0x80000000 > #define SATP32_ASID 0x7fc00000 > diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c > index 225e407cff..7b0bb14c01 100644 > --- a/target/riscv/cpu_helper.c > +++ b/target/riscv/cpu_helper.c > @@ -81,6 +81,29 @@ bool riscv_cpu_fp_enabled(CPURISCVState *env) > return false; > } > > +bool riscv_cpu_virt_enabled(CPURISCVState *env) > +{ > + bool tmp; > + > + if (!riscv_has_ext(env, RVH)) { > + return false; > + } > + > + tmp = (env->virt & VIRT_MODE_MASK) >> VIRT_MODE_SHIFT; > + > + return tmp == VIRT_ON; > +} extract64() is a bit cleaner. > + > +void riscv_cpu_set_virt_enabled(CPURISCVState *env, bool enable) > +{ > + if (!riscv_has_ext(env, RVH)) { > + return; > + } > + > + env->virt &= ~VIRT_MODE_MASK; > + env->virt |= enable << VIRT_MODE_SHIFT; > +} > + > int riscv_cpu_claim_interrupts(RISCVCPU *cpu, uint32_t interrupts) > { > CPURISCVState *env = &cpu->env; Reviewed-by: Palmer Dabbelt <palmer@sifive.com>
next prev parent reply index Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-23 23:37 [Qemu-devel] [PATCH v1 00/28] Add RISC-V Hypervisor Extension v0.4 Alistair Francis 2019-08-23 23:37 ` [Qemu-devel] [PATCH v1 01/28] target/riscv: Add the Hypervisor extension Alistair Francis 2019-08-27 15:26 ` Chih-Min Chao 2019-09-10 13:43 ` Palmer Dabbelt 2019-08-23 23:37 ` [Qemu-devel] [PATCH v1 02/28] target/riscv: Add the virtulisation mode Alistair Francis 2019-08-27 15:44 ` [Qemu-devel] [Qemu-riscv] " Chih-Min Chao 2019-08-28 0:08 ` Alistair Francis 2019-09-10 13:44 ` Palmer Dabbelt [this message] 2019-09-16 15:57 ` [Qemu-devel] " Alistair Francis 2019-08-23 23:37 ` [Qemu-devel] [PATCH v1 03/28] target/riscv: Add the force HS exception mode Alistair Francis 2019-08-27 15:46 ` Chih-Min Chao 2019-09-10 14:48 ` Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 04/28] target/riscv: Fix CSR perm checking for HS mode Alistair Francis 2019-09-10 14:48 ` Palmer Dabbelt 2019-10-16 20:56 ` Alistair Francis 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 05/28] target/riscv: Add the Hypervisor CSRs to CPUState Alistair Francis 2019-08-27 15:50 ` [Qemu-devel] [Qemu-riscv] " Chih-Min Chao 2019-09-10 14:48 ` [Qemu-devel] " Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 06/28] target/riscv: Print priv and virt in disas log Alistair Francis 2019-09-10 14:48 ` Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 07/28] target/riscv: Dump Hypervisor registers if enabled Alistair Francis 2019-09-10 14:48 ` Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 08/28] target/riscv: Add Hypervisor CSR access functions Alistair Francis 2019-09-10 14:48 ` Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 09/28] target/riscv: Add Hypervisor virtual CSRs accesses Alistair Francis 2019-09-10 14:48 ` Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 10/28] target/riscv: Convert mie and mstatus to pointers Alistair Francis 2019-09-11 8:24 ` Palmer Dabbelt 2019-09-11 14:54 ` [Qemu-devel] [Qemu-riscv] " Jonathan Behrens 2019-09-17 23:33 ` Alistair Francis 2019-09-18 1:59 ` Jonathan Behrens 2019-09-18 23:47 ` Alistair Francis 2019-09-19 14:50 ` Richard Henderson 2019-09-19 16:58 ` Jonathan Behrens 2019-10-25 20:28 ` Alistair Francis 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 11/28] target/riscv: Add background register swapping function Alistair Francis 2019-09-11 14:17 ` Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 12/28] target/riscv: Add support for virtual interrupt setting Alistair Francis 2019-09-14 20:30 ` Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 13/28] target/ricsv: Flush the TLB on virtulisation mode changes Alistair Francis 2019-09-14 20:30 ` Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 14/28] target/riscv: Generate illegal instruction on WFI when V=1 Alistair Francis 2019-09-14 20:30 ` Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 15/28] riscv: plic: Always set sip.SEIP bit for HS Alistair Francis 2019-09-14 20:32 ` Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 16/28] target/riscv: Add hypvervisor trap support Alistair Francis 2019-09-20 14:01 ` Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 17/28] target/riscv: Add Hypervisor trap return support Alistair Francis 2019-10-01 18:33 ` Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 18/28] target/riscv: Add hfence instructions Alistair Francis 2019-10-01 18:34 ` Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 19/28] target/riscv: Disable guest FP support based on virtual status Alistair Francis 2019-10-01 18:34 ` Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 20/28] target/riscv: Mark both sstatus and vsstatus as dirty Alistair Francis 2019-10-01 18:34 ` Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 21/28] target/riscv: Respect MPRV and SPRV for floating point ops Alistair Francis 2019-10-02 23:52 ` Palmer Dabbelt 2019-10-16 21:01 ` Alistair Francis 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 22/28] target/riscv: Allow specifying MMU stage Alistair Francis 2019-10-03 15:53 ` Palmer Dabbelt 2019-10-07 18:05 ` Alistair Francis 2019-10-16 19:02 ` Palmer Dabbelt 2019-10-16 21:25 ` Alistair Francis 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 23/28] target/riscv: Allow specifying number of MMU stages Alistair Francis 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 24/28] target/riscv: Implement second stage MMU Alistair Francis 2019-10-07 16:15 ` Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 25/28] target/riscv: Call the second stage MMU in virtualisation mode Alistair Francis 2019-10-08 17:54 ` Palmer Dabbelt 2019-08-23 23:38 ` [Qemu-devel] [PATCH v1 26/28] target/riscv: Add support for the 32-bit MSTATUSH CSR Alistair Francis 2019-10-08 18:36 ` Palmer Dabbelt 2019-08-23 23:39 ` [Qemu-devel] [PATCH v1 27/28] target/riscv: Add the MSTATUS_MPV_ISSET helper macro Alistair Francis 2019-10-08 18:36 ` Palmer Dabbelt 2019-10-16 21:14 ` Alistair Francis 2019-08-23 23:39 ` [Qemu-devel] [PATCH v1 28/28] target/riscv: Allow enabling the Hypervisor extension Alistair Francis 2019-10-08 18:53 ` Palmer Dabbelt
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=mhng-9017291b-1ed2-4cea-ab34-03825a8c8a8c@palmer-si-x1e \ --to=palmer@sifive.com \ --cc=Alistair.Francis@wdc.com \ --cc=Anup.Patel@wdc.com \ --cc=Atish.Patra@wdc.com \ --cc=alistair23@gmail.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-riscv@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
QEMU-Devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git git clone --mirror https://lore.kernel.org/qemu-devel/2 qemu-devel/git/2.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \ qemu-devel@nongnu.org public-inbox-index qemu-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git