From: Xiang Chen chenxiang66@hisilicon.com

virt inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IAR6N7

------------------------------------------------------------------------

Feature dvmbm is supported on HIP09 and later version, so it is not suitable to use cpu_type to check whether dvmbm is supported, So remove cpu_type check for feature dmvmb. It is enough to judge register AIDR to check whether dvmbm is supported.

Fixes: e85b97c7e2b4 ("KVM: arm64: Probe and configure DVMBM capability on HiSi CPUs") Signed-off-by: Xiang Chen chenxiang66@hisilicon.com Signed-off-by: Zhou Wang wangzhou1@hisilicon.com --- arch/arm64/kvm/hisilicon/hisi_virt.c | 3 --- 1 file changed, 3 deletions(-)

diff --git a/arch/arm64/kvm/hisilicon/hisi_virt.c b/arch/arm64/kvm/hisilicon/hisi_virt.c index 68809f10e8d7..f87f951c0d81 100644 --- a/arch/arm64/kvm/hisilicon/hisi_virt.c +++ b/arch/arm64/kvm/hisilicon/hisi_virt.c @@ -153,9 +153,6 @@ static void hardware_disable_dvmbm(void *data)

bool hisi_dvmbm_supported(void) { - if (cpu_type != HI_IP09) - return false; - /* Determine whether DVMBM is supported by the hardware */ if (!(read_sysreg(aidr_el1) & AIDR_EL1_DVMBM_MASK)) return false;