Virtualization
/
opensbi
mirror of https://gitlab.com/qemu-project/opensbi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <apatel@ventanamicro.com>
This commit is contained in:
Anup Patel 2023-03-20 18:52:02 +05:30 committed by Anup Patel
parent 73ab11dfb0
commit f64dfcd2b5
2 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sbi/sbi_init.h
View File

@ -16,6 +16,8 @@ struct sbi_scratch;
void __noreturn sbi_init(struct sbi_scratch *scratch); void __noreturn sbi_init(struct sbi_scratch *scratch);
unsigned long sbi_entry_count(u32 hartid);
unsigned long sbi_init_count(u32 hartid); unsigned long sbi_init_count(u32 hartid);
void __noreturn sbi_exit(struct sbi_scratch *scratch); void __noreturn sbi_exit(struct sbi_scratch *scratch);

42
lib/sbi/sbi_init.c
View File

@ -238,12 +238,13 @@ static void wake_coldboot_harts(struct sbi_scratch *scratch, u32 hartid)
spin_unlock(&coldboot_lock); spin_unlock(&coldboot_lock);
} }
static unsigned long entry_count_offset;
static unsigned long init_count_offset; static unsigned long init_count_offset;
static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid) static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid)
{ {
int rc; int rc;
unsigned long *init_count; unsigned long *count;
const struct sbi_platform *plat = sbi_platform_ptr(scratch); const struct sbi_platform *plat = sbi_platform_ptr(scratch);
/* Note: This has to be first thing in coldboot init sequence */ /* 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) if (rc)
sbi_hart_hang(); 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__); init_count_offset = sbi_scratch_alloc_offset(__SIZEOF_POINTER__);
if (!init_count_offset) if (!init_count_offset)
sbi_hart_hang(); sbi_hart_hang();
count = sbi_scratch_offset_ptr(scratch, entry_count_offset);
(*count)++;
rc = sbi_hsm_init(scratch, hartid, true); rc = sbi_hsm_init(scratch, hartid, true);
if (rc) if (rc)
sbi_hart_hang(); sbi_hart_hang();
@ -352,8 +360,8 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid)
wake_coldboot_harts(scratch, hartid); wake_coldboot_harts(scratch, hartid);
init_count = sbi_scratch_offset_ptr(scratch, init_count_offset); count = sbi_scratch_offset_ptr(scratch, init_count_offset);
(*init_count)++; (*count)++;
sbi_hsm_hart_start_finish(scratch, hartid); sbi_hsm_hart_start_finish(scratch, hartid);
} }
@ -362,12 +370,15 @@ static void __noreturn init_warm_startup(struct sbi_scratch *scratch,
u32 hartid) u32 hartid)
{ {
int rc; int rc;
unsigned long *init_count; unsigned long *count;
const struct sbi_platform *plat = sbi_platform_ptr(scratch); const struct sbi_platform *plat = sbi_platform_ptr(scratch);
if (!init_count_offset) if (!entry_count_offset || !init_count_offset)
sbi_hart_hang(); sbi_hart_hang();
count = sbi_scratch_offset_ptr(scratch, entry_count_offset);
(*count)++;
rc = sbi_hsm_init(scratch, hartid, false); rc = sbi_hsm_init(scratch, hartid, false);
if (rc) if (rc)
sbi_hart_hang(); sbi_hart_hang();
@ -408,8 +419,8 @@ static void __noreturn init_warm_startup(struct sbi_scratch *scratch,
if (rc) if (rc)
sbi_hart_hang(); sbi_hart_hang();
init_count = sbi_scratch_offset_ptr(scratch, init_count_offset); count = sbi_scratch_offset_ptr(scratch, init_count_offset);
(*init_count)++; (*count)++;
sbi_hsm_hart_start_finish(scratch, hartid); sbi_hsm_hart_start_finish(scratch, hartid);
} }
@ -521,6 +532,23 @@ void __noreturn sbi_init(struct sbi_scratch *scratch)
init_warmboot(scratch, hartid); 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) unsigned long sbi_init_count(u32 hartid)
{ {
struct sbi_scratch *scratch; struct sbi_scratch *scratch;