diff options
| author | Anup Patel <anup.patel@wdc.com> | 2020-05-04 10:58:07 +0530 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2020-05-07 08:55:38 +0530 |
| commit | 5338679ff043d68f5c26265de144e5ec54109724 (patch) | |
| tree | 40d77f564ade03e63ce5e6a39bd2d7af9270dcf3 /include | |
| parent | 7993ca2c8e092428eb59febea13a31659450850c (diff) | |
lib: sbi_tlb: Fix remote TLB HFENCE VVMA implementation
The HFENCE VVMA instructions flushes TLB based on the VMID
present in HGATP CSR. To handle this, we get the current
VMID for SBI HFENCE VVMA call and we use this current VMID
to do remote TLB HFENCE VVMA on desired set of HARTs.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sbi/riscv_encoding.h | 25 | ||||
| -rw-r--r-- | include/sbi/sbi_tlb.h | 14 |
2 files changed, 33 insertions, 6 deletions
diff --git a/include/sbi/riscv_encoding.h b/include/sbi/riscv_encoding.h index 674e9b9..fd96b0f 100644 --- a/include/sbi/riscv_encoding.h +++ b/include/sbi/riscv_encoding.h @@ -111,6 +111,21 @@ #define SATP_MODE_SV57 _UL(10) #define SATP_MODE_SV64 _UL(11) +#define HGATP_MODE_OFF _UL(0) +#define HGATP_MODE_SV32X4 _UL(1) +#define HGATP_MODE_SV39X4 _UL(8) +#define HGATP_MODE_SV48X4 _UL(9) + +#define HGATP32_MODE_SHIFT 31 +#define HGATP32_VMID_SHIFT 22 +#define HGATP32_VMID_MASK _UL(0x1FC00000) +#define HGATP32_PPN _UL(0x003FFFFF) + +#define HGATP64_MODE_SHIFT 60 +#define HGATP64_VMID_SHIFT 44 +#define HGATP64_VMID_MASK _ULL(0x03FFF00000000000) +#define HGATP64_PPN _ULL(0x00000FFFFFFFFFFF) + #define PMP_R _UL(0x01) #define PMP_W _UL(0x02) #define PMP_X _UL(0x04) @@ -127,10 +142,20 @@ #define MSTATUS_SD MSTATUS64_SD #define SSTATUS_SD SSTATUS64_SD #define SATP_MODE SATP64_MODE + +#define HGATP_PPN HGATP64_PPN +#define HGATP_VMID_SHIFT HGATP64_VMID_SHIFT +#define HGATP_VMID_MASK HGATP64_VMID_MASK +#define HGATP_MODE_SHIFT HGATP64_MODE_SHIFT #else #define MSTATUS_SD MSTATUS32_SD #define SSTATUS_SD SSTATUS32_SD #define SATP_MODE SATP32_MODE + +#define HGATP_PPN HGATP32_PPN +#define HGATP_VMID_SHIFT HGATP32_VMID_SHIFT +#define HGATP_VMID_MASK HGATP32_VMID_MASK +#define HGATP_MODE_SHIFT HGATP32_MODE_SHIFT #endif #define CSR_USTATUS 0x0 diff --git a/include/sbi/sbi_tlb.h b/include/sbi/sbi_tlb.h index 6a07ee2..6ee64a9 100644 --- a/include/sbi/sbi_tlb.h +++ b/include/sbi/sbi_tlb.h @@ -38,17 +38,19 @@ struct sbi_tlb_info { unsigned long start; unsigned long size; unsigned long asid; + unsigned long vmid; unsigned long type; struct sbi_hartmask smask; }; -#define SBI_TLB_INFO_INIT(__ptr, __start, __size, __asid, __type, __src_hart) \ +#define SBI_TLB_INFO_INIT(__p, __start, __size, __asid, __vmid, __type, __src) \ do { \ - (__ptr)->start = (__start); \ - (__ptr)->size = (__size); \ - (__ptr)->asid = (__asid); \ - (__ptr)->type = (__type); \ - SBI_HARTMASK_INIT_EXCEPT(&(__ptr)->smask, (__src_hart)); \ + (__p)->start = (__start); \ + (__p)->size = (__size); \ + (__p)->asid = (__asid); \ + (__p)->vmid = (__vmid); \ + (__p)->type = (__type); \ + SBI_HARTMASK_INIT_EXCEPT(&(__p)->smask, (__src)); \ } while (0) #define SBI_TLB_INFO_SIZE sizeof(struct sbi_tlb_info) |