diff options
| author | Anup Patel <anup.patel@wdc.com> | 2020-06-10 16:09:53 +0300 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2020-06-20 08:06:13 +0300 |
| commit | 2314101989684585f942b50a827aac4886825ba1 (patch) | |
| tree | 37f1248c1c6272d5bb62a3c6e67a64cb215ce2d5 /lib | |
| parent | 9bd5f8f17d31f8989525643a04da87d090fe3033 (diff) | |
| download | opensbi-2314101989684585f942b50a827aac4886825ba1.tar.xz | |
lib: Don't return any invalid error from SBI ecall
We should only return valid error codes from SBI ecalls as
defined by the RISC-V SBI spec.
To achieve this:
1. We use SBI_Exxxx defines for OpenSBI internal errors with
error values starting from -1000
2. We use SBI_ERR_xxxx defines for errors defined by SBI spec
3. We map some of the SBI_Exxxx defines to SBI_ERR_xxxx defines
which are semantically same
4. We throw a error print and force return error code to
SBI_ERR_FAILED in sbi_ecall_handler() if we see an invalid
error code being returned to S-mode
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sbi/sbi_ecall.c | 8 | ||||
| -rw-r--r-- | lib/sbi/sbi_hart.c | 2 | ||||
| -rw-r--r-- | lib/sbi/sbi_hsm.c | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/lib/sbi/sbi_ecall.c b/lib/sbi/sbi_ecall.c index 1a54c6e..64c9933 100644 --- a/lib/sbi/sbi_ecall.c +++ b/lib/sbi/sbi_ecall.c @@ -7,6 +7,7 @@ * Anup Patel <anup.patel@wdc.com> */ +#include <sbi/sbi_console.h> #include <sbi/sbi_ecall.h> #include <sbi/sbi_ecall_interface.h> #include <sbi/sbi_error.h> @@ -124,6 +125,13 @@ int sbi_ecall_handler(struct sbi_trap_regs *regs) trap.epc = regs->mepc; sbi_trap_redirect(regs, &trap); } else { + if (ret < SBI_LAST_ERR) { + sbi_printf("%s: Invalid error %d for ext=0x%lx " + "func=0x%lx\n", __func__, ret, + extension_id, func_id); + ret = SBI_ERR_FAILED; + } + /* * This function should return non-zero value only in case of * fatal error. However, there is no good way to distinguish diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c index 1d1c6d6..fa20bd2 100644 --- a/lib/sbi/sbi_hart.c +++ b/lib/sbi/sbi_hart.c @@ -200,7 +200,7 @@ int sbi_hart_pmp_check_addr(struct sbi_scratch *scratch, unsigned long addr, continue; if (tempaddr <= addr && addr <= tempaddr + size) if (!(prot & attr)) - return SBI_INVALID_ADDR; + return SBI_EINVALID_ADDR; } return SBI_OK; diff --git a/lib/sbi/sbi_hsm.c b/lib/sbi/sbi_hsm.c index 4330a22..013647a 100644 --- a/lib/sbi/sbi_hsm.c +++ b/lib/sbi/sbi_hsm.c @@ -219,7 +219,7 @@ int sbi_hsm_hart_start(struct sbi_scratch *scratch, u32 hartid, hstate = atomic_cmpxchg(&hdata->state, SBI_HART_STOPPED, SBI_HART_STARTING); if (hstate == SBI_HART_STARTED) - return SBI_EALREADY_STARTED; + return SBI_EALREADY; /** * if a hart is already transition to start or stop, another start call @@ -263,7 +263,7 @@ int sbi_hsm_hart_stop(struct sbi_scratch *scratch, bool exitnow) if (oldstate != SBI_HART_STARTED) { sbi_printf("%s: ERR: The hart is in invalid state [%u]\n", __func__, oldstate); - return SBI_DENIED; + return SBI_EDENIED; } if (exitnow) |