RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

bsps/powerpc: Use interrupt stack for init stack

Browse Source 
Move start.o to separate file.

Update #3459.
This commit is contained in:
Sebastian Huber
2018-11-15 20:47:22 +01:00
parent cc61d5cdb2
commit 84e59b7c04
18 changed files with 84 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bsps/powerpc/gen5200/start/start.S
View File

@@ -90,7 +90,9 @@
/* */ /* */
/***********************************************************************/ /***********************************************************************/
#include <rtems/asm.h>
#include <rtems/powerpc/cache.h> #include <rtems/powerpc/cache.h>
#include <libcpu/powerpc-utility.h>
#include <bsp.h> #include <bsp.h>
#include <bsp/mpc5200.h> #include <bsp/mpc5200.h>
@@ -470,12 +472,14 @@ skip_ROM_start:
bl bsp_uboot_copy_board_info bl bsp_uboot_copy_board_info
#endif /* HAS_UBOOT */ #endif /* HAS_UBOOT */
/* set stack pointer (common for RAM/ROM startup) */ /*
LA r1, bsp_section_text_start * Initialize start stack (common for RAM/ROM startup). The stacks are
addi r1, r1, -0x10 /* Set up stack pointer = beginning of text section - 0x10 */ * statically allocated and properly aligned.
/* tag TOS with a NULL pointer (termination mark for stack dump) */ */
li r0, 0 LA r1, _ISR_Stack_area_end
stw r0, 0(r1) subi r1, r1, PPC_DEFAULT_CACHE_LINE_SIZE
li r0, 0
stw r0, 0(r1)
bl __eabi /* Set up EABI and SYSV environment */ bl __eabi /* Set up EABI and SYSV environment */

11
bsps/powerpc/gen83xx/start/start.S
View File

@@ -413,13 +413,16 @@ start_code_in_ram:
/* Read-write small data */ /* Read-write small data */
LA r13, _SDA_BASE_ LA r13, _SDA_BASE_
/* Clear cmdline */ /* Clear cmdline */
li r3, 0 li r3, 0
/* Set start stack pointer */ /*
* Initialize start stack. The stacks are statically allocated and
* properly aligned.
*/
LA r1, _ISR_Stack_area_end LA r1, _ISR_Stack_area_end
stwu r3, -4(r1) subi r1, r1, PPC_DEFAULT_CACHE_LINE_SIZE
stwu r3, -4(r1) stw r3, 0(r1)
/* Call the first C routine */ /* Call the first C routine */
bl SYM (boot_card) bl SYM (boot_card)

1
bsps/powerpc/haleakala/start/linkcmds
View File

@@ -11,6 +11,7 @@
OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc") OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
OUTPUT_ARCH(powerpc) OUTPUT_ARCH(powerpc)
STARTUP(start.o)
ENTRY(download_entry) ENTRY(download_entry)
EXTERN(__vectors) EXTERN(__vectors)

0
bsps/powerpc/haleakala/start/dlentry.S → bsps/powerpc/haleakala/start/start.S
View File

17
bsps/powerpc/mpc8260ads/start/start.S
View File

@@ -30,11 +30,9 @@
*/ */
#include <rtems/asm.h> #include <rtems/asm.h>
#include <libcpu/powerpc-utility.h>
/* /*
* The initial stack is set to run BELOW the code base address.
* (between the vectors and text sections)
*
* The entry veneer has to clear the BSS and copy the read only * The entry veneer has to clear the BSS and copy the read only
* version of the data segment to the correct location. * version of the data segment to the correct location.
*/ */
@@ -134,11 +132,16 @@ text_length:
/* set toc */ /* set toc */
lwz r2, toc_pointer-base_addr(r1) lwz r2, toc_pointer-base_addr(r1)
/* Set up stack pointer = beginning of text section - 56 */ /* Clear cmdline */
addi r1, r1, -56-4 li r3, 0
/* Clear cmdline */ /*
xor r3, r3, r3 * Initialize start stack. The stacks are statically allocated and
* properly aligned.
*/
LA r1, _ISR_Stack_area_end
subi r1, r1, PPC_DEFAULT_CACHE_LINE_SIZE
stw r3, 0(r1)
.extern SYM (boot_card) .extern SYM (boot_card)
bl SYM (boot_card) /* call the first C routine */ bl SYM (boot_card) /* call the first C routine */

