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

include: Move RISCV_PLATFORM_xyz defines to sbi_platform.h

Browse Source 
The struct sbi_platform related defines RISCV_PLATFORM_xyz should
be in sbi_platform.h so that we can keep these defines in-sync
with changes in struct sbi_platform.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
This commit is contained in:
Anup Patel
2018-12-31 11:30:55 +05:30
committed by Anup Patel
parent e0d6914b3c
commit 5ed3cf3707
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
firmware/fw_base.S
View File

@@ -9,6 +9,7 @@
#include <sbi/riscv_asm.h>
#include <sbi/riscv_encoding.h>
#include <sbi/sbi_platform.h>
#include <sbi/sbi_scratch.h>
.align 3
@@ -134,8 +135,8 @@ _start_warm:
*/
csrr s6, mhartid
la a4, platform
lwu s7, RISCV_PLATFORM_HART_COUNT_OFFSET(a4)
lwu s8, RISCV_PLATFORM_HART_STACK_SIZE_OFFSET(a4)
lwu s7, SBI_PLATFORM_HART_COUNT_OFFSET(a4)
lwu s8, SBI_PLATFORM_HART_STACK_SIZE_OFFSET(a4)
/* HART ID should be within expected limit */
csrr s6, mhartid
@@ -205,8 +206,8 @@ _hartid_to_scratch:
* s2 -> Temporary
*/
la s2, platform
lwu s0, RISCV_PLATFORM_HART_STACK_SIZE_OFFSET(s2)
lwu s2, RISCV_PLATFORM_HART_COUNT_OFFSET(s2)
lwu s0, SBI_PLATFORM_HART_STACK_SIZE_OFFSET(s2)
lwu s2, SBI_PLATFORM_HART_COUNT_OFFSET(s2)
mul s2, s2, s0
la s1, _fw_end
add s1, s1, s2

5
include/sbi/riscv_asm.h
View File

@@ -69,11 +69,6 @@
#error "Unexpected __SIZEOF_SHORT__"
#endif
#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_ra 1
#define RISCV_TRAP_REGS_sp 2

9
include/sbi/sbi_platform.h
View File

@@ -10,6 +10,13 @@
#ifndef __SBI_PLATFORM_H__
#define __SBI_PLATFORM_H__
#define SBI_PLATFORM_NAME_OFFSET (0x0)
#define SBI_PLATFORM_FEATURES_OFFSET (0x40)
#define SBI_PLATFORM_HART_COUNT_OFFSET (0x48)
#define SBI_PLATFORM_HART_STACK_SIZE_OFFSET (0x4c)
#ifndef __ASSEMBLY__
#include <sbi/sbi_scratch.h>
enum sbi_platform_features {
@@ -240,3 +247,5 @@ static inline int sbi_platform_system_shutdown(struct sbi_platform *plat,
}
#endif
#endif