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 <maz@kernel.org>

diff --cc arch/arm64/kvm/sys_regs.c
index 9569772cf09a5d342bee4fe8949878448c3dad23,2ef1121ab844df69235c581dd7ec51ce17c9e2dd..f4a7c5abcbca44070292e9a60db6f302acac783d
--- 1/arch/arm64/kvm/sys_regs.c
--- 2/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;