19
bsps/powerpc/mvme3100/start/start.S
View File

@@ -12,8 +12,7 @@
*/ */
#include <rtems/asm.h> #include <rtems/asm.h>
#include <rtems/score/cpu.h> #include <libcpu/powerpc-utility.h>
#include <rtems/powerpc/powerpc.h>
#include <bspopts.h> #include <bspopts.h>
@@ -71,15 +70,15 @@ __rtems_entry_point:
mr r6,r28 mr r6,r28
mr r7,r27 mr r7,r27
bl save_boot_params bl save_boot_params
addis r9,r0, (__stack-PPC_MINIMUM_STACK_FRAME_SIZE)@ha
addi r9,r9, (__stack-PPC_MINIMUM_STACK_FRAME_SIZE)@l
/* align down to 16-bytes */
li r5, (CPU_STACK_ALIGNMENT - 1)
andc r1, r9, r5
/* NULL ptr to back chain */ /*
li r0, 0 * Initialize start stack. The stacks are statically allocated and
stw r0, 0(r1) * properly aligned.
*/
LA r1, _ISR_Stack_area_end
subi r1, r1, PPC_DEFAULT_CACHE_LINE_SIZE
li r0, 0
stw r0, 0(r1)
/* /*
* We are now in a environment that is totally independent from * We are now in a environment that is totally independent from

25
bsps/powerpc/mvme5500/start/start.S
View File

@@ -13,8 +13,7 @@
*/ */
#include <rtems/asm.h> #include <rtems/asm.h>
#include <rtems/score/cpu.h> #include <libcpu/powerpc-utility.h>
#include <rtems/powerpc/powerpc.h>
#include <libcpu/io.h> #include <libcpu/io.h>
#include <libcpu/bat.h> #include <libcpu/bat.h>
@@ -134,23 +133,15 @@ enter_C_code:
mr r6,r28 mr r6,r28
mr r7,r27 mr r7,r27
bl save_boot_params bl save_boot_params
/* /*
* stack = &__rtems_end + 4096 * Initialize start stack. The stacks are statically allocated and
* properly aligned.
*/ */
addis r9,r0, __stack-PPC_MINIMUM_STACK_FRAME_SIZE@ha LA r1, _ISR_Stack_area_end
addi r9,r9, __stack-PPC_MINIMUM_STACK_FRAME_SIZE@l subi r1, r1, PPC_DEFAULT_CACHE_LINE_SIZE
/* li r0, 0
* align initial stack stw r0, 0(r1)
* (we hope that the bootloader stack was 16-byte aligned
* or we haven't used altivec yet...)
*/
li r0, (CPU_STACK_ALIGNMENT-1)
andc r1, r9, r0
/*
* NULL ptr to back chain
*/
li r0, 0
stw r0, 0(r1)
/* /*
* We are now in a environment that is totally independent from * We are now in a environment that is totally independent from

3
bsps/powerpc/shared/start/linkcmds.share
View File

@@ -3,7 +3,6 @@ OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc",
OUTPUT_ARCH(powerpc) OUTPUT_ARCH(powerpc)
/* Do we need any of these for elf? /* Do we need any of these for elf?
__DYNAMIC = 0; */ __DYNAMIC = 0; */
PROVIDE (__stack = 0);
MEMORY { MEMORY {
VECTORS : ORIGIN = 0x0 , LENGTH = 0x3000 VECTORS : ORIGIN = 0x0 , LENGTH = 0x3000
CODE : ORIGIN = 0x3000 , LENGTH = 32M - 0x3000 CODE : ORIGIN = 0x3000 , LENGTH = 32M - 0x3000
@@ -247,8 +246,6 @@ SECTIONS
PROVIDE (__bss_end = .); PROVIDE (__bss_end = .);
} > CODE } > CODE
. = ALIGN(16); . = ALIGN(16);
. += 0x1000;
__stack = .;
_end = . ; _end = . ;
__rtems_end = . ; __rtems_end = . ;
PROVIDE (end = .); PROVIDE (end = .);

27
bsps/powerpc/shared/start/start.S
View File

@@ -10,8 +10,7 @@
*/ */
#include <rtems/asm.h> #include <rtems/asm.h>
#include <rtems/score/cpu.h> #include <libcpu/powerpc-utility.h>
#include <rtems/powerpc/powerpc.h>
#include <libcpu/io.h> #include <libcpu/io.h>
#include <libcpu/bat.h> #include <libcpu/bat.h>
@@ -133,24 +132,16 @@ enter_C_code:
mr r6,r28 mr r6,r28
mr r7,r27 mr r7,r27
bl save_boot_params bl save_boot_params
/* /*
* stack = &__rtems_end + 4096 * Initialize start stack. The stacks are statically allocated and
* properly aligned.
*/ */
addis r9,r0, __stack-PPC_MINIMUM_STACK_FRAME_SIZE@ha LA r1, _ISR_Stack_area_end
addi r9,r9, __stack-PPC_MINIMUM_STACK_FRAME_SIZE@l subi r1, r1, PPC_DEFAULT_CACHE_LINE_SIZE
/* li r0, 0
* align initial stack stw r0, 0(r1)
* (we hope that the bootloader stack was 16-byte aligned
* or we haven't used altivec yet...)
*/
li r0, (CPU_STACK_ALIGNMENT-1)
andc r1, r9, r0
/*
* Tag TOS with a NULL (terminator for stack dump)
*/
li r0, 0
stw r0, 0(r1)
/* /*
* We are now in a environment that is totally independent from * We are now in a environment that is totally independent from
* bootloader setup. * bootloader setup.

1
bsps/powerpc/ss555/start/linkcmds
View File

@@ -16,6 +16,7 @@
OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc") OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
OUTPUT_ARCH(powerpc) OUTPUT_ARCH(powerpc)
STARTUP(start.o)
ENTRY(start) ENTRY(start)
EXTERN(_vectors) EXTERN(_vectors)

16
bsps/powerpc/virtex/start/start.S
View File

@@ -47,11 +47,6 @@ virtex_exc_vector_base:
b twiddle b twiddle
.endr .endr
/* Start stack area */
.rept BSP_START_STACK_SIZE / 4
b twiddle
.endr
_start: _start:
/* Reset time base */ /* Reset time base */
@@ -59,10 +54,13 @@ _start:
mtspr TBWU, r0 mtspr TBWU, r0
mtspr TBWL, r0 mtspr TBWL, r0
/* Initialize start stack */ /*
LWI r1, _start * Initialize start stack. The stacks are statically allocated and
stwu r0, -4(r1) * properly aligned.
stwu r0, -4(r1) */
LA r1, _ISR_Stack_area_end
subi r1, r1, PPC_DEFAULT_CACHE_LINE_SIZE
stw r0, 0(r1)
/* Copy fast text */ /* Copy fast text */
LWI r3, bsp_section_fast_text_begin LWI r3, bsp_section_fast_text_begin

1
bsps/powerpc/virtex4/start/linkcmds
View File

@@ -8,6 +8,7 @@
OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc") OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
OUTPUT_ARCH(powerpc) OUTPUT_ARCH(powerpc)
STARTUP(start.o)
ENTRY(download_entry) ENTRY(download_entry)
EXTERN(download_entry) EXTERN(download_entry)
EXTERN(__vectors) EXTERN(__vectors)

1
bsps/powerpc/virtex5/start/linkcmds
View File

@@ -8,6 +8,7 @@
OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc") OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
OUTPUT_ARCH(powerpc) OUTPUT_ARCH(powerpc)
STARTUP(start.o)
ENTRY(download_entry) ENTRY(download_entry)
EXTERN(download_entry) EXTERN(download_entry)
EXTERN(__vectors) EXTERN(__vectors)

9
c/src/lib/libbsp/powerpc/haleakala/Makefile.am
View File

@@ -5,11 +5,13 @@ include $(top_srcdir)/../../bsp.am
dist_project_lib_DATA = ../../../../../../bsps/powerpc/haleakala/start/bsp_specs dist_project_lib_DATA = ../../../../../../bsps/powerpc/haleakala/start/bsp_specs
start.$(OBJEXT): ../../../../../../bsps/powerpc/haleakala/start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $< $(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = rtems_crti.$(OBJEXT) project_lib_DATA += rtems_crti.$(OBJEXT)
project_lib_DATA += linkcmds project_lib_DATA += linkcmds
@@ -26,9 +28,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/haleakala/start/mmu_405.c librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/haleakala/start/mmu_405.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/haleakala/start/mmu_405asm.S librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/haleakala/start/mmu_405asm.S
# dlentry
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/haleakala/start/dlentry.S
# console # console
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/uart.c librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/uart.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/console.c librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/console.c

7
c/src/lib/libbsp/powerpc/ss555/Makefile.am
View File

@@ -5,11 +5,13 @@ include $(top_srcdir)/../../bsp.am
dist_project_lib_DATA = ../../../../../../bsps/powerpc/ss555/start/bsp_specs dist_project_lib_DATA = ../../../../../../bsps/powerpc/ss555/start/bsp_specs
start.$(OBJEXT): ../../../../../../bsps/powerpc/ss555/start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $< $(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = rtems_crti.$(OBJEXT) project_lib_DATA += rtems_crti.$(OBJEXT)
project_lib_DATA += linkcmds project_lib_DATA += linkcmds
@@ -26,7 +28,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/bspstart.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/iss555.c librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/iss555.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/start.S
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
# tm27supp # tm27supp

6
c/src/lib/libbsp/powerpc/virtex/configure.ac
View File

@@ -10,12 +10,6 @@ RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
RTEMS_BSP_CONFIGURE RTEMS_BSP_CONFIGURE
RTEMS_BSPOPTS_SET([BSP_START_STACK_SIZE],[*],[4096])
RTEMS_BSPOPTS_HELP([BSP_START_STACK_SIZE],[size of low-level start stack])
RTEMS_BSPOPTS_SET([RTEMS_XPARAMETERS_H],[*],[\<xparameters_dflt.h\>]) RTEMS_BSPOPTS_SET([RTEMS_XPARAMETERS_H],[*],[\<xparameters_dflt.h\>])
RTEMS_BSPOPTS_HELP([RTEMS_XPARAMETERS_H], RTEMS_BSPOPTS_HELP([RTEMS_XPARAMETERS_H],
[This defines the location of the hardware specific "xparameters.h" file. [This defines the location of the hardware specific "xparameters.h" file.

7
c/src/lib/libbsp/powerpc/virtex4/Makefile.am
View File

@@ -9,9 +9,14 @@ dist_project_lib_DATA = ../../../../../../bsps/powerpc/virtex4/start/bsp_specs
# include # include
# start # start
start.$(OBJEXT): ../../../../../../bsps/powerpc/virtex4/start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $< $(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = rtems_crti.$(OBJEXT) project_lib_DATA += rtems_crti.$(OBJEXT)
project_lib_DATA += linkcmds project_lib_DATA += linkcmds

7
c/src/lib/libbsp/powerpc/virtex5/Makefile.am
View File

@@ -8,9 +8,14 @@ dist_project_lib_DATA = ../../../../../../bsps/powerpc/virtex5/start/bsp_specs
# include # include
# start # start
start.$(OBJEXT): ../../../../../../bsps/powerpc/virtex5/start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $< $(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = rtems_crti.$(OBJEXT) project_lib_DATA += rtems_crti.$(OBJEXT)
project_lib_DATA += linkcmds project_lib_DATA += linkcmds