Skip to content

Commit 72e1be1

Browse files
Fuad TabbaMarc Zyngier
authored andcommitted
KVM: arm64: Move sanitized copies of CPU features
Move the sanitized copies of the CPU feature registers to the recently created sys_regs.c. This consolidates all copies in a more relevant file. No functional change intended. Acked-by: Will Deacon <[email protected]> Signed-off-by: Fuad Tabba <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 2a0c343 commit 72e1be1

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

arch/arm64/kvm/hyp/nvhe/mem_protect.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@ struct host_kvm host_kvm;
2525

2626
static struct hyp_pool host_s2_pool;
2727

28-
/*
29-
* Copies of the host's CPU features registers holding sanitized values.
30-
*/
31-
u64 id_aa64mmfr0_el1_sys_val;
32-
u64 id_aa64mmfr1_el1_sys_val;
33-
3428
const u8 pkvm_hyp_id = 1;
3529

3630
static void *host_s2_zalloc_pages_exact(size_t size)

arch/arm64/kvm/hyp/nvhe/sys_regs.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ u64 id_aa64pfr0_el1_sys_val;
2121
u64 id_aa64pfr1_el1_sys_val;
2222
u64 id_aa64isar0_el1_sys_val;
2323
u64 id_aa64isar1_el1_sys_val;
24+
u64 id_aa64mmfr0_el1_sys_val;
25+
u64 id_aa64mmfr1_el1_sys_val;
2426
u64 id_aa64mmfr2_el1_sys_val;
2527

2628
/*

0 commit comments

Comments
 (0)