diff options
| author | Anup Patel <[email protected]> | 2023-03-20 18:52:02 +0530 |
|---|---|---|
| committer | Anup Patel <[email protected]> | 2023-04-06 18:48:15 +0530 |
| commit | f64dfcd2b5e78e9eea3fe3fee58e0632b5f81b99 (patch) | |
| tree | cde9d6b14ce163b1cbee07f72802ac5ff37681de | |
| parent | 73ab11dfb0bfaa2f7792cf10804c04c157dc2291 (diff) | |
lib: sbi: Introduce sbi_entry_count() function
We introduce sbi_entry_count() function which counts the number
of times a HART enters OpenSBI via cold-boot or warm-boot path.
Signed-off-by: Anup Patel <[email protected]>
| -rw-r--r-- | include/sbi/sbi_init.h | 2 | ||||
| -rw-r--r-- | lib/sbi/sbi_init.c | 42 |
2 files changed, 37 insertions, 7 deletions
diff --git a/include/sbi/sbi_init.h b/include/sbi/sbi_init.h index 74eb1c07..9640fee9 100644 --- a/include/sbi/sbi_init.h +++ b/include/sbi/sbi_init.h @@ -16,6 +16,8 @@ struct sbi_scratch; void __noreturn sbi_init(struct sbi_scratch *scratch); +unsigned long sbi_entry_count(u32 hartid); + unsigned long sbi_init_count(u32 hartid); void __noreturn sbi_exit(struct sbi_scratch *scratch); diff --git a/lib/sbi/sbi_init.c b/lib/sbi/sbi_init.c index ffa214ca..f184248d 100644 --- a/lib/sbi/sbi_init.c +++ b/lib/sbi/sbi_init.c @@ -238,12 +238,13 @@ static void wake_coldboot_harts(struct sbi_scratch *scratch, u32 hartid) spin_unlock(&coldboot_lock); } +static unsigned long entry_count_offset; static unsigned long init_count_offset; static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid) { int rc; - unsigned long *init_count; + unsigned long *count; const struct sbi_platform *plat = sbi_platform_ptr(scratch); /* Note: This has to be first thing in coldboot init sequence */ @@ -256,10 +257,17 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid) if (rc) sbi_hart_hang(); + entry_count_offset = sbi_scratch_alloc_offset(__SIZEOF_POINTER__); + if (!entry_count_offset) + sbi_hart_hang(); + init_count_offset = sbi_scratch_alloc_offset(__SIZEOF_POINTER__); if (!init_count_offset) sbi_hart_hang(); + count = sbi_scratch_offset_ptr(scratch, entry_count_offset); + (*count)++; + rc = sbi_hsm_init(scratch, hartid, true); if (rc) sbi_hart_hang(); @@ -352,8 +360,8 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid) wake_coldboot_harts(scratch, hartid); - init_count = sbi_scratch_offset_ptr(scratch, init_count_offset); - (*init_count)++; + count = sbi_scratch_offset_ptr(scratch, init_count_offset); + (*count)++; sbi_hsm_hart_start_finish(scratch, hartid); } @@ -362,12 +370,15 @@ static void __noreturn init_warm_startup(struct sbi_scratch *scratch, u32 hartid) { int rc; - unsigned long *init_count; + unsigned long *count; const struct sbi_platform *plat = sbi_platform_ptr(scratch); - if (!init_count_offset) + if (!entry_count_offset || !init_count_offset) sbi_hart_hang(); + count = sbi_scratch_offset_ptr(scratch, entry_count_offset); + (*count)++; + rc = sbi_hsm_init(scratch, hartid, false); if (rc) sbi_hart_hang(); @@ -408,8 +419,8 @@ static void __noreturn init_warm_startup(struct sbi_scratch *scratch, if (rc) sbi_hart_hang(); - init_count = sbi_scratch_offset_ptr(scratch, init_count_offset); - (*init_count)++; + count = sbi_scratch_offset_ptr(scratch, init_count_offset); + (*count)++; sbi_hsm_hart_start_finish(scratch, hartid); } @@ -521,6 +532,23 @@ void __noreturn sbi_init(struct sbi_scratch *scratch) init_warmboot(scratch, hartid); } +unsigned long sbi_entry_count(u32 hartid) +{ + struct sbi_scratch *scratch; + unsigned long *entry_count; + + if (!entry_count_offset) + return 0; + + scratch = sbi_hartid_to_scratch(hartid); + if (!scratch) + return 0; + + entry_count = sbi_scratch_offset_ptr(scratch, entry_count_offset); + + return *entry_count; +} + unsigned long sbi_init_count(u32 hartid) { struct sbi_scratch *scratch; |