Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

Introduce sbi_current_hartid()

Browse Source 
Use this helper instead of hardcoding csr_read(mhartid).

Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
This commit is contained in:
Damien Le Moal
2018-12-21 17:06:59 +09:00
parent 426adf9f60
commit 5563a03354
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/sbi/sbi_hart.h
View File

@@ -38,4 +38,6 @@ void sbi_hart_wait_for_coldboot(struct sbi_scratch *scratch, u32 hartid);
void sbi_hart_wake_coldboot_harts(struct sbi_scratch *scratch, u32 hartid);
u32 sbi_current_hartid(void);
#endif

13
lib/sbi_hart.c
View File

@@ -17,6 +17,14 @@
#include <sbi/sbi_hart.h>
#include <sbi/sbi_platform.h>
/**
* Return HART ID of the caller.
*/
unsigned int sbi_current_hartid()
{
return (u32)csr_read(mhartid);
}
static void mstatus_init(struct sbi_scratch *scratch, u32 hartid)
{
struct sbi_platform *plat = sbi_platform_ptr(scratch);
@@ -198,7 +206,7 @@ int sbi_hart_init(struct sbi_scratch *scratch, u32 hartid)
void __attribute__((noreturn)) sbi_hart_hang(void)
{
sbi_printf("\nHang !!\n");
sbi_printf("\nHART %u Hang !!\n\n", sbi_current_hartid());
while (1)
wfi();
@@ -249,7 +257,8 @@ void __attribute__((noreturn)) sbi_hart_switch_mode(unsigned long arg0,
csr_write(uie, 0);
}
sbi_printf("\nSwitching to %c-mode...\n\n", mode);
sbi_printf("HART %u switching to %c-mode...\n\n",
sbi_current_hartid(), mode);
register unsigned long a0 asm ("a0") = arg0;
register unsigned long a1 asm ("a1") = arg1;

2
lib/sbi_init.c
View File

@@ -163,7 +163,7 @@ static atomic_t coldboot_lottery = ATOMIC_INITIALIZER(0);
void __attribute__((noreturn)) sbi_init(struct sbi_scratch *scratch)
{
bool coldboot = FALSE;
u32 hartid = csr_read(mhartid);
u32 hartid = sbi_current_hartid();
if (atomic_add_return(&coldboot_lottery, 1) == 1)
coldboot = TRUE;

2
lib/sbi_trap.c
View File

@@ -68,7 +68,7 @@ void sbi_trap_handler(struct sbi_trap_regs *regs,
{
int rc;
const char *msg;
u32 hartid = csr_read(mhartid);
u32 hartid = sbi_current_hartid();
ulong mcause = csr_read(mcause);
if (mcause & (1UL << (__riscv_xlen - 1))) {