From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from foss.arm.com ([217.140.101.70]:55184 "EHLO foss.arm.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1750825AbdERHIt (ORCPT <rfc822;stable@vger.kernel.org>);
        Thu, 18 May 2017 03:08:49 -0400
From: Marc Zyngier <marc.zyngier@arm.com>
To: Christoffer Dall <cdall@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
        "Olof's autobuilder" <build@lixom.net>,
        Olof Johansson <olof@lixom.net>,
        Kernel Build Reports Mailman List
        <kernel-build-reports@lists.linaro.org>,
        Stable <stable@vger.kernel.org>,
        gregkh <gregkh@linuxfoundation.org>,
        Suzuki K Poulose <suzuki.poulose@arm.com>,
        Andre Przywara <andre.przywara@arm.com>,
        Will Deacon <will.deacon@arm.com>
Subject: Re: stable-rc build: 3 warnings 3 failures (stable-rc/v4.4.68-29-geca6664)
In-Reply-To: <CAMJs5B_rjsD_uWKgFMvSwhfrgJ3rMCQLfD37=zBxAiYwBk=Efw@mail.gmail.com>
        (Christoffer Dall's message of "Wed, 17 May 2017 10:57:15 +0200")
References: <591b970f.9985620a.cf175.1a5d@mx.google.com>
        <CAK8P3a0uME8R=w9zqXe97eKHM-sKvQxC8STx5ppOKfYLxDbcCA@mail.gmail.com>
        <CAMJs5B_rjsD_uWKgFMvSwhfrgJ3rMCQLfD37=zBxAiYwBk=Efw@mail.gmail.com>
Date: Thu, 18 May 2017 08:08:41 +0100
Message-ID: <8637c28ww6.fsf@arm.com>
MIME-Version: 1.0
Content-Type: text/plain
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

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.
-- 
Jazz is not dead. It just smells funny.