qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH v1 05/18] target-arm: Add MAIR_EL2


From: Sergey Fedorov
Subject: Re: [Qemu-devel] [PATCH v1 05/18] target-arm: Add MAIR_EL2
Date: Wed, 13 May 2015 10:52:55 +0300
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0

On 13.05.2015 09:52, Edgar E. Iglesias wrote:
From: "Edgar E. Iglesias" <address@hidden>

Signed-off-by: Edgar E. Iglesias <address@hidden>
---
 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
Merge: 19fbe50 5ae79fe
Author: Peter Maydell <address@hidden>
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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]