* [Qemu-devel] [PATCH v1 1/1] target-arm: Mark CNTHP_TVAL_EL2 as ARM_CP_NO_RAW
@ 2016-02-26 12:45 Edgar E. Iglesias
2016-02-26 13:36 ` Peter Maydell
0 siblings, 1 reply; 2+ messages in thread
From: Edgar E. Iglesias @ 2016-02-26 12:45 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: edgar.iglesias, qemu-arm
From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com>
Mark CNTHP_TVAL_EL2 as ARM_CP_NO_RAW due to the register not
having any underlying state. This fixes an issue with booting
KVM enabled kernels when EL2 is on.
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
---
target-arm/helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 85a6685..601e3c1 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -3631,7 +3631,7 @@ static const ARMCPRegInfo el2_cp_reginfo[] = {
.writefn = gt_hyp_cval_write, .raw_writefn = raw_write },
{ .name = "CNTHP_TVAL_EL2", .state = ARM_CP_STATE_BOTH,
.opc0 = 3, .opc1 = 4, .crn = 14, .crm = 2, .opc2 = 0,
- .type = ARM_CP_IO, .access = PL2_RW,
+ .type = ARM_CP_NO_RAW | ARM_CP_IO, .access = PL2_RW,
.resetfn = gt_hyp_timer_reset,
.readfn = gt_hyp_tval_read, .writefn = gt_hyp_tval_write },
{ .name = "CNTHP_CTL_EL2", .state = ARM_CP_STATE_BOTH,
--
2.5.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH v1 1/1] target-arm: Mark CNTHP_TVAL_EL2 as ARM_CP_NO_RAW
2016-02-26 12:45 [Qemu-devel] [PATCH v1 1/1] target-arm: Mark CNTHP_TVAL_EL2 as ARM_CP_NO_RAW Edgar E. Iglesias
@ 2016-02-26 13:36 ` Peter Maydell
0 siblings, 0 replies; 2+ messages in thread
From: Peter Maydell @ 2016-02-26 13:36 UTC (permalink / raw)
To: Edgar E. Iglesias; +Cc: Edgar Iglesias, qemu-arm, QEMU Developers
On 26 February 2016 at 12:45, Edgar E. Iglesias
<edgar.iglesias@gmail.com> wrote:
> From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com>
>
> Mark CNTHP_TVAL_EL2 as ARM_CP_NO_RAW due to the register not
> having any underlying state. This fixes an issue with booting
> KVM enabled kernels when EL2 is on.
>
> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
> ---
> target-arm/helper.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/target-arm/helper.c b/target-arm/helper.c
> index 85a6685..601e3c1 100644
> --- a/target-arm/helper.c
> +++ b/target-arm/helper.c
> @@ -3631,7 +3631,7 @@ static const ARMCPRegInfo el2_cp_reginfo[] = {
> .writefn = gt_hyp_cval_write, .raw_writefn = raw_write },
> { .name = "CNTHP_TVAL_EL2", .state = ARM_CP_STATE_BOTH,
> .opc0 = 3, .opc1 = 4, .crn = 14, .crm = 2, .opc2 = 0,
> - .type = ARM_CP_IO, .access = PL2_RW,
> + .type = ARM_CP_NO_RAW | ARM_CP_IO, .access = PL2_RW,
> .resetfn = gt_hyp_timer_reset,
> .readfn = gt_hyp_tval_read, .writefn = gt_hyp_tval_write },
> { .name = "CNTHP_CTL_EL2", .state = ARM_CP_STATE_BOTH,
> --
Applied to target-arm.next, thanks.
-- PMM
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-02-26 13:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-26 12:45 [Qemu-devel] [PATCH v1 1/1] target-arm: Mark CNTHP_TVAL_EL2 as ARM_CP_NO_RAW Edgar E. Iglesias
2016-02-26 13:36 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).