From a67fd68cbf02af84af9e6e7f8e28aadcecc94910 Mon Sep 17 00:00:00 2001
From: Anup Patel <anup.patel@wdc.com>
Date: Fri, 3 Jan 2020 15:13:33 +0530
Subject: lib: Add sbi_init_count() API
We add sbi_init_count() API which provides number of times a
given HART completed init sequence (warmboot/coldboot).
This will be very useful in debugging. With upcoming SBI HSM
extension, it will also help in implementing one-time init
code for each HART.
Signed-off-by: Anup Patel <anup@brainfault.org>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
---
include/sbi/sbi_init.h | 2 ++
lib/sbi/sbi_init.c | 33 +++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/include/sbi/sbi_init.h b/include/sbi/sbi_init.h
index c976276..74eb1c0 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_init_count(u32 hartid);
+
void __noreturn sbi_exit(struct sbi_scratch *scratch);
#endif
diff --git a/lib/sbi/sbi_init.c b/lib/sbi/sbi_init.c
index 3753800..4afeed2 100644
--- a/lib/sbi/sbi_init.c
+++ b/lib/sbi/sbi_init.c
@@ -70,11 +70,19 @@ static void sbi_boot_prints(struct sbi_scratch *scratch, u32 hartid)
sbi_hart_pmp_dump(scratch);
}
+static unsigned long init_count_offset;
+
static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid)
{
int rc;
+ unsigned long *init_count;
const struct sbi_platform *plat = sbi_platform_ptr(scratch);
+ init_count_offset = sbi_scratch_alloc_offset(__SIZEOF_POINTER__,
+ "INIT_COUNT");
+ if (!init_count_offset)
+ sbi_hart_hang();
+
rc = sbi_system_early_init(scratch, TRUE);
if (rc)
sbi_hart_hang();
@@ -110,6 +118,9 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid)
sbi_hart_mark_available(hartid);
+ init_count = sbi_scratch_offset_ptr(scratch, init_count_offset);
+ (*init_count)++;
+
sbi_hart_switch_mode(hartid, scratch->next_arg1, scratch->next_addr,
scratch->next_mode, FALSE);
}
@@ -117,10 +128,14 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid)
static void __noreturn init_warmboot(struct sbi_scratch *scratch, u32 hartid)
{
int rc;
+ unsigned long *init_count;
const struct sbi_platform *plat = sbi_platform_ptr(scratch);
sbi_hart_wait_for_coldboot(scratch, hartid);
+ if (!init_count_offset)
+ sbi_hart_hang();
+
rc = sbi_system_early_init(scratch, FALSE);
if (rc)
sbi_hart_hang();
@@ -147,6 +162,9 @@ static void __noreturn init_warmboot(struct sbi_scratch *scratch, u32 hartid)
sbi_hart_mark_available(hartid);
+ init_count = sbi_scratch_offset_ptr(scratch, init_count_offset);
+ (*init_count)++;
+
sbi_hart_switch_mode(hartid, scratch->next_arg1,
scratch->next_addr,
scratch->next_mode, FALSE);
@@ -184,6 +202,21 @@ void __noreturn sbi_init(struct sbi_scratch *scratch)
init_warmboot(scratch, hartid);
}
+unsigned long sbi_init_count(u32 hartid)
+{
+ struct sbi_scratch *scratch;
+ unsigned long *init_count;
+
+ if (sbi_platform_hart_count(sbi_platform_thishart_ptr()) <= hartid ||
+ !init_count_offset)
+ return 0;
+
+ scratch = sbi_hart_id_to_scratch(sbi_scratch_thishart_ptr(), hartid);
+ init_count = sbi_scratch_offset_ptr(scratch, init_count_offset);
+
+ return *init_count;
+}
+
/**
* Exit OpenSBI library for current HART and stop HART
*
--
cgit v1.2.3