riscv: Introduce a new config for SBI v0.1

We now have SBI v0.2 which is more scalable and extendable to handle
future needs for RISC-V supervisor interfaces.

Introduce a new config and move all SBI v0.1 code under that config.
This allows to implement the new replacement SBI extensions cleanly
and remove v0.1 extensions easily in future. Currently, the config
is enabled by default. Once all M-mode software, with v0.1, is no
longer in use, this config option and all relevant code can be easily
removed.

This commit is inspired from Linux kernel patch:
https://patchwork.kernel.org/patch/11407361/

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Pragnesh Patel <pragnesh.patel@sifive.com>
This commit is contained in:
Bin Meng 2020-03-09 19:35:30 -07:00 committed by Andes
parent 1e32715602
commit 1b3c8d6402
3 changed files with 16 additions and 0 deletions

View File

@ -214,6 +214,14 @@ config SBI
bool bool
default y if RISCV_SMODE || SPL_RISCV_SMODE default y if RISCV_SMODE || SPL_RISCV_SMODE
config SBI_V01
bool "SBI v0.1 support"
default y
depends on SBI
help
This config allows kernel to use SBI v0.1 APIs. This will be
deprecated in future once legacy M-mode software are no longer in use.
config SBI_IPI config SBI_IPI
bool bool
depends on SBI depends on SBI

View File

@ -12,6 +12,7 @@
#include <linux/types.h> #include <linux/types.h>
enum sbi_ext_id { enum sbi_ext_id {
#ifdef CONFIG_SBI_V01
SBI_EXT_0_1_SET_TIMER = 0x0, SBI_EXT_0_1_SET_TIMER = 0x0,
SBI_EXT_0_1_CONSOLE_PUTCHAR = 0x1, SBI_EXT_0_1_CONSOLE_PUTCHAR = 0x1,
SBI_EXT_0_1_CONSOLE_GETCHAR = 0x2, SBI_EXT_0_1_CONSOLE_GETCHAR = 0x2,
@ -21,6 +22,7 @@ enum sbi_ext_id {
SBI_EXT_0_1_REMOTE_SFENCE_VMA = 0x6, SBI_EXT_0_1_REMOTE_SFENCE_VMA = 0x6,
SBI_EXT_0_1_REMOTE_SFENCE_VMA_ASID = 0x7, SBI_EXT_0_1_REMOTE_SFENCE_VMA_ASID = 0x7,
SBI_EXT_0_1_SHUTDOWN = 0x8, SBI_EXT_0_1_SHUTDOWN = 0x8,
#endif
SBI_EXT_BASE = 0x10, SBI_EXT_BASE = 0x10,
SBI_EXT_TIME = 0x54494D45, SBI_EXT_TIME = 0x54494D45,
SBI_EXT_IPI = 0x735049, SBI_EXT_IPI = 0x735049,
@ -75,10 +77,12 @@ struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0,
unsigned long arg3, unsigned long arg4, unsigned long arg3, unsigned long arg4,
unsigned long arg5); unsigned long arg5);
#ifdef CONFIG_SBI_V01
void sbi_console_putchar(int ch); void sbi_console_putchar(int ch);
int sbi_console_getchar(void); int sbi_console_getchar(void);
void sbi_clear_ipi(void); void sbi_clear_ipi(void);
void sbi_shutdown(void); void sbi_shutdown(void);
#endif
void sbi_set_timer(uint64_t stime_value); void sbi_set_timer(uint64_t stime_value);
void sbi_send_ipi(const unsigned long *hart_mask); void sbi_send_ipi(const unsigned long *hart_mask);
void sbi_remote_fence_i(const unsigned long *hart_mask); void sbi_remote_fence_i(const unsigned long *hart_mask);

View File

@ -39,6 +39,8 @@ struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0,
return ret; return ret;
} }
#ifdef CONFIG_SBI_V01
/** /**
* sbi_console_putchar() - Writes given character to the console device. * sbi_console_putchar() - Writes given character to the console device.
* @ch: The data to be written to the console. * @ch: The data to be written to the console.
@ -84,6 +86,8 @@ void sbi_shutdown(void)
sbi_ecall(SBI_EXT_0_1_SHUTDOWN, 0, 0, 0, 0, 0, 0, 0); sbi_ecall(SBI_EXT_0_1_SHUTDOWN, 0, 0, 0, 0, 0, 0, 0);
} }
#endif /* CONFIG_SBI_V01 */
/** /**
* sbi_set_timer() - Program the timer for next timer event. * sbi_set_timer() - Program the timer for next timer event.
* @stime_value: The value after which next timer event should fire. * @stime_value: The value after which next timer event should fire.