From: Marc Zyngier Date: Mon, 19 Sep 2022 08:45:00 +0000 (+0100) Subject: Merge remote-tracking branch 'arm64/for-next/sysreg' into kvmarm-master/next X-Git-Tag: v6.1-rc5~68^2~26^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b04b3315021a524d5eecdb6de0d24cf7371d4abf;p=platform%2Fkernel%2Flinux-starfive.git Merge remote-tracking branch 'arm64/for-next/sysreg' into kvmarm-master/next Merge arm64/for-next/sysreg in order to avoid upstream conflicts due to the never ending sysreg repainting... Signed-off-by: Marc Zyngier --- b04b3315021a524d5eecdb6de0d24cf7371d4abf diff --cc arch/arm64/kvm/sys_regs.c index 9569772,2ef1121..f4a7c5a --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@@ -1210,9 -1208,9 +1210,9 @@@ static int set_id_aa64pfr0_el1(struct k return -EINVAL; /* We can only differ with CSV[23], and anything else is an error */ - val ^= read_id_reg(vcpu, rd, false); - val &= ~((0xFUL << ID_AA64PFR0_EL1_CSV2_SHIFT) | - (0xFUL << ID_AA64PFR0_EL1_CSV3_SHIFT)); + val ^= read_id_reg(vcpu, rd); - val &= ~((0xFUL << ID_AA64PFR0_CSV2_SHIFT) | - (0xFUL << ID_AA64PFR0_CSV3_SHIFT)); ++ val &= ~(ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_CSV2) | ++ ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_CSV3)); if (val) return -EINVAL;