lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 059/190] KVM: MIPS: Define KVM_ENTRYHI_ASID to cpu_asid_mask(&boot_cpu_data)
    Date
    From: Xing Li <lixing@loongson.cn>

    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/mips/include/asm/kvm_host.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- 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)

    \
     
     \ /
      Last update: 2020-06-19 16:49    [W:4.026 / U:0.464 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site