diff options
| author | Alison Wang <b18965@freescale.com> | 2017-01-17 09:39:17 +0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2017-01-18 09:29:33 -0800 |
| commit | 7c5e1feb1d780cc857632c246e78ac7a8e6cf2d7 (patch) | |
| tree | 74e3a73c1be3c56594f7e19267838c5a4c4fe81f /arch/arm/mach-rmobile/lowlevel_init_gen3.S | |
| parent | 2ca84bf7b2d7930b424b19f5027d3c06ec7cb696 (diff) | |
| download | u-boot-7c5e1feb1d780cc857632c246e78ac7a8e6cf2d7.tar.gz | |
armv8: aarch64: Fix the warning about x1-x3 nonzero issue
For 64-bit kernel, there is a warning about x1-x3 nonzero in violation
of boot protocol. To fix this issue, input argument 4 is added for
armv8_switch_to_el2 and armv8_switch_to_el1. The input argument 4 will
be set to the right value, such as zero.
Signed-off-by: Alison Wang <alison.wang@nxp.com>
Reviewed-by: Alexander Graf <agraf@suse.de>
Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'arch/arm/mach-rmobile/lowlevel_init_gen3.S')
| -rw-r--r-- | arch/arm/mach-rmobile/lowlevel_init_gen3.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-rmobile/lowlevel_init_gen3.S b/arch/arm/mach-rmobile/lowlevel_init_gen3.S index 11acce0395..ce3d4f5c52 100644 --- a/arch/arm/mach-rmobile/lowlevel_init_gen3.S +++ b/arch/arm/mach-rmobile/lowlevel_init_gen3.S @@ -61,14 +61,14 @@ ENTRY(lowlevel_init) /* * All slaves will enter EL2 and optionally EL1. */ - adr x3, lowlevel_in_el2 - ldr x4, =ES_TO_AARCH64 + adr x4, lowlevel_in_el2 + ldr x5, =ES_TO_AARCH64 bl armv8_switch_to_el2 lowlevel_in_el2: #ifdef CONFIG_ARMV8_SWITCH_TO_EL1 - adr x3, lowlevel_in_el1 - ldr x4, =ES_TO_AARCH64 + adr x4, lowlevel_in_el1 + ldr x5, =ES_TO_AARCH64 bl armv8_switch_to_el1 lowlevel_in_el1: |