Skip to content

Commit 29eedc7

Browse files
SiFiveHollandpalmer-dabbelt
authored andcommitted
riscv: Add CSR definitions for pointer masking
Pointer masking is controlled via a two-bit PMM field, which appears in various CSRs depending on which extensions are implemented. Smmpm adds the field to mseccfg; Smnpm adds the field to menvcfg; Ssnpm adds the field to senvcfg. If the H extension is implemented, Ssnpm also defines henvcfg.PMM and hstatus.HUPMM. Reviewed-by: Charlie Jenkins <charlie@rivosinc.com> Signed-off-by: Samuel Holland <samuel.holland@sifive.com> Link: https://lore.kernel.org/r/20241016202814.4061541-4-samuel.holland@sifive.com Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent 2e6f6ea commit 29eedc7

File tree

1 file changed

+16
-0
lines changed
  • arch/riscv/include/asm

1 file changed

+16
-0
lines changed

arch/riscv/include/asm/csr.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@
119119

120120
/* HSTATUS flags */
121121
#ifdef CONFIG_64BIT
122+
#define HSTATUS_HUPMM _AC(0x3000000000000, UL)
123+
#define HSTATUS_HUPMM_PMLEN_0 _AC(0x0000000000000, UL)
124+
#define HSTATUS_HUPMM_PMLEN_7 _AC(0x2000000000000, UL)
125+
#define HSTATUS_HUPMM_PMLEN_16 _AC(0x3000000000000, UL)
122126
#define HSTATUS_VSXL _AC(0x300000000, UL)
123127
#define HSTATUS_VSXL_SHIFT 32
124128
#endif
@@ -195,6 +199,10 @@
195199
/* xENVCFG flags */
196200
#define ENVCFG_STCE (_AC(1, ULL) << 63)
197201
#define ENVCFG_PBMTE (_AC(1, ULL) << 62)
202+
#define ENVCFG_PMM (_AC(0x3, ULL) << 32)
203+
#define ENVCFG_PMM_PMLEN_0 (_AC(0x0, ULL) << 32)
204+
#define ENVCFG_PMM_PMLEN_7 (_AC(0x2, ULL) << 32)
205+
#define ENVCFG_PMM_PMLEN_16 (_AC(0x3, ULL) << 32)
198206
#define ENVCFG_CBZE (_AC(1, UL) << 7)
199207
#define ENVCFG_CBCFE (_AC(1, UL) << 6)
200208
#define ENVCFG_CBIE_SHIFT 4
@@ -216,6 +224,12 @@
216224
#define SMSTATEEN0_SSTATEEN0_SHIFT 63
217225
#define SMSTATEEN0_SSTATEEN0 (_ULL(1) << SMSTATEEN0_SSTATEEN0_SHIFT)
218226

227+
/* mseccfg bits */
228+
#define MSECCFG_PMM ENVCFG_PMM
229+
#define MSECCFG_PMM_PMLEN_0 ENVCFG_PMM_PMLEN_0
230+
#define MSECCFG_PMM_PMLEN_7 ENVCFG_PMM_PMLEN_7
231+
#define MSECCFG_PMM_PMLEN_16 ENVCFG_PMM_PMLEN_16
232+
219233
/* symbolic CSR names: */
220234
#define CSR_CYCLE 0xc00
221235
#define CSR_TIME 0xc01
@@ -382,6 +396,8 @@
382396
#define CSR_MIP 0x344
383397
#define CSR_PMPCFG0 0x3a0
384398
#define CSR_PMPADDR0 0x3b0
399+
#define CSR_MSECCFG 0x747
400+
#define CSR_MSECCFGH 0x757
385401
#define CSR_MVENDORID 0xf11
386402
#define CSR_MARCHID 0xf12
387403
#define CSR_MIMPID 0xf13

0 commit comments

Comments
 (0)