On Wed, May 17 2017 at 09:57:15 AM, Christoffer Dall cdall@linaro.org wrote:
On Wed, May 17, 2017 at 10:37 AM, Arnd Bergmann arnd@arndb.de wrote:
On Wed, May 17, 2017 at 2:19 AM, Olof's autobuilder build@lixom.net wrote:
Failed defconfigs: arm64.allmodconfig arm64.defconfig arm64.nosmp_defconfig
Errors:
arm64.allmodconfig:/work/build/batch/arch/arm64/include/asm/kvm_emulate.h:223:16: error: 'ESR_ELx_SYS64_ISS_RT_MASK' undeclared (first use in this function) /work/build/batch/arch/arm64/include/asm/kvm_emulate.h:223:46: error: 'ESR_ELx_SYS64_ISS_RT_SHIFT' undeclared (first use in this function) /work/build/batch/arch/arm64/include/asm/kvm_emulate.h:223:16: error: 'ESR_ELx_SYS64_ISS_RT_MASK' undeclared (first use in this function)
This is evidently caused by the backport of c667186f1c01 ("arm64: KVM: Fix decoding of Rt/Rt2 when trapping AArch32 CP accesses")
The missing constants were added in linux-4.9 by 9dbd5bb25c56 ("arm64: Refactor sysinstr exception handling")
I don't think that commit is something we want backported as well as it is part of a longer series, but we could simply add the two lines to arch/arm64/include/asm/esr.h:
+#define ESR_ELx_SYS64_ISS_RT_SHIFT 5 +#define ESR_ELx_SYS64_ISS_RT_MASK (UL(0x1f) << ESR_ELx_SYS64_ISS_RT_SHIFT)
That seems like a good fix, but Marc has asked to have this patch dropped from v4.4 stable for now and will provide a backport later.
Sorry, I missed this earlier. I've just sent Greg an updated patch.
Thanks,
M.