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

include: Make sbi_hart_id_to_scratch() as macro

Browse Source 
The sbi_hart_id_to_scratch() just forwards call to firmware specific
hartid_to_scratch() callback so we make sbi_hart_id_to_scratch() as
macro in sbi_scratch.h instead of regular function in sbi_hart.c.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Anup Patel
2020-03-11 19:08:08 +05:30
committed by Anup Patel
parent baac7e066d
commit f92147c2b2
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/sbi/sbi_hart.h
View File

@@ -32,9 +32,6 @@ sbi_hart_switch_mode(unsigned long arg0, unsigned long arg1,
unsigned long next_addr, unsigned long next_mode,
bool next_virt);
struct sbi_scratch *sbi_hart_id_to_scratch(struct sbi_scratch *scratch,
u32 hartid);
u32 sbi_current_hartid(void);
#endif

6
include/sbi/sbi_scratch.h
View File

@@ -103,6 +103,12 @@ void sbi_scratch_free_offset(unsigned long offset);
#define sbi_scratch_thishart_offset_ptr(offset) \
((void *)sbi_scratch_thishart_ptr() + (offset))
typedef struct sbi_scratch *(*hartid2scratch)(ulong hartid);
/** Get sbi_scratch from HART id */
#define sbi_hart_id_to_scratch(__scratch, __hartid) \
((hartid2scratch)(__scratch)->hartid_to_scratch)(__hartid)
#endif
#endif

8
lib/sbi/sbi_hart.c
View File

@@ -340,11 +340,3 @@ sbi_hart_switch_mode(unsigned long arg0, unsigned long arg1,
__asm__ __volatile__("mret" : : "r"(a0), "r"(a1));
__builtin_unreachable();
}
typedef struct sbi_scratch *(*h2s)(ulong hartid);
struct sbi_scratch *sbi_hart_id_to_scratch(struct sbi_scratch *scratch,
u32 hartid)
{
return ((h2s)scratch->hartid_to_scratch)(hartid);
}