sunxi: armv8: fel: load only 32-bit values

Both the values and the MMIO addresses that we need during the 64-bit FEL
restore are smaller than 2^32, so we don't need to do any 64-bit loads.

Change the loads to only load 32 bits worth of data, that saves us some
bytes for storing the values.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Samuel Holland <samuel@sholland.org>
Tested-by: Samuel Holland <samuel@sholland.org>

diff --git a/arch/arm/cpu/armv8/fel_utils.S b/arch/arm/cpu/armv8/fel_utils.S
index 5266515f145ef1b77e75d50f73b555b4fd2efb1c..2fe38a1a0473e3f0dfe6595ade83aa2fd7f01a53 100644 (file)
--- a/arch/arm/cpu/armv8/fel_utils.S
+++ b/arch/arm/cpu/armv8/fel_utils.S
@@ -39,15 +39,15 @@ ENTRY(return_to_fel)
        adr     x1, fel_stash_addr      // to find the fel_stash address in AA32
        str     w2, [x1]
 
-       ldr     x0, =0xfa50392f         // CPU hotplug magic
+       ldr     w0, =0xfa50392f         // CPU hotplug magic
 #ifdef CONFIG_MACH_SUN50I_H616
-       ldr     x2, =(SUNXI_R_CPUCFG_BASE + 0x1c0)
+       ldr     w2, =(SUNXI_R_CPUCFG_BASE + 0x1c0)
        str     w0, [x2], #0x4
 #elif CONFIG_MACH_SUN50I_H6
-       ldr     x2, =(SUNXI_RTC_BASE + 0x1b8)   // BOOT_CPU_HP_FLAG_REG
+       ldr     w2, =(SUNXI_RTC_BASE + 0x1b8)   // BOOT_CPU_HP_FLAG_REG
        str     w0, [x2], #0x4
 #else
-       ldr     x2, =(SUNXI_CPUCFG_BASE + 0x1a4) // offset for CPU hotplug base
+       ldr     w2, =(SUNXI_CPUCFG_BASE + 0x1a4) // offset for CPU hotplug base
        str     w0, [x2, #0x8]
 #endif
        adr     x0, back_in_32