Re: [Qemu-devel] [PATCH v7 04/32] target-arm: rename arm_current_pl to arm_current_el

[Peter Maydell]

On 21 October 2014 17:55, Greg Bellows <address@hidden> wrote:
> Renamed the arm_current_pl CPU function to more accurately represent that it
> returns the ARMv8 EL rather than ARMv7 PL.
>
> Signed-off-by: Greg Bellows <address@hidden>
> Reviewed-by: Peter Maydell <address@hidden>

> @@ -1485,7 +1485,7 @@ static void disas_exc(DisasContext *s, uint32_t insn)
>              gen_exception_insn(s, 0, EXCP_SWI, syn_aa64_svc(imm16));
>              break;
>          case 2:
> -            if (s->current_pl == 0) {
> +            if (!arm_dc_feature(s, ARM_FEATURE_EL2) || s->current_el == 0) {
>                  unallocated_encoding(s);
>                  break;
>              }
> @@ -1498,7 +1498,7 @@ static void disas_exc(DisasContext *s, uint32_t insn)
>              gen_exception_insn(s, 0, EXCP_HVC, syn_aa64_hvc(imm16));
>              break;
>          case 3:
> -            if (s->current_pl == 0) {
> +            if (!arm_dc_feature(s, ARM_FEATURE_EL3) || s->current_el == 0) {
>                  unallocated_encoding(s);
>                  break;
>              }

These hunks introduce spurious changes which break PSCI booting
of AArch64. I will fix up in target-arm.next.

thanks
-- PMM