diff options
author | Will Deacon <will@kernel.org> | 2020-01-22 11:38:53 +0000 |
---|---|---|
committer | Will Deacon <will@kernel.org> | 2020-01-22 11:38:53 +0000 |
commit | bc206065944e2d6bd917e719dc897ffff8dbbca8 (patch) | |
tree | c085dc23f5b52e0621b164f0d5fd205d8bd50b47 /arch/arm64/include/asm/sysreg.h | |
parent | ab3906c53144837f1a192b5c3ba71ec2f938c187 (diff) | |
parent | 2e8e1ea88cbcb19a77b7acb67f6ffe39cc15740c (diff) | |
download | talos-op-linux-bc206065944e2d6bd917e719dc897ffff8dbbca8.tar.gz talos-op-linux-bc206065944e2d6bd917e719dc897ffff8dbbca8.zip |
Merge branch 'for-next/rng' into for-next/core
* for-next/rng: (2 commits)
arm64: Use v8.5-RNG entropy for KASLR seed
...
Diffstat (limited to 'arch/arm64/include/asm/sysreg.h')
-rw-r--r-- | arch/arm64/include/asm/sysreg.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index a2d3271b64bd..b91570ff9db1 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -366,6 +366,9 @@ #define SYS_CTR_EL0 sys_reg(3, 3, 0, 0, 1) #define SYS_DCZID_EL0 sys_reg(3, 3, 0, 0, 7) +#define SYS_RNDR_EL0 sys_reg(3, 3, 2, 4, 0) +#define SYS_RNDRRS_EL0 sys_reg(3, 3, 2, 4, 1) + #define SYS_PMCR_EL0 sys_reg(3, 3, 9, 12, 0) #define SYS_PMCNTENSET_EL0 sys_reg(3, 3, 9, 12, 1) #define SYS_PMCNTENCLR_EL0 sys_reg(3, 3, 9, 12, 2) @@ -552,6 +555,7 @@ #define MAIR_ATTRIDX(attr, idx) ((attr) << ((idx) * 8)) /* id_aa64isar0 */ +#define ID_AA64ISAR0_RNDR_SHIFT 60 #define ID_AA64ISAR0_TS_SHIFT 52 #define ID_AA64ISAR0_FHM_SHIFT 48 #define ID_AA64ISAR0_DP_SHIFT 44 |