Hi Joey, On Thu, 22 Feb 2024 11:11:29 +0000 Joey Gouly <joey.gouly@xxxxxxx> wrote: > > On Thu, Feb 22, 2024 at 10:03:49PM +1100, Stephen Rothwell wrote: > > > > After merging the kvm tree, today's linux-next build (arm64 defconfig) > > failed like this: > > > > In file included from <command-line>: > > In function 'check_res_bits', > > inlined from 'kvm_sys_reg_table_init' at arch/arm64/kvm/sys_regs.c:4109:2: > > include/linux/compiler_types.h:449:45: error: call to '__compiletime_assert_591' declared with attribute error: BUILD_BUG_ON failed: ID_AA64DFR1_EL1_RES0 != (GENMASK_ULL(63, 0)) > > 449 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) > > | ^ > > include/linux/compiler_types.h:430:25: note: in definition of macro '__compiletime_assert' > > 430 | prefix ## suffix(); \ > > | ^~~~~~ > > include/linux/compiler_types.h:449:9: note: in expansion of macro '_compiletime_assert' > > 449 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) > > | ^~~~~~~~~~~~~~~~~~~ > > include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' > > 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) > > | ^~~~~~~~~~~~~~~~~~ > > include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' > > 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) > > | ^~~~~~~~~~~~~~~~ > > arch/arm64/kvm/check-res-bits.h:58:9: note: in expansion of macro 'BUILD_BUG_ON' > > 58 | BUILD_BUG_ON(ID_AA64DFR1_EL1_RES0 != (GENMASK_ULL(63, 0))); > > | ^~~~~~~~~~~~ > > > > I bisected this to the merge of the kvm-arm tree into linux-next but I > > could not figure out why it fails :-( > > > > -- > > Cheers, > > Stephen Rothwell > > This fails because https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git/commit/?id=fdd867fe9b32 > added new fields to that register (ID_AA64DFR1_EL1) > > and commit b80b701d5a6 ("KVM: arm64: Snapshot all non-zero RES0/RES1 sysreg fields for later checking") > took a snapshot of the fields, so the RES0 (reserved 0) bits don't match anymore. > > Not sure how to resolve it in the git branches though. Thanks. I will apply this patch to the merge of the kvm-arm tree from tomorrow (and at the end of today's tree). From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Thu, 22 Feb 2024 22:31:22 +1100 Subject: [PATCH] fix up for "arm64/sysreg: Add register fields for ID_AA64DFR1_EL1" interacting with "KVM: arm64: Snapshot all non-zero RES0/RES1 sysreg fields for later checking" Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- arch/arm64/kvm/check-res-bits.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/kvm/check-res-bits.h b/arch/arm64/kvm/check-res-bits.h index 967b5d171d53..39f537875d17 100644 --- a/arch/arm64/kvm/check-res-bits.h +++ b/arch/arm64/kvm/check-res-bits.h @@ -55,7 +55,6 @@ static inline void check_res_bits(void) BUILD_BUG_ON(ID_AA64SMFR0_EL1_RES0 != (GENMASK_ULL(62, 61) | GENMASK_ULL(51, 49) | GENMASK_ULL(31, 31) | GENMASK_ULL(27, 0))); BUILD_BUG_ON(ID_AA64FPFR0_EL1_RES0 != (GENMASK_ULL(63, 32) | GENMASK_ULL(27, 2))); BUILD_BUG_ON(ID_AA64DFR0_EL1_RES0 != (GENMASK_ULL(27, 24) | GENMASK_ULL(19, 16))); - BUILD_BUG_ON(ID_AA64DFR1_EL1_RES0 != (GENMASK_ULL(63, 0))); BUILD_BUG_ON(ID_AA64AFR0_EL1_RES0 != (GENMASK_ULL(63, 32))); BUILD_BUG_ON(ID_AA64AFR1_EL1_RES0 != (GENMASK_ULL(63, 0))); BUILD_BUG_ON(ID_AA64ISAR0_EL1_RES0 != (GENMASK_ULL(3, 0))); -- 2.43.0 -- Cheers, Stephen Rothwell
Attachment:
pgph_M_HLjjbD.pgp
Description: OpenPGP digital signature
