diff options
| author | James Hogan <james.hogan@imgtec.com> | 2016-10-25 16:11:11 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-10 16:36:34 +0100 |
| commit | ab69d3a03e2253b3029447887a8883606e7be844 (patch) | |
| tree | 4293860c49039bb743951f291ca78b0e769bd404 /arch/parisc | |
| parent | 159766dff4d49170593fea58a91019045cab93de (diff) | |
| download | linux-rt-ab69d3a03e2253b3029447887a8883606e7be844.tar.gz | |
KVM: MIPS: Make ERET handle ERL before EXL
commit ede5f3e7b54a4347be4d8525269eae50902bd7cd upstream.
The ERET instruction to return from exception is used for returning from
exception level (Status.EXL) and error level (Status.ERL). If both bits
are set however we should be returning from ERL first, as ERL can
interrupt EXL, for example when an NMI is taken. KVM however checks EXL
first.
Fix the order of the checks to match the pseudocode in the instruction
set manual.
Fixes: e685c689f3a8 ("KVM/MIPS32: Privileged instruction/target branch emulation.")
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/parisc')
0 files changed, 0 insertions, 0 deletions