diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sbi/sbi_init.c | 5 | ||||
| -rw-r--r-- | lib/sbi/sbi_scratch.c | 17 |
2 files changed, 22 insertions, 0 deletions
diff --git a/lib/sbi/sbi_init.c b/lib/sbi/sbi_init.c index 11882d61..113987cf 100644 --- a/lib/sbi/sbi_init.c +++ b/lib/sbi/sbi_init.c @@ -146,6 +146,11 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid) unsigned long *init_count; const struct sbi_platform *plat = sbi_platform_ptr(scratch); + /* Note: This has to be first thing in coldboot init sequence */ + rc = sbi_scratch_init(scratch); + if (rc) + sbi_hart_hang(); + init_count_offset = sbi_scratch_alloc_offset(__SIZEOF_POINTER__, "INIT_COUNT"); if (!init_count_offset) diff --git a/lib/sbi/sbi_scratch.c b/lib/sbi/sbi_scratch.c index 26716c50..68c5853f 100644 --- a/lib/sbi/sbi_scratch.c +++ b/lib/sbi/sbi_scratch.c @@ -9,13 +9,30 @@ #include <sbi/riscv_locks.h> #include <sbi/sbi_hart.h> +#include <sbi/sbi_hartmask.h> #include <sbi/sbi_platform.h> #include <sbi/sbi_scratch.h> #include <sbi/sbi_string.h> +struct sbi_scratch *hartid_to_scratch_table[SBI_HARTMASK_MAX_BITS] = { 0 }; + static spinlock_t extra_lock = SPIN_LOCK_INITIALIZER; static unsigned long extra_offset = SBI_SCRATCH_EXTRA_SPACE_OFFSET; +typedef struct sbi_scratch *(*hartid2scratch)(ulong hartid); + +int sbi_scratch_init(struct sbi_scratch *scratch) +{ + u32 i; + const struct sbi_platform *plat = sbi_platform_ptr(scratch); + + for (i = 0; i < sbi_platform_hart_count(plat); i++) + hartid_to_scratch_table[i] = + ((hartid2scratch)scratch->hartid_to_scratch)(i); + + return 0; +} + unsigned long sbi_scratch_alloc_offset(unsigned long size, const char *owner) { u32 i; |