Mirrors/opensbi
1
0
Fork 1
mirror of https://github.com/riscv-software-src/opensbi.git synced 2025-08-24 23:41:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

lib: sbi: Allow specifying start mode to sbi_hsm_hart_start() API

Browse Source 
The sbi_scratch already has provision to specify the next stage mode
so we can leverage this to specify start mode to sbi_hsm_hart_start().

In future, this will be useful in providing SBI calls to U-mode on
embedded cores where we M-mode and U-mode but no S-mode.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
This commit is contained in:
Anup Patel
2020-09-07 11:11:29 +05:30
committed by Anup Patel
parent c1c7c3ee9e
commit 6734304f8c
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/sbi/sbi_hsm.h
View File

@@ -25,7 +25,7 @@ int sbi_hsm_init(struct sbi_scratch *scratch, u32 hartid, bool cold_boot);
void __noreturn sbi_hsm_exit(struct sbi_scratch *scratch); void __noreturn sbi_hsm_exit(struct sbi_scratch *scratch);
int sbi_hsm_hart_start(struct sbi_scratch *scratch, u32 hartid, int sbi_hsm_hart_start(struct sbi_scratch *scratch, u32 hartid,
ulong saddr, ulong priv); ulong saddr, ulong smode, ulong priv);
int sbi_hsm_hart_stop(struct sbi_scratch *scratch, bool exitnow); int sbi_hsm_hart_stop(struct sbi_scratch *scratch, bool exitnow);
int sbi_hsm_hart_get_state(u32 hartid); int sbi_hsm_hart_get_state(u32 hartid);
int sbi_hsm_hart_state_to_status(int state); int sbi_hsm_hart_state_to_status(int state);

6
lib/sbi/sbi_ecall_hsm.c
View File

@@ -19,12 +19,16 @@ static int sbi_ecall_hsm_handler(unsigned long extid, unsigned long funcid,
unsigned long *args, unsigned long *out_val, unsigned long *args, unsigned long *out_val,
struct sbi_trap_info *out_trap) struct sbi_trap_info *out_trap)
{ {
ulong smode;
int ret = 0, hstate; int ret = 0, hstate;
struct sbi_scratch *scratch = sbi_scratch_thishart_ptr(); struct sbi_scratch *scratch = sbi_scratch_thishart_ptr();
switch (funcid) { switch (funcid) {
case SBI_EXT_HSM_HART_START: case SBI_EXT_HSM_HART_START:
ret = sbi_hsm_hart_start(scratch, args[0], args[1], args[2]); smode = csr_read(CSR_MSTATUS);
smode = (smode & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT;
ret = sbi_hsm_hart_start(scratch, args[0], args[1],
smode, args[2]);
break; break;
case SBI_EXT_HSM_HART_STOP: case SBI_EXT_HSM_HART_STOP:
ret = sbi_hsm_hart_stop(scratch, TRUE); ret = sbi_hsm_hart_stop(scratch, TRUE);

6
lib/sbi/sbi_hsm.c
View File

@@ -203,7 +203,7 @@ fail_exit:
} }
int sbi_hsm_hart_start(struct sbi_scratch *scratch, u32 hartid, int sbi_hsm_hart_start(struct sbi_scratch *scratch, u32 hartid,
ulong saddr, ulong priv) ulong saddr, ulong smode, ulong priv)
{ {
int rc; int rc;
unsigned long init_count; unsigned long init_count;
@@ -212,6 +212,9 @@ int sbi_hsm_hart_start(struct sbi_scratch *scratch, u32 hartid,
struct sbi_hsm_data *hdata; struct sbi_hsm_data *hdata;
const struct sbi_platform *plat = sbi_platform_ptr(scratch); const struct sbi_platform *plat = sbi_platform_ptr(scratch);
if (smode != PRV_M && smode != PRV_S && smode != PRV_U)
return SBI_EINVAL;
rscratch = sbi_hartid_to_scratch(hartid); rscratch = sbi_hartid_to_scratch(hartid);
if (!rscratch) if (!rscratch)
return SBI_EINVAL; return SBI_EINVAL;
@@ -236,6 +239,7 @@ int sbi_hsm_hart_start(struct sbi_scratch *scratch, u32 hartid,
init_count = sbi_init_count(hartid); init_count = sbi_init_count(hartid);
rscratch->next_arg1 = priv; rscratch->next_arg1 = priv;
rscratch->next_addr = saddr; rscratch->next_addr = saddr;
rscratch->next_mode = smode;
if (sbi_platform_has_hart_hotplug(plat) || if (sbi_platform_has_hart_hotplug(plat) ||
(sbi_platform_has_hart_secondary_boot(plat) && !init_count)) { (sbi_platform_has_hart_secondary_boot(plat) && !init_count)) {