Patch "ARM: KVM: fix ordering of 64bit coprocessor accesses" has been added to the 3.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
ARM: KVM: fix ordering of 64bit coprocessor accesses
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-kvm-fix-ordering-of-64bit-coprocessor-accesses.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
547f781378a22b65c2ab468f235c23001b5924daMon Sep 17 00:00:00 2001
From: Marc Zyngier <[email protected]>
Date: Tue, 21 Jan 2014 18:56:26 +0000
Subject: ARM: KVM: fix ordering of 64bit coprocessor accesses
From: Marc Zyngier <[email protected]>
commit 547f781378a22b65c2ab468f235c23001b5924da upstream.
Commit 240e99cbd00a (ARM: KVM: Fix 64-bit coprocessor handling) added an ordering dependency for the 64bit registers.
The order described is: CRn, CRm, Op1, Op2, 64bit-first.
Unfortunately, the implementation is: CRn, 64bit-first, CRm...
Move the 64bit test to be last in order to match the documentation.
--- arch/arm/kvm/coproc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/kvm/coproc.h +3 -3
@@ -135,13 +135,13 @@ static inline int cmp_reg(const struct creturn -1 ;if (i1->CRn != i2->CRn)return i1->CRn - i2->CRn; -if (i1->is_64 != i2->is_64) -return i2->is_64 - i1->is_64;if (i1->CRm != i2->CRm)return i1->CRm - i2->CRm;if (i1->Op1 != i2->Op1)return i1->Op1 - i2->Op1; -return i1->Op2 - i2->Op2; +if (i1->Op2 != i2->Op2) +return i1->Op2 - i2->Op2; +return i2->is_64 - i1->is_64; }
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/kvm-arm-arm64-vgic-fix-gicd_icfgr-register-accesses.patch queue-3.14/arm-kvm-introduce-per-vcpu-hyp-configuration-register.patch queue-3.14/arm-kvm-fix-handling-of-trapped-64bit-coprocessor-accesses.patch queue-3.14/kvm-arm64-vgic-fix-hyp-panic-with-64k-pages-on-juno-platform.patch queue-3.14/arm64-kvm-force-cache-clean-on-page-fault-when-caches-are-off.patch queue-3.14/arm-kvm-introduce-kvm_p-d_addr_end.patch queue-3.14/arm64-kvm-flush-vm-pages-before-letting-the-guest-enable-caches.patch queue-3.14/arm-kvm-force-cache-clean-on-page-fault-when-caches-are-off.patch queue-3.14/arm-kvm-add-world-switch-for-amair-0-1.patch queue-3.14/kvm-arm-vgic-fix-the-overlap-check-action-about-setting-the-gicd-gicc-base-address.patch queue-3.14/arm64-kvm-use-inner-shareable-barriers-for-inner-shareable-maintenance.patch queue-3.14/arm64-kvm-allows-discrimination-of-aarch32-sysreg-access.patch queue-3.14/arm-kvm-trap-vm-system-registers-until-mmu-and-caches-are-on.patch queue-3.14/arm-kvm-fix-ordering-of-64bit-coprocessor-accesses.patch queue-3.14/arm64-kvm-trap-vm-system-registers-until-mmu-and-caches-are-on.patch