[meta-xilinx] [PATCH 1/2] recipes-zynqmp/qemu_2.6%: Disable EL3 for the A53s

[Alistair Francis]

On 18 Jun 2016 2:15 AM, "Nathan Rossi" <nathan at nathanrossi.com> wrote:
>
> On Fri, Jun 17, 2016 at 8:34 AM, Alistair Francis
> <alistair.francis at xilinx.com> wrote:
> > On Thu, Jun 16, 2016 at 4:34 AM, Nathan Rossi <nathan at nathanrossi.com>
wrote:
> >> On Thu, Jun 16, 2016 at 4:50 AM, Alistair Francis
> >> <alistair.francis at xilinx.com> wrote:
> >>> The Xilinx kernel doesn't support having EL3 enabled and EL2 disabled.
> >>> As EL2 is not yet supported on mainline QEMU disable EL3 until we can
> >>> support a complete boot flow.
> >>>
> >>> Signed-off-by: Alistair Francis <alistair.francis at xilinx.com>
> >>> ---
> >>>  .../8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch | 29
++++++++++++++++++++++
> >>>  recipes-zynqmp/qemu/qemu_2.6%.bbappend             |  8 ++++++
> >>>  2 files changed, 37 insertions(+)
> >>>  create mode 100644
recipes-zynqmp/qemu/files/8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch
> >>>  create mode 100644 recipes-zynqmp/qemu/qemu_2.6%.bbappend
> >>>
> >>> diff --git
a/recipes-zynqmp/qemu/files/8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch
b/recipes-zynqmp/qemu/files/8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch
> >>> new file mode 100644
> >>> index 0000000..61a4f0a
> >>> --- /dev/null
> >>> +++
b/recipes-zynqmp/qemu/files/8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch
> >>> @@ -0,0 +1,29 @@
> >>> +From 8fa2346723fb74e8220ac9f186dabc2f57e4cb43 Mon Sep 17 00:00:00
2001
> >>> +From: Alistair Francis <alistair.francis at xilinx.com>
> >>> +Date: Wed, 15 Jun 2016 10:39:55 -0700
> >>> +Subject: [PATCH] target-arm: Disable EL3 on A53
> >>> +
> >>> +The Xilinx kernel doesn't support having EL3 enabled and EL2
disabled.
> >>> +As EL2 is not yet supported on mainline QEMU disable EL3 until we can
> >>> +support a complete boot flow.
> >>> +
> >>> +Signed-off-by: Alistair Francis <alistair.francis at xilinx.com>
> >>
> >> Missing the upstream-status info. Is the following correct?
> >>
> >> Upstream-Status: Inappropriate [workaround feature incompatibility]
> >>
> >> If so I can just add it to the patch when I merge it.
> >
> > That sounds right to me. Thanks for adding it.
>
> Done, and applied.

Thanks!

>
> Thanks,
> Nathan
>
> >
> > Thanks,
> >
> > Alistair
> >
> >>
> >> Regards,
> >> Nathan
> >>
> >>> +---
> >>> + target-arm/cpu64.c | 1 -
> >>> + 1 file changed, 1 deletion(-)
> >>> +
> >>> +diff --git a/target-arm/cpu64.c b/target-arm/cpu64.c
> >>> +index 1635deb..0896259 100644
> >>> +--- a/target-arm/cpu64.c
> >>> ++++ b/target-arm/cpu64.c
> >>> +@@ -165,7 +165,6 @@ static void aarch64_a53_initfn(Object *obj)
> >>> +     set_feature(&cpu->env, ARM_FEATURE_V8_SHA256);
> >>> +     set_feature(&cpu->env, ARM_FEATURE_V8_PMULL);
> >>> +     set_feature(&cpu->env, ARM_FEATURE_CRC);
> >>> +-    set_feature(&cpu->env, ARM_FEATURE_EL3);
> >>> +     cpu->kvm_target = QEMU_KVM_ARM_TARGET_CORTEX_A53;
> >>> +     cpu->midr = 0x410fd034;
> >>> +     cpu->revidr = 0x00000000;
> >>> +--
> >>> +2.7.4
> >>> +
> >>> diff --git a/recipes-zynqmp/qemu/qemu_2.6%.bbappend
b/recipes-zynqmp/qemu/qemu_2.6%.bbappend
> >>> new file mode 100644
> >>> index 0000000..074f6cf
> >>> --- /dev/null
> >>> +++ b/recipes-zynqmp/qemu/qemu_2.6%.bbappend
> >>> @@ -0,0 +1,8 @@
> >>> +
> >>> +FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
> >>> +
> >>> +SRC_URI += " \
> >>> +
 file://8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch \
> >>> +                  "
> >>> +
> >>> +
> >>> --
> >>> 2.7.4
> >>>
> >>> --
> >>> _______________________________________________
> >>> meta-xilinx mailing list
> >>> meta-xilinx at yoctoproject.org
> >>> https://lists.yoctoproject.org/listinfo/meta-xilinx
> >> --
> >> _______________________________________________
> >> meta-xilinx mailing list
> >> meta-xilinx at yoctoproject.org
> >> https://lists.yoctoproject.org/listinfo/meta-xilinx
> --
> _______________________________________________
> meta-xilinx mailing list
> meta-xilinx at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-xilinx
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/meta-xilinx/attachments/20160618/4c4d470f/attachment.html>