diff options
| author | Jonathan Neuschäfer <j.neuschaefer@gmx.net> | 2017-01-16 00:31:34 +0100 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2017-01-16 06:15:53 +0100 |
| commit | c5ebb1d005e1a176b94be136aa21734c03d34d08 (patch) | |
| tree | e993aded5e50f5e109c4750e6f33c3b67d92dcc3 /src/arch/riscv/sbi.S | |
| parent | f676aa4afdadac5dce93ca10a9fe2c4d9ca4edfb (diff) | |
riscv: Move mcall numbers to mcall.h, adjust their names
The new name and location make more sense:
- The instruction used to call into machine mode isn't called "ecall"
anymore; it's mcall now.
- Having SBI_ in the name is slightly wrong, too: these numbers are not
part of the Supervisor Binary Interface, they are just used to
forward SBI calls (they could be renumbered arbitrarily without
breaking an OS that's run under coreboot).
Also remove mcall_dev_{req,resp} and the corresponding mcall numbers,
which are no longer used.
Change-Id: I76a8cb04e4ace51964b1cb4f67d49cfee9850da7
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Reviewed-on: https://review.coreboot.org/18146
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/arch/riscv/sbi.S')
| -rw-r--r-- | src/arch/riscv/sbi.S | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/arch/riscv/sbi.S b/src/arch/riscv/sbi.S index 528e4ca048..0ff7c3b47d 100644 --- a/src/arch/riscv/sbi.S +++ b/src/arch/riscv/sbi.S @@ -16,7 +16,7 @@ #define __ASSEMBLY__ #include <arch/encoding.h> -#include <arch/sbi.h> +#include <mcall.h> .section ".text.sbi", "ax", %progbits @@ -33,26 +33,26 @@ sbi_page: .skip 0x800 /* -2048: size_t sbi_hart_id(void); */ - li a7, SBI_ECALL_HART_ID + li a7, MCALL_HART_ID ecall jr ra .align 4 /* -2032: size_t sbi_num_harts(void); */ - li a7, SBI_ECALL_NUM_HARTS + li a7, MCALL_NUM_HARTS ecall jr ra .align 4 /* -2016: unsigned long sbi_query_memory(unsigned long id, memory_block_info *p); */ - li a7, SBI_ECALL_QUERY_MEMORY + li a7, MCALL_QUERY_MEMORY ecall jr ra .align 4 /* -2000: int sbi_console_putchar(uint8_t ch); */ - li a7, SBI_ECALL_CONSOLE_PUT + li a7, MCALL_CONSOLE_PUTCHAR ecall jr ra .align 4 @@ -80,13 +80,13 @@ sbi_page: .align 4 /* -1904: void sbi_shutdown(void); */ - li a7, SBI_ECALL_SHUTDOWN + li a7, MCALL_SHUTDOWN ecall jr ra .align 4 /* -1888: void sbi_set_timer(unsigned long long stime_value); */ - li a7, SBI_ECALL_SET_TIMER + li a7, MCALL_SET_TIMER ecall jr ra .align 4 |