diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 15:51:32 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 15:51:32 -0400 |
| commit | 28d33c1820b1854883a7921aebf51963799d1564 (patch) | |
| tree | 6b7ab07b1cedde6cd272444dd22acb899f6c6a3a | |
| parent | a61257492af3103d8524f51d76869a6233c6b679 (diff) | |
| download | longterm-queue-4.12-28d33c1820b1854883a7921aebf51963799d1564.tar.gz | |
KVM: another arm refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/KVM-arm64-Change-hyp_panic-s-dependency-on-tpidr_el2.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/queue/KVM-arm64-Change-hyp_panic-s-dependency-on-tpidr_el2.patch b/queue/KVM-arm64-Change-hyp_panic-s-dependency-on-tpidr_el2.patch index 36028f0..2eac73b 100644 --- a/queue/KVM-arm64-Change-hyp_panic-s-dependency-on-tpidr_el2.patch +++ b/queue/KVM-arm64-Change-hyp_panic-s-dependency-on-tpidr_el2.patch @@ -1,4 +1,4 @@ -From c97e166e54b662717d20ec2e36761758d2b6a7c2 Mon Sep 17 00:00:00 2001 +From 4f98cd879dee34fc824ec8261e1195d767c33bb4 Mon Sep 17 00:00:00 2001 From: James Morse <james.morse@arm.com> Date: Mon, 8 Jan 2018 15:38:05 +0000 Subject: [PATCH] KVM: arm64: Change hyp_panic()s dependency on tpidr_el2 @@ -29,12 +29,13 @@ reference to the 'running vcpu' in the host cpu context to preserve this. Signed-off-by: James Morse <james.morse@arm.com> Reviewed-by: Christoffer Dall <cdall@linaro.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h -index ea6cb5b24258..7ee72b402907 100644 +index 9a97e4c852ef..eba9e917771b 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h -@@ -192,6 +192,8 @@ struct kvm_cpu_context { +@@ -189,6 +189,8 @@ struct kvm_cpu_context { u64 sys_regs[NR_SYS_REGS]; u32 copro[NR_COPRO_REGS]; }; @@ -44,10 +45,10 @@ index ea6cb5b24258..7ee72b402907 100644 typedef struct kvm_cpu_context kvm_cpu_context_t; diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S -index fce7cc507e0a..e4f37b9dd47c 100644 +index fc1613955090..f36464bd57c5 100644 --- a/arch/arm64/kvm/hyp/hyp-entry.S +++ b/arch/arm64/kvm/hyp/hyp-entry.S -@@ -163,6 +163,18 @@ ENTRY(__hyp_do_panic) +@@ -179,6 +179,18 @@ ENTRY(__hyp_do_panic) eret ENDPROC(__hyp_do_panic) @@ -67,10 +68,10 @@ index fce7cc507e0a..e4f37b9dd47c 100644 .align 2 \label: diff --git a/arch/arm64/kvm/hyp/s2-setup.c b/arch/arm64/kvm/hyp/s2-setup.c -index 603e1ee83e89..74306c33a6de 100644 +index b81f4091c909..eb401dbb285e 100644 --- a/arch/arm64/kvm/hyp/s2-setup.c +++ b/arch/arm64/kvm/hyp/s2-setup.c -@@ -86,5 +86,8 @@ u32 __hyp_text __init_stage2_translation(void) +@@ -84,5 +84,8 @@ u32 __hyp_text __init_stage2_translation(void) write_sysreg(val, vtcr_el2); @@ -80,10 +81,10 @@ index 603e1ee83e89..74306c33a6de 100644 return parange; } diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c -index 170e1917f83c..324f4202cdd5 100644 +index 39d98fbe9048..6515cab4cab7 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c -@@ -306,9 +306,9 @@ int __hyp_text __kvm_vcpu_run(struct kvm_vcpu *vcpu) +@@ -289,9 +289,9 @@ int __hyp_text __kvm_vcpu_run(struct kvm_vcpu *vcpu) u64 exit_code; vcpu = kern_hyp_va(vcpu); @@ -94,7 +95,7 @@ index 170e1917f83c..324f4202cdd5 100644 guest_ctxt = &vcpu->arch.ctxt; __sysreg_save_host_state(host_ctxt); -@@ -443,7 +443,8 @@ again: +@@ -390,7 +390,8 @@ int __hyp_text __kvm_vcpu_run(struct kvm_vcpu *vcpu) static const char __hyp_panic_string[] = "HYP panic:\nPS:%08llx PC:%016llx ESR:%08llx\nFAR:%016llx HPFAR:%016llx PAR:%016llx\nVCPU:%p\n"; @@ -104,7 +105,7 @@ index 170e1917f83c..324f4202cdd5 100644 { unsigned long str_va; -@@ -457,35 +458,35 @@ static void __hyp_text __hyp_call_panic_nvhe(u64 spsr, u64 elr, u64 par) +@@ -404,42 +405,42 @@ static void __hyp_text __hyp_call_panic_nvhe(u64 spsr, u64 elr, u64 par) __hyp_do_panic(str_va, spsr, elr, read_sysreg(esr_el2), read_sysreg_el2(far), @@ -146,10 +147,9 @@ index 170e1917f83c..324f4202cdd5 100644 - host_ctxt = kern_hyp_va(vcpu->arch.host_cpu_context); + host_ctxt = kern_hyp_va(__host_ctxt); + vcpu = host_ctxt->__hyp_running_vcpu; - __timer_disable_traps(vcpu); __deactivate_traps(vcpu); __deactivate_vm(vcpu); -@@ -493,7 +494,7 @@ void __hyp_text __noreturn __hyp_panic(void) + __sysreg_restore_host_state(host_ctxt); } /* Call panic for real */ |