diff options
| author | James Hogan | 2016-05-06 15:36:19 +0200 |
|---|---|---|
| committer | Ralf Baechle | 2016-05-13 14:02:18 +0200 |
| commit | 9b5c3399584b6f6aa755dbe11e3cef5776fd279d (patch) | |
| tree | 52234bb21d945aaa67b85d56ce247ec0736adca5 /arch/mips/kvm | |
| parent | MIPS: KVM/locore.S: Don't preserve host ASID around vcpu_run (diff) | |
| download | kernel-qcow2-linux-9b5c3399584b6f6aa755dbe11e3cef5776fd279d.tar.gz kernel-qcow2-linux-9b5c3399584b6f6aa755dbe11e3cef5776fd279d.tar.xz kernel-qcow2-linux-9b5c3399584b6f6aa755dbe11e3cef5776fd279d.zip | |
MIPS: Add & use CP0_EntryHi ASID definitions
Add definitions for the ASID field in CP0_EntryHi (along with the soon
to be used ASIDX field), and use them in a few previously hardcoded
cases.
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Manuel Lauss <manuel.lauss@gmail.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/13205/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kvm')
| -rw-r--r-- | arch/mips/kvm/locore.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kvm/locore.S b/arch/mips/kvm/locore.S index c24facc85357..308706493fd5 100644 --- a/arch/mips/kvm/locore.S +++ b/arch/mips/kvm/locore.S @@ -164,7 +164,7 @@ FEXPORT(__kvm_mips_load_asid) INT_SLL t2, t2, 2 /* x4 */ REG_ADDU t3, t1, t2 LONG_L k0, (t3) - andi k0, k0, 0xff + andi k0, k0, MIPS_ENTRYHI_ASID mtc0 k0, CP0_ENTRYHI ehb @@ -483,7 +483,7 @@ __kvm_mips_return_to_guest: INT_SLL t2, t2, 2 /* x4 */ REG_ADDU t3, t1, t2 LONG_L k0, (t3) - andi k0, k0, 0xff + andi k0, k0, MIPS_ENTRYHI_ASID mtc0 k0, CP0_ENTRYHI ehb |