armv8: layerscape: clean exported symbols in spintable.S

Add a new variable secondary_boot_code_start, which holds a pointer to
the start of the spin table code. This will help to relocate the code
section. While at it, move the size variable from the end to the
beginning so there is a common section for the variables. Remove any
other symbols.

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
index 67764ee83da27315236d520cb12e215b4dbe322e..7400b2cf292488e00819e71640a5ef50cd1fb549 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
@@ -54,7 +54,6 @@ void ft_fixup_cpu(void *blob)
        fdt32_t *reg;
        int addr_cells;
        u64 val, core_id;
-       size_t *boot_code_size = &(__secondary_boot_code_size);
        u32 mask = cpu_pos_mask();
        int off_prev = -1;
 
@@ -145,11 +144,11 @@ remove_psci_node:
                                                    "cpu", 4);
        }
 
-       fdt_add_mem_rsv(blob, (uintptr_t)&secondary_boot_code,
-                       *boot_code_size);
+       fdt_add_mem_rsv(blob, (uintptr_t)secondary_boot_code_start,
+                       secondary_boot_code_size);
 #if CONFIG_IS_ENABLED(EFI_LOADER)
-       efi_add_memory_map((uintptr_t)&secondary_boot_code, *boot_code_size,
-                          EFI_RESERVED_MEMORY_TYPE);
+       efi_add_memory_map((uintptr_t)secondary_boot_code_start,
+                          secondary_boot_code_size, EFI_RESERVED_MEMORY_TYPE);
 #endif
 }
 #endif

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
index 753215add0eefc5b50b287ac559ca359bccc169d..d50c5a437bcaf4f37c03c9a08512d9a40e9b1912 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
@@ -15,12 +15,14 @@
 #include <linux/delay.h>
 #include "cpu.h"
 #include <asm/arch-fsl-layerscape/soc.h>
+#include <efi_loader.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 void *get_spin_tbl_addr(void)
 {
-       return &__spin_table;
+       /* the spin table is at the beginning */
+       return secondary_boot_code_start;
 }
 
 void update_os_arch_secondary_cores(uint8_t os_arch)

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spintable.S b/arch/arm/cpu/armv8/fsl-layerscape/spintable.S
index 0e38cd009be8a9ce407dda25a3d1f41e34e610c2..f082e1023121043c12fa37b0a7e6691583f28254 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/spintable.S
+++ b/arch/arm/cpu/armv8/fsl-layerscape/spintable.S
@@ -10,23 +10,28 @@
 #include <asm/system.h>
 #include <asm/arch/mp.h>
 
-       .align 3
-       .global secondary_boot_addr
+.align 3
+.global secondary_boot_addr
 secondary_boot_addr:
-       .quad secondary_boot_func
+       .quad __secondary_boot_func
+
+.global secondary_boot_code_start
+secondary_boot_code_start:
+       .quad __secondary_boot_code_start
 
+.global secondary_boot_code_size
+secondary_boot_code_size:
+       .quad __secondary_boot_code_end - __secondary_boot_code_start
 
        /* Using 64 bit alignment since the spin table is accessed as data */
        .align 3
-       .global secondary_boot_code
        /* Secondary Boot Code starts here */
-secondary_boot_code:
-       .global __spin_table
+__secondary_boot_code_start:
 __spin_table:
        .space CONFIG_MAX_CPUS*SPIN_TABLE_ELEM_SIZE
 
        .align 2
-ENTRY(secondary_boot_func)
+ENTRY(__secondary_boot_func)
        /*
         * MPIDR_EL1 Fields:
         * MPIDR[1:0] = AFF0_CPUID <- Core ID (0,1)
@@ -100,7 +105,7 @@ cpu_is_le:
        ldr     x5, =ES_TO_AARCH64
        bl      secondary_switch_to_el2
 
-ENDPROC(secondary_boot_func)
+ENDPROC(__secondary_boot_func)
 
 ENTRY(secondary_switch_to_el2)
        switch_el x6, 1f, 0f, 0f
@@ -146,8 +151,5 @@ ENDPROC(secondary_switch_to_el1)
        .global __real_cntfrq
 __real_cntfrq:
        .quad COUNTER_FREQUENCY
-       .globl __secondary_boot_code_size
-       .type __secondary_boot_code_size, %object
        /* Secondary Boot Code ends here */
-__secondary_boot_code_size:
-       .quad .-secondary_boot_code
+__secondary_boot_code_end:

diff --git a/arch/arm/include/asm/arch-fsl-layerscape/mp.h b/arch/arm/include/asm/arch-fsl-layerscape/mp.h
index 3b470439bdecd7e7473e9907b3b65c1b5ba18f4e..faac8f11286fd6436917328b2fdc6c0148f1f6ad 100644 (file)
--- a/arch/arm/include/asm/arch-fsl-layerscape/mp.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/mp.h
@@ -32,10 +32,10 @@
 
 #define id_to_core(x)  ((x & 3) | (x >> 6))
 #ifndef __ASSEMBLY__
-extern u64 __spin_table[];
 extern u64 __real_cntfrq;
-extern u64 *secondary_boot_code;
-extern size_t __secondary_boot_code_size;
+extern void *secondary_boot_addr;
+extern void *secondary_boot_code_start;
+extern size_t secondary_boot_code_size;
 #ifdef CONFIG_MP
 int fsl_layerscape_wake_seconday_cores(void);
 #else