Mirrors/opensbi
3
0
Fork 1
mirror of https://github.com/riscv-software-src/opensbi.git synced 2026-05-23 14:21:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

include: sbi_scratch: Add tmp1 scratch space for RNMI context saving

Browse Source 
RNMI handlers use MNSCRATCH instead of MSCRATCH and need separate scratch
space from regular trap handling. Add tmp1 for RNMI context while tmp0
remains for regular traps.

Signed-off-by: Evgeny Voevodin <evvoevod@tenstorrent.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/0a5d241fa1db03e71a3f56be24708cbbc8037e28.1778176768.git.evvoevod@tenstorrent.com
Signed-off-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Evgeny Voevodin
2026-05-07 18:08:02 +00:00
committed by Anup Patel
parent 2257e99571
commit 5d248a0132
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/fw_base.S
+2 -1
View File
@@ -258,9 +258,10 @@ _scratch_init:
/* Store hartid-to-scratch function address in scratch space */ /* Store hartid-to-scratch function address in scratch space */
lla a4, _hartid_to_scratch lla a4, _hartid_to_scratch
REG_S a4, SBI_SCRATCH_HARTID_TO_SCRATCH_OFFSET(tp) REG_S a4, SBI_SCRATCH_HARTID_TO_SCRATCH_OFFSET(tp)
/* Clear trap_context and tmp0 in scratch space */ /* Clear trap_context, tmp0 and tmp1 in scratch space */
REG_S zero, SBI_SCRATCH_TRAP_CONTEXT_OFFSET(tp) REG_S zero, SBI_SCRATCH_TRAP_CONTEXT_OFFSET(tp)
REG_S zero, SBI_SCRATCH_TMP0_OFFSET(tp) REG_S zero, SBI_SCRATCH_TMP0_OFFSET(tp)
REG_S zero, SBI_SCRATCH_TMP1_OFFSET(tp)
/* Store firmware options in scratch space */ /* Store firmware options in scratch space */
MOV_3R s0, a0, s1, a1, s2, a2 MOV_3R s0, a0, s1, a1, s2, a2
#ifdef FW_OPTIONS #ifdef FW_OPTIONS
include/sbi/sbi_scratch.h
+8 -3
View File
@@ -40,12 +40,14 @@
#define SBI_SCRATCH_TRAP_CONTEXT_OFFSET (11 * __SIZEOF_POINTER__) #define SBI_SCRATCH_TRAP_CONTEXT_OFFSET (11 * __SIZEOF_POINTER__)
/** Offset of tmp0 member in sbi_scratch */ /** Offset of tmp0 member in sbi_scratch */
#define SBI_SCRATCH_TMP0_OFFSET (12 * __SIZEOF_POINTER__) #define SBI_SCRATCH_TMP0_OFFSET (12 * __SIZEOF_POINTER__)
/** Offset of tmp1 member in sbi_scratch */
#define SBI_SCRATCH_TMP1_OFFSET (13 * __SIZEOF_POINTER__)
/** Offset of options member in sbi_scratch */ /** Offset of options member in sbi_scratch */
#define SBI_SCRATCH_OPTIONS_OFFSET (13 * __SIZEOF_POINTER__) #define SBI_SCRATCH_OPTIONS_OFFSET (14 * __SIZEOF_POINTER__)
/** Offset of hartindex member in sbi_scratch */ /** Offset of hartindex member in sbi_scratch */
#define SBI_SCRATCH_HARTINDEX_OFFSET (14 * __SIZEOF_POINTER__) #define SBI_SCRATCH_HARTINDEX_OFFSET (15 * __SIZEOF_POINTER__)
/** Offset of extra space in sbi_scratch */ /** Offset of extra space in sbi_scratch */
#define SBI_SCRATCH_EXTRA_SPACE_OFFSET (15 * __SIZEOF_POINTER__) #define SBI_SCRATCH_EXTRA_SPACE_OFFSET (16 * __SIZEOF_POINTER__)
/** Maximum size of sbi_scratch (4KB) */ /** Maximum size of sbi_scratch (4KB) */
#define SBI_SCRATCH_SIZE (0x1000) #define SBI_SCRATCH_SIZE (0x1000)
@@ -83,6 +85,8 @@ struct sbi_scratch {
unsigned long trap_context; unsigned long trap_context;
/** Temporary storage */ /** Temporary storage */
unsigned long tmp0; unsigned long tmp0;
/** Temporary storage */
unsigned long tmp1;
/** Options for OpenSBI library */ /** Options for OpenSBI library */
unsigned long options; unsigned long options;
/** Index of the hart */ /** Index of the hart */
@@ -106,6 +110,7 @@ assert_member_offset(struct sbi_scratch, platform_addr, SBI_SCRATCH_PLATFORM_ADD
assert_member_offset(struct sbi_scratch, hartid_to_scratch, SBI_SCRATCH_HARTID_TO_SCRATCH_OFFSET); assert_member_offset(struct sbi_scratch, hartid_to_scratch, SBI_SCRATCH_HARTID_TO_SCRATCH_OFFSET);
assert_member_offset(struct sbi_scratch, trap_context, SBI_SCRATCH_TRAP_CONTEXT_OFFSET); assert_member_offset(struct sbi_scratch, trap_context, SBI_SCRATCH_TRAP_CONTEXT_OFFSET);
assert_member_offset(struct sbi_scratch, tmp0, SBI_SCRATCH_TMP0_OFFSET); assert_member_offset(struct sbi_scratch, tmp0, SBI_SCRATCH_TMP0_OFFSET);
assert_member_offset(struct sbi_scratch, tmp1, SBI_SCRATCH_TMP1_OFFSET);
assert_member_offset(struct sbi_scratch, options, SBI_SCRATCH_OPTIONS_OFFSET); assert_member_offset(struct sbi_scratch, options, SBI_SCRATCH_OPTIONS_OFFSET);
assert_member_offset(struct sbi_scratch, hartindex, SBI_SCRATCH_HARTINDEX_OFFSET); assert_member_offset(struct sbi_scratch, hartindex, SBI_SCRATCH_HARTINDEX_OFFSET);