From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsUXL-0006RS-GS for qemu-devel@nongnu.org; Wed, 13 May 2015 07:09:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsUXG-0003kj-W8 for qemu-devel@nongnu.org; Wed, 13 May 2015 07:09:15 -0400 Received: from mail-lb0-x230.google.com ([2a00:1450:4010:c04::230]:35877) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsUXG-0003kG-Mv for qemu-devel@nongnu.org; Wed, 13 May 2015 07:09:10 -0400 Received: by lbbqq2 with SMTP id qq2so26695476lbb.3 for ; Wed, 13 May 2015 04:09:09 -0700 (PDT) Message-ID: <555330D3.2000807@gmail.com> Date: Wed, 13 May 2015 14:09:07 +0300 From: Sergey Fedorov MIME-Version: 1.0 References: <1431499963-1019-1-git-send-email-edgar.iglesias@gmail.com> <1431499963-1019-6-git-send-email-edgar.iglesias@gmail.com> <555302D7.6090801@gmail.com> <20150513110524.GB13061@toto> In-Reply-To: <20150513110524.GB13061@toto> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v1 05/18] target-arm: Add MAIR_EL2 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Edgar E. Iglesias" Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, agraf@suse.de, qemu-devel@nongnu.org, greg.bellows@linaro.org, alex.bennee@linaro.org On 13.05.2015 14:05, Edgar E. Iglesias wrote: > On Wed, May 13, 2015 at 10:52:55AM +0300, Sergey Fedorov wrote: >> On 13.05.2015 09:52, Edgar E. Iglesias wrote: >>> From: "Edgar E. Iglesias" >>> >>> Signed-off-by: Edgar E. Iglesias >>> --- >>> target-arm/helper.c | 8 ++++++++ >>> 1 file changed, 8 insertions(+) >>> >>> diff --git a/target-arm/helper.c b/target-arm/helper.c >>> index d849b30..168549c 100644 >>> --- a/target-arm/helper.c >>> +++ b/target-arm/helper.c >>> @@ -2520,6 +2520,10 @@ static const ARMCPRegInfo v8_el3_no_el2_cp_reginfo[] = { >>> .cp = 15, .opc1 = 4, .crn = 1, .crm = 1, .opc2 = 2, >>> .access = PL2_RW, .accessfn = cptr_access, .resetvalue = 0, >>> .readfn = arm_cp_read_zero, .writefn = arm_cp_write_ignore }, >>> + { .name = "MAIR_EL2", .state = ARM_CP_STATE_AA64, >>> + .opc0 = 3, .opc1 = 4, .crn = 10, .crm = 2, .opc2 = 0, >>> + .access = PL2_RW, >>> + .readfn = arm_cp_read_zero, .writefn = arm_cp_write_ignore }, >>> REGINFO_SENTINEL >>> }; >>> >>> @@ -2595,6 +2599,10 @@ static const ARMCPRegInfo v8_el2_cp_reginfo[] = { >>> .cp = 15, .opc1 = 4, .crn = 1, .crm = 1, .opc2 = 2, >>> .access = PL2_RW, .accessfn = cptr_access, .resetvalue = 0, >>> .fieldoffset = offsetof(CPUARMState, cp15.cptr_el[2]) }, >>> + { .name = "MAIR_EL2", .state = ARM_CP_STATE_AA64, >>> + .opc0 = 3, .opc1 = 4, .crn = 10, .crm = 2, .opc2 = 0, >>> + .access = PL2_RW, .fieldoffset = offsetof(CPUARMState, cp15.mair_el[2]), >>> + .resetvalue = 0 }, >>> REGINFO_SENTINEL >>> }; >>> >> Hi Edgar! >> >> This patch does not apply when trying to apply the series onto commit >> 968bb75c348a401b85e08d5eb1887a3e6c3185f5 > Hi Sergey, > > Yes, you need Gregs target el infrastructure series applied before this series. > > You can find it all here: > http://repo.or.cz/w/qemu/cris-port.git/shortlog/refs/heads/edgar/a64/el2-steps3.v1 > > Cheers, > Edgar Thanks! > >> Merge: 19fbe50 5ae79fe >> Author: Peter Maydell >> Date: Tue May 12 12:11:32 2015 +0100 >> >> Git gives: >> >> Applying: target-arm: Add MAIR_EL2 >> error: patch failed: target-arm/helper.c:2520 >> error: target-arm/helper.c: patch does not apply >> Patch failed at 0005 target-arm: Add MAIR_EL2 >> >> Regards, >> Sergey