sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mpfs: Remove the ddrstorage section from the OpenSBI package

Browse Source 
It is not really needed; g_hart_stacks is only used during SBI init as
a temporary stack area. We can use the scratch area buffers for this, as
the scratch areas define almost 4K of extra space, which is used for
exception stacks anyway.
This commit is contained in:
Ville Juven 2022-08-09 14:29:24 +03:00 committed by Petro Karashchenko
parent 838690fc9f
commit b8b541fbf5
4 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/risc-v/src/mpfs/mpfs_opensbi.c
View File

@ -59,14 +59,6 @@
#define MPFS_PMP_DEFAULT_ADDR 0xfffffffff #define MPFS_PMP_DEFAULT_ADDR 0xfffffffff
#define MPFS_PMP_DEFAULT_PERM 0x000000009f #define MPFS_PMP_DEFAULT_PERM 0x000000009f
/* The following define is not accessible with assember. Make sure it's in
* sync with the assembler usage in mpfs_opensbi_utils.S.
*/
#if SBI_PLATFORM_DEFAULT_HART_STACK_SIZE != 8192
# error "Fix define in file mpfs_opensbi_utils.S"
#endif
#define MPFS_SYSREG_SOFT_RESET_CR (MPFS_SYSREG_BASE + \ #define MPFS_SYSREG_SOFT_RESET_CR (MPFS_SYSREG_BASE + \
MPFS_SYSREG_SOFT_RESET_CR_OFFSET) MPFS_SYSREG_SOFT_RESET_CR_OFFSET)
#define MPFS_SYSREG_SUBBLK_CLOCK_CR (MPFS_SYSREG_BASE + \ #define MPFS_SYSREG_SUBBLK_CLOCK_CR (MPFS_SYSREG_BASE + \
@ -232,15 +224,9 @@ static const struct sbi_platform platform =
/* This must go into l2_scratchpad region, starting at 0x0a000000. */ /* This must go into l2_scratchpad region, starting at 0x0a000000. */
static sbi_scratch_holder_t g_scratches[MPFS_MAX_NUM_HARTS] \ sbi_scratch_holder_t g_scratches[MPFS_MAX_NUM_HARTS] \
__attribute__((section(".l2_scratchpad"))); __attribute__((section(".l2_scratchpad")));
/* These stacks are used in the mpfs_opensbi_utils.S */
uint8_t g_hart_stacks[SBI_PLATFORM_DEFAULT_HART_STACK_SIZE * \
MPFS_HART_COUNT] \
__attribute__((section(".ddrstorage"), aligned(16)));
static const uint64_t sbi_entrypoints[] = static const uint64_t sbi_entrypoints[] =
{ {
CONFIG_MPFS_HART0_ENTRYPOINT, CONFIG_MPFS_HART0_ENTRYPOINT,

11
arch/risc-v/src/mpfs/mpfs_opensbi_utils.S
View File

@ -46,10 +46,6 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#ifndef SBI_PLATFORM_DEFAULT_HART_STACK_SIZE
#define SBI_PLATFORM_DEFAULT_HART_STACK_SIZE 8192
#endif
/**************************************************************************** /****************************************************************************
* Public Symbols * Public Symbols
****************************************************************************/ ****************************************************************************/
@ -100,13 +96,14 @@ mpfs_opensbi_prepare_hart:
la t0, mpfs_global_pointer la t0, mpfs_global_pointer
ld gp, 0(t0) ld gp, 0(t0)
/* Setup stacks per hart */ /* Setup stacks per hart, the stack top is the end of the hart's scratch */
csrr a0, mhartid csrr a0, mhartid
li t1, SBI_PLATFORM_DEFAULT_HART_STACK_SIZE li t1, SBI_SCRATCH_SIZE
mul t0, a0, t1 mul t0, a0, t1
la sp, g_hart_stacks la sp, g_scratches
add sp, sp, t0 add sp, sp, t0
add sp, sp, t1
jal mpfs_opensbi_setup jal mpfs_opensbi_setup
/**************************************************************************** /****************************************************************************

5
boards/risc-v/mpfs/icicle/scripts/ld-envm-opensbi.script
View File

@ -20,7 +20,6 @@
MEMORY MEMORY
{ {
ddr (rx) : ORIGIN = 0x80000000, LENGTH = 4M /* w/ cache */
envm (rx) : ORIGIN = 0x20220100, LENGTH = 128K - 256 /* 256 reserved for hss headers */ envm (rx) : ORIGIN = 0x20220100, LENGTH = 128K - 256 /* 256 reserved for hss headers */
l2lim (rwx) : ORIGIN = 0x08000000, LENGTH = 1024k l2lim (rwx) : ORIGIN = 0x08000000, LENGTH = 1024k
l2zerodevice (rwx) : ORIGIN = 0x0A000000, LENGTH = 512k l2zerodevice (rwx) : ORIGIN = 0x0A000000, LENGTH = 512k
@ -39,10 +38,6 @@ SECTIONS
riscv_asm* riscv_asm*
} > ddr } > ddr
.ddrstorage : {
*(.ddrstorage)
} > ddr
.l2_scratchpad : ALIGN(0x10) .l2_scratchpad : ALIGN(0x10)
{ {
__l2_scratchpad_load = LOADADDR(.l2_scratchpad); __l2_scratchpad_load = LOADADDR(.l2_scratchpad);

4
tools/mpfs/Config.mk
View File

@ -27,11 +27,11 @@
ifeq ($(CONFIG_MPFS_OPENSBI),y) ifeq ($(CONFIG_MPFS_OPENSBI),y)
define POSTBUILD define POSTBUILD
$(Q) echo "SBI: Creating nuttx.sbi file" $(Q) echo "SBI: Creating nuttx.sbi file"
$(Q) $(OBJCOPY) -O binary -j .text.sbi -j .ddrstorage $(BIN) nuttx.sbi $(Q) $(OBJCOPY) -O binary -j .text.sbi $(BIN) nuttx.sbi
$(Q) ([ $$? -eq 0 ] && echo "Done.") $(Q) ([ $$? -eq 0 ] && echo "Done.")
$(Q) echo nuttx.sbi >> nuttx.manifest $(Q) echo nuttx.sbi >> nuttx.manifest
$(Q) echo "SBI: Removing unnecessary sections from nuttx binary" $(Q) echo "SBI: Removing unnecessary sections from nuttx binary"
$(Q) $(OBJCOPY) -O binary -R .text.sbi -R .l2_scratchpad -R .ddrstorage $(BIN) nuttx.bin $(Q) $(OBJCOPY) -O binary -R .text.sbi -R .l2_scratchpad $(BIN) nuttx.bin
$(Q) ([ $$? -eq 0 ] && echo "Done.") $(Q) ([ $$? -eq 0 ] && echo "Done.")
endef endef
endif endif