Received-SPF: pass (google.com: domain of linux-kernel+bounces-76438-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Thu, 22 Feb 2024 22:40:41 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Joey Gouly <joey.gouly@arm.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>, Christoffer Dall
 <cdall@cs.columbia.edu>, Marc Zyngier <maz@kernel.org>, KVM
 <kvm@vger.kernel.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the kvm-arm tree
Message-ID: <20240222224041.782761fd@canb.auug.org.au>
In-Reply-To: <20240222111129.GA946362@e124191.cambridge.arm.com>
References: <20240222220349.1889c728@canb.auug.org.au>
	<20240222111129.GA946362@e124191.cambridge.arm.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/AedWDBZ0=V+nKK0DvBL+JL8";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/AedWDBZ0=V+nKK0DvBL+JL8
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Joey,

On Thu, 22 Feb 2024 11:11:29 +0000 Joey Gouly <joey.gouly@arm.com> wrote:
>
> On Thu, Feb 22, 2024 at 10:03:49PM +1100, Stephen Rothwell wrote:
> >=20
> > After merging the kvm tree, today's linux-next build (arm64 defconfig)
> > failed like this:
> >=20
> > 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_as=
sert_591' declared with attribute error: BUILD_BUG_ON failed: ID_AA64DFR1_E=
L1_RES0 !=3D (GENMASK_ULL(63, 0))
> >   449 |         _compiletime_assert(condition, msg, __compiletime_asser=
t_, __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 '_com=
piletime_assert'
> >   449 |         _compiletime_assert(condition, msg, __compiletime_asser=
t_, __COUNTER__)
> >       |         ^~~~~~~~~~~~~~~~~~~
> > include/linux/build_bug.h:39:37: note: in expansion of macro 'compileti=
me_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: " #co=
ndition)
> >       |         ^~~~~~~~~~~~~~~~
> > arch/arm64/kvm/check-res-bits.h:58:9: note: in expansion of macro 'BUIL=
D_BUG_ON'
> >    58 |         BUILD_BUG_ON(ID_AA64DFR1_EL1_RES0       !=3D (GENMASK_U=
LL(63, 0)));
> >       |         ^~~~~~~~~~~~
> >=20
> > I bisected this to the merge of the kvm-arm tree into linux-next but I
> > could not figure out why it fails :-(
> >=20
> > --=20
> > Cheers,
> > Stephen Rothwell =20
>=20
> This fails because https://git.kernel.org/pub/scm/linux/kernel/git/arm64/=
linux.git/commit/?id=3Dfdd867fe9b32
> added new fields to that register (ID_AA64DFR1_EL1)
>=20
> and commit b80b701d5a6 ("KVM: arm64: Snapshot all non-zero RES0/RES1 sysr=
eg fields for later checking")
> took a snapshot of the fields, so the RES0 (reserved 0) bits don't match =
anymore.
>=20
> 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@canb.auug.org.au>
Date: Thu, 22 Feb 2024 22:31:22 +1100
Subject: [PATCH] fix up for "arm64/sysreg: Add register fields for ID_AA64D=
FR1_EL1"

interacting with "KVM: arm64: Snapshot all non-zero RES0/RES1 sysreg fields=
 for later checking"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 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-bit=
s.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	!=3D (GENMASK_ULL(62, 61) | GENMASK_UL=
L(51, 49) | GENMASK_ULL(31, 31) | GENMASK_ULL(27, 0)));
 	BUILD_BUG_ON(ID_AA64FPFR0_EL1_RES0	!=3D (GENMASK_ULL(63, 32) | GENMASK_UL=
L(27, 2)));
 	BUILD_BUG_ON(ID_AA64DFR0_EL1_RES0	!=3D (GENMASK_ULL(27, 24) | GENMASK_ULL=
(19, 16)));
-	BUILD_BUG_ON(ID_AA64DFR1_EL1_RES0	!=3D (GENMASK_ULL(63, 0)));
 	BUILD_BUG_ON(ID_AA64AFR0_EL1_RES0	!=3D (GENMASK_ULL(63, 32)));
 	BUILD_BUG_ON(ID_AA64AFR1_EL1_RES0	!=3D (GENMASK_ULL(63, 0)));
 	BUILD_BUG_ON(ID_AA64ISAR0_EL1_RES0	!=3D (GENMASK_ULL(3, 0)));
--=20
2.43.0

--=20
Cheers,
Stephen Rothwell

--Sig_/AedWDBZ0=V+nKK0DvBL+JL8
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXXMrkACgkQAVBC80lX
0Gyb6wf/Y/9NIHRf5ckuf73aWrvP2Z3vSOrtciYwk1j77ut8ISRM9gkpZkYpk3IN
dLyNfXMpuRZHXMfD0xT7KzdV8bgtAjP2IwOLqQdTbwxnDOvILVSUzfdeTKninGKf
Tor1rMYB55PJxqu3yO1ToCl2wSXLWbari6DbZIA9K6NhSBrA6r0djmqK5pS2cChr
VUkI3cN4PH9P+oZE6lw4+WphtrXDmUIUjfUHtbVT6VQE7E7qLQX1oqJsMkfJPCaG
Bg0Zu/9KA6tDDwBoI5XU5U+OvpBOC9r+o9jX/AKAKmrm8DGpQc0Sw1zsDPwTumvK
53Pi7MPtAz4t05LzcNWdr7gYcCTkkw==
=aSyV
-----END PGP SIGNATURE-----

--Sig_/AedWDBZ0=V+nKK0DvBL+JL8--