shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: KVM: arm64: pkvm: Consolidate include files

Browse Source 
kvm_fixed_config.h is pkvm specific, and would be better placed
near its users. At the same time, include/nvhe/sys_regs.h is now
almost empty.

Merge the two into arch/arm64/kvm/hyp/include/nvhe/fixed_config.h.

Signed-off-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Fuad Tabba <tabba@google.com>
Tested-by: Fuad Tabba <tabba@google.com>
Link: https://lore.kernel.org/r/20211013120346.2926621-9-maz@kernel.org
(cherry picked from commit 3061725d16)
Bug: 204960018
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ic49cfff8fd36a7b3b59d398ff1a17d32ccef9966
This commit is contained in:
Marc Zyngier
2021-10-13 13:03:43 +01:00
committed by Will Deacon
parent 81030382f3
commit 8e55be5ce7
6 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm64/include/asm/kvm_fixed_config.h → arch/arm64/kvm/hyp/include/nvhe/fixed_config.h
View File

@@ -192,4 +192,9 @@
ARM64_FEATURE_MASK(ID_AA64ISAR1_I8MM) \
)
u64 pvm_read_id_reg(const struct kvm_vcpu *vcpu, u32 id);
bool kvm_handle_pvm_sysreg(struct kvm_vcpu *vcpu, u64 *exit_code);
int kvm_check_pvm_sysreg_table(void);
void inject_undef64(struct kvm_vcpu *vcpu);
#endif /* __ARM64_KVM_FIXED_CONFIG_H__ */

17
arch/arm64/kvm/hyp/include/nvhe/sys_regs.h
View File

@@ -1,17 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (C) 2021 Google LLC
* Author: Fuad Tabba <tabba@google.com>
*/
#ifndef __ARM64_KVM_NVHE_SYS_REGS_H__
#define __ARM64_KVM_NVHE_SYS_REGS_H__
#include <asm/kvm_host.h>
u64 pvm_read_id_reg(const struct kvm_vcpu *vcpu, u32 id);
bool kvm_handle_pvm_sysreg(struct kvm_vcpu *vcpu, u64 *exit_code);
int kvm_check_pvm_sysreg_table(void);
void inject_undef64(struct kvm_vcpu *vcpu);
#endif /* __ARM64_KVM_NVHE_SYS_REGS_H__ */

3
arch/arm64/kvm/hyp/nvhe/pkvm.c
View File

@@ -6,8 +6,7 @@
#include <linux/kvm_host.h>
#include <linux/mm.h>
#include <asm/kvm_fixed_config.h>
#include <nvhe/sys_regs.h>
#include <nvhe/fixed_config.h>
#include <nvhe/trap_handler.h>
/*

2
arch/arm64/kvm/hyp/nvhe/setup.c
View File

@@ -10,11 +10,11 @@
#include <asm/kvm_pgtable.h>
#include <nvhe/early_alloc.h>
#include <nvhe/fixed_config.h>
#include <nvhe/gfp.h>
#include <nvhe/memory.h>
#include <nvhe/mem_protect.h>
#include <nvhe/mm.h>
#include <nvhe/sys_regs.h>
#include <nvhe/trap_handler.h>
struct hyp_pool hpool;

3
arch/arm64/kvm/hyp/nvhe/switch.c
View File

@@ -20,7 +20,6 @@
#include <asm/kprobes.h>
#include <asm/kvm_asm.h>
#include <asm/kvm_emulate.h>
#include <asm/kvm_fixed_config.h>
#include <asm/kvm_hyp.h>
#include <asm/kvm_mmu.h>
#include <asm/fpsimd.h>
@@ -28,8 +27,8 @@
#include <asm/processor.h>
#include <asm/thread_info.h>
#include <nvhe/fixed_config.h>
#include <nvhe/mem_protect.h>
#include <nvhe/sys_regs.h>
/* Non-VHE specific context */
DEFINE_PER_CPU(struct kvm_host_data, kvm_host_data);

3
arch/arm64/kvm/hyp/nvhe/sys_regs.c
View File

@@ -7,12 +7,11 @@
#include <linux/irqchip/arm-gic-v3.h>
#include <asm/kvm_asm.h>
#include <asm/kvm_fixed_config.h>
#include <asm/kvm_mmu.h>
#include <hyp/adjust_pc.h>
#include <nvhe/sys_regs.h>
#include <nvhe/fixed_config.h>
#include "../../sys_regs.h"