On Fri, Jul 26, 2019 at 10:41 AM Chih-Min Chao <chihmin.c...@sifive.com> wrote: > > > > On Fri, Jul 26, 2019 at 2:55 AM Alistair Francis <alistair.fran...@wdc.com> > wrote: >> >> Update the Hypervisor CSR addresses to match the v0.4 spec. >> >> Signed-off-by: Alistair Francis <alistair.fran...@wdc.com> >> --- >> target/riscv/cpu_bits.h | 35 ++++++++++++++++++----------------- >> 1 file changed, 18 insertions(+), 17 deletions(-) >> >> diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h >> index 11f971ad5d..97b96c4e19 100644 >> --- a/target/riscv/cpu_bits.h >> +++ b/target/riscv/cpu_bits.h >> @@ -173,6 +173,24 @@ >> #define CSR_SPTBR 0x180 >> #define CSR_SATP 0x180 >> >> +/* Hpervisor CSRs */ >> +#define CSR_HSTATUS 0x600 >> +#define CSR_HEDELEG 0x602 >> +#define CSR_HIDELEG 0x603 >> +#define CSR_HCOUNTERNEN 0x606 >> +#define CSR_HGATP 0x680 >> + >> +#if defined(TARGET_RISCV32) >> +#define HGATP_MODE SATP32_MODE >> +#define HGATP_ASID SATP32_ASID >> +#define HGATP_PPN SATP32_PPN >> +#endif >> +#if defined(TARGET_RISCV64) >> +#define HGATP_MODE SATP64_MODE >> +#define HGATP_ASID SATP64_ASID >> +#define HGATP_PPN SATP64_PPN >> +#endif >> + > > > Basd on spec, is HGATP_VMID preferable ?
Yep, updated. Alistair > > chihmin >> >> /* Physical Memory Protection */ >> #define CSR_PMPCFG0 0x3a0 >> #define CSR_PMPCFG1 0x3a1 >> @@ -206,23 +224,6 @@ >> #define CSR_DPC 0x7b1 >> #define CSR_DSCRATCH 0x7b2 >> >> -/* Hpervisor CSRs */ >> -#define CSR_HSTATUS 0xa00 >> -#define CSR_HEDELEG 0xa02 >> -#define CSR_HIDELEG 0xa03 >> -#define CSR_HGATP 0xa80 >> - >> -#if defined(TARGET_RISCV32) >> -#define HGATP_MODE SATP32_MODE >> -#define HGATP_ASID SATP32_ASID >> -#define HGATP_PPN SATP32_PPN >> -#endif >> -#if defined(TARGET_RISCV64) >> -#define HGATP_MODE SATP64_MODE >> -#define HGATP_ASID SATP64_ASID >> -#define HGATP_PPN SATP64_PPN >> -#endif >> - >> /* Performance Counters */ >> #define CSR_MHPMCOUNTER3 0xb03 >> #define CSR_MHPMCOUNTER4 0xb04 >> -- >> 2.22.0 >> >>