KVM: MIPS: Enable KVM support for Loongson-3

This patch enable KVM support for Loongson-3 by selecting HAVE_KVM, but
only enable KVM/VZ on Loongson-3A R4+ (because VZ of early processors
are incomplete). Besides, Loongson-3 support SMP guests, so we clear the
linked load bit of LLAddr in kvm_vz_vcpu_load() if the guest has more
than one VCPUs.

Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Reviewed-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Co-developed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Message-Id: <1590220602-3547-15-git-send-email-chenhc@lemote.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 9dc08ee3d6b94799ccba6e8b75667ca4df38e110..1ad50c01c9701689150260abf166dfb2a5d4b95e 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1404,6 +1404,7 @@ config CPU_LOONGSON64
        select MIPS_L1_CACHE_SHIFT_6
        select GPIOLIB
        select SWIOTLB
+       select HAVE_KVM
        help
                The Loongson GSx64(GS264/GS464/GS464E/GS464V) series of processor
                cores implements the MIPS64R2 instruction set with many extensions,

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index f0e7f2d7bd9a56e1a743532357c0e6ed50e87258..def1659fe2621ba423db5fda2fe32f2e1c32bd00 100644 (file)
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -2076,6 +2076,7 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu)
                c->writecombine = _CACHE_UNCACHED_ACCELERATED;
                c->ases |= (MIPS_ASE_LOONGSON_MMI | MIPS_ASE_LOONGSON_CAM |
                        MIPS_ASE_LOONGSON_EXT | MIPS_ASE_LOONGSON_EXT2);
+               c->ases &= ~MIPS_ASE_VZ; /* VZ of Loongson-3A2000/3000 is incomplete */
                break;
        case PRID_IMP_LOONGSON_64G:
                c->cputype = CPU_LOONGSON64;

diff --git a/arch/mips/kvm/vz.c b/arch/mips/kvm/vz.c
index 2810d1c8b67f81c0972ed37a8900e6f86d45aaf1..d9c462c14163fffb7b1d6d9e4c0a31b6ff31d98a 100644 (file)
--- a/arch/mips/kvm/vz.c
+++ b/arch/mips/kvm/vz.c
@@ -2697,7 +2697,7 @@ static int kvm_vz_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
         * prevents a SC on the next VCPU from succeeding by matching a LL on
         * the previous VCPU.
         */
-       if (cpu_guest_has_rw_llb)
+       if (vcpu->kvm->created_vcpus > 1)
                write_gc0_lladdr(0);
 
        return 0;