aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2016-01-03 11:01:49 +0000
committerMarc Zyngier <marc.zyngier@arm.com>2016-02-29 18:34:12 +0000
commit0ca5565df8ef7534c0d85ec87e6c74f8ebe86e88 (patch)
tree8e59e7da933cc8b9dd19992a5d6d956c26d70ca4 /arch/arm/include
parentARM: KVM: Remove __kvm_hyp_code_start/__kvm_hyp_code_end (diff)
downloadlinux-dev-0ca5565df8ef7534c0d85ec87e6c74f8ebe86e88.tar.xz
linux-dev-0ca5565df8ef7534c0d85ec87e6c74f8ebe86e88.zip
ARM: KVM: Move VFP registers to a CPU context structure
In order to turn the WS code into something that looks a bit more like the arm64 version, move the VFP registers into a CPU context container for both the host and the guest. Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/kvm_host.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h
index f1e86f1eb2e5..b64ac8e4adaa 100644
--- a/arch/arm/include/asm/kvm_host.h
+++ b/arch/arm/include/asm/kvm_host.h
@@ -88,9 +88,15 @@ struct kvm_vcpu_fault_info {
u32 hyp_pc; /* PC when exception was taken from Hyp mode */
};
-typedef struct vfp_hard_struct kvm_cpu_context_t;
+struct kvm_cpu_context {
+ struct vfp_hard_struct vfp;
+};
+
+typedef struct kvm_cpu_context kvm_cpu_context_t;
struct kvm_vcpu_arch {
+ struct kvm_cpu_context ctxt;
+
struct kvm_regs regs;
int target; /* Processor target */
@@ -111,9 +117,6 @@ struct kvm_vcpu_arch {
/* Exception Information */
struct kvm_vcpu_fault_info fault;
- /* Floating point registers (VFP and Advanced SIMD/NEON) */
- struct vfp_hard_struct vfp_guest;
-
/* Host FP context */
kvm_cpu_context_t *host_cpu_context;