| From e4468301fccbf814000f413d11edd952f2f29e4a Mon Sep 17 00:00:00 2001 |
| From: Xing Li <lixing@loongson.cn> |
| Date: Sat, 23 May 2020 15:56:28 +0800 |
| Subject: [PATCH] KVM: MIPS: Define KVM_ENTRYHI_ASID to |
| cpu_asid_mask(&boot_cpu_data) |
| |
| commit fe2b73dba47fb6d6922df1ad44e83b1754d5ed4d upstream. |
| |
| The code in decode_config4() of arch/mips/kernel/cpu-probe.c |
| |
| asid_mask = MIPS_ENTRYHI_ASID; |
| if (config4 & MIPS_CONF4_AE) |
| asid_mask |= MIPS_ENTRYHI_ASIDX; |
| set_cpu_asid_mask(c, asid_mask); |
| |
| set asid_mask to cpuinfo->asid_mask. |
| |
| So in order to support variable ASID_MASK, KVM_ENTRYHI_ASID should also |
| be changed to cpu_asid_mask(&boot_cpu_data). |
| |
| Cc: Stable <stable@vger.kernel.org> #4.9+ |
| Reviewed-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> |
| Signed-off-by: Xing Li <lixing@loongson.cn> |
| [Huacai: Change current_cpu_data to boot_cpu_data for optimization] |
| Signed-off-by: Huacai Chen <chenhc@lemote.com> |
| Message-Id: <1590220602-3547-2-git-send-email-chenhc@lemote.com> |
| Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h |
| index 41204a49cf95..579458444401 100644 |
| --- a/arch/mips/include/asm/kvm_host.h |
| +++ b/arch/mips/include/asm/kvm_host.h |
| @@ -275,7 +275,7 @@ enum emulation_result { |
| #define MIPS3_PG_FRAME 0x3fffffc0 |
| |
| #define VPN2_MASK 0xffffe000 |
| -#define KVM_ENTRYHI_ASID MIPS_ENTRYHI_ASID |
| +#define KVM_ENTRYHI_ASID cpu_asid_mask(&boot_cpu_data) |
| #define TLB_IS_GLOBAL(x) ((x).tlb_lo[0] & (x).tlb_lo[1] & ENTRYLO_G) |
| #define TLB_VPN2(x) ((x).tlb_hi & VPN2_MASK) |
| #define TLB_ASID(x) ((x).tlb_hi & KVM_ENTRYHI_ASID) |
| -- |
| 2.27.0 |
| |
