Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

firmware: Don't depend on PLAT_HART_COUNT and PLAT_HART_STACK_SIZE

Browse Source 
The hart_count and hart_stack_size information is already available
in "struct sbi_platform" so we use that instead of depending on
PLAT_HART_COUNT and PLAT_HART_STACK_SIZE.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
This commit is contained in:
Anup Patel
2018-12-22 12:40:54 +05:30
committed by Anup Patel
parent 1cf7ec9e3b
commit 58ca525a7d
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/fw_common.S
View File

@@ -132,8 +132,9 @@ _start_warm:
* s8 -> HART Stack Size * s8 -> HART Stack Size
*/ */
csrr s6, mhartid csrr s6, mhartid
li s7, PLAT_HART_COUNT la a4, platform
li s8, PLAT_HART_STACK_SIZE lwu s7, RISCV_PLATFORM_HART_COUNT_OFFSET(a4)
lwu s8, RISCV_PLATFORM_HART_STACK_SIZE_OFFSET(a4)
/* HART ID should be within expected limit */ /* HART ID should be within expected limit */
csrr s6, mhartid csrr s6, mhartid
@@ -202,8 +203,9 @@ _hartid_to_scratch:
* s1 -> HART Stack End * s1 -> HART Stack End
* s2 -> Temporary * s2 -> Temporary
*/ */
li s0, PLAT_HART_STACK_SIZE la s2, platform
li s2, PLAT_HART_COUNT lwu s0, RISCV_PLATFORM_HART_STACK_SIZE_OFFSET(s2)
lwu s2, RISCV_PLATFORM_HART_COUNT_OFFSET(s2)
mul s2, s2, s0 mul s2, s2, s0
la s1, _fw_end la s1, _fw_end
add s1, s1, s2 add s1, s1, s2

5
include/sbi/riscv_asm.h
View File

@@ -81,6 +81,11 @@
#define RISCV_SCRATCH_IPI_TYPE_OFFSET (9 * __SIZEOF_POINTER__) #define RISCV_SCRATCH_IPI_TYPE_OFFSET (9 * __SIZEOF_POINTER__)
#define RISCV_SCRATCH_SIZE 256 #define RISCV_SCRATCH_SIZE 256
#define RISCV_PLATFORM_NAME_OFFSET (0x0)
#define RISCV_PLATFORM_FEATURES_OFFSET (0x40)
#define RISCV_PLATFORM_HART_COUNT_OFFSET (0x48)
#define RISCV_PLATFORM_HART_STACK_SIZE_OFFSET (0x4c)
#define RISCV_TRAP_REGS_zero 0 #define RISCV_TRAP_REGS_zero 0
#define RISCV_TRAP_REGS_ra 1 #define RISCV_TRAP_REGS_ra 1
#define RISCV_TRAP_REGS_sp 2 #define RISCV_TRAP_REGS_sp 2