From: Anup Patel <apatel@ventanamicro.com>
To: opensbi@lists.infradead.org
Subject: [PATCH v2 5/6] lib: sbi: Remove the SBI_ETRAP error code
Date: Tue, 12 Dec 2023 15:29:25 +0530 [thread overview]
Message-ID: <20231212095926.13371-6-apatel@ventanamicro.com> (raw)
In-Reply-To: <20231212095926.13371-1-apatel@ventanamicro.com>
The SBI_ETRAP error code was introduced only for doing trap
redirection in generic sbi_ecall_handler(). Now the trap
redirection is moved into sbi_ecall_legacy.c and SBI_ETRAP
error code is only used in this source file so let us remove
it.
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
---
include/sbi/sbi_error.h | 5 ++---
lib/sbi/sbi_ecall_legacy.c | 32 ++++++++++++--------------------
2 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/include/sbi/sbi_error.h b/include/sbi/sbi_error.h
index 7f97506..a77e3f8 100644
--- a/include/sbi/sbi_error.h
+++ b/include/sbi/sbi_error.h
@@ -32,9 +32,8 @@
#define SBI_EILL -1004
#define SBI_ENOSPC -1005
#define SBI_ENOMEM -1006
-#define SBI_ETRAP -1007
-#define SBI_EUNKNOWN -1008
-#define SBI_ENOENT -1009
+#define SBI_EUNKNOWN -1007
+#define SBI_ENOENT -1008
/* clang-format on */
diff --git a/lib/sbi/sbi_ecall_legacy.c b/lib/sbi/sbi_ecall_legacy.c
index 48bd227..14913c9 100644
--- a/lib/sbi/sbi_ecall_legacy.c
+++ b/lib/sbi/sbi_ecall_legacy.c
@@ -24,22 +24,22 @@
#include <sbi/sbi_unpriv.h>
#include <sbi/sbi_hart.h>
-static int sbi_load_hart_mask_unpriv(ulong *pmask, ulong *hmask,
- struct sbi_trap_info *uptrap)
+static bool sbi_load_hart_mask_unpriv(ulong *pmask, ulong *hmask,
+ struct sbi_trap_info *uptrap)
{
ulong mask = 0;
if (pmask) {
mask = sbi_load_ulong(pmask, uptrap);
if (uptrap->cause)
- return SBI_ETRAP;
+ return false;
} else {
sbi_hsm_hart_interruptible_mask(sbi_domain_thishart_ptr(),
0, &mask);
}
*hmask = mask;
- return 0;
+ return true;
}
static int sbi_ecall_legacy_handler(unsigned long extid, unsigned long funcid,
@@ -70,56 +70,48 @@ static int sbi_ecall_legacy_handler(unsigned long extid, unsigned long funcid,
sbi_ipi_clear_smode();
break;
case SBI_EXT_0_1_SEND_IPI:
- ret = sbi_load_hart_mask_unpriv((ulong *)regs->a0,
- &hmask, &trap);
- if (ret != SBI_ETRAP) {
+ if (sbi_load_hart_mask_unpriv((ulong *)regs->a0,
+ &hmask, &trap)) {
ret = sbi_ipi_send_smode(hmask, 0);
} else {
- ret = 0;
trap.epc = regs->mepc;
sbi_trap_redirect(regs, &trap);
out->skip_regs_update = true;
}
break;
case SBI_EXT_0_1_REMOTE_FENCE_I:
- ret = sbi_load_hart_mask_unpriv((ulong *)regs->a0,
- &hmask, &trap);
- if (ret != SBI_ETRAP) {
+ if (sbi_load_hart_mask_unpriv((ulong *)regs->a0,
+ &hmask, &trap)) {
SBI_TLB_INFO_INIT(&tlb_info, 0, 0, 0, 0,
SBI_TLB_FENCE_I, source_hart);
ret = sbi_tlb_request(hmask, 0, &tlb_info);
} else {
- ret = 0;
trap.epc = regs->mepc;
sbi_trap_redirect(regs, &trap);
out->skip_regs_update = true;
}
break;
case SBI_EXT_0_1_REMOTE_SFENCE_VMA:
- ret = sbi_load_hart_mask_unpriv((ulong *)regs->a0,
- &hmask, &trap);
- if (ret != SBI_ETRAP) {
+ if (sbi_load_hart_mask_unpriv((ulong *)regs->a0,
+ &hmask, &trap)) {
SBI_TLB_INFO_INIT(&tlb_info, regs->a1, regs->a2, 0, 0,
SBI_TLB_SFENCE_VMA, source_hart);
ret = sbi_tlb_request(hmask, 0, &tlb_info);
} else {
- ret = 0;
trap.epc = regs->mepc;
sbi_trap_redirect(regs, &trap);
out->skip_regs_update = true;
}
break;
case SBI_EXT_0_1_REMOTE_SFENCE_VMA_ASID:
- ret = sbi_load_hart_mask_unpriv((ulong *)regs->a0,
- &hmask, &trap);
- if (ret != SBI_ETRAP) {
+ if (sbi_load_hart_mask_unpriv((ulong *)regs->a0,
+ &hmask, &trap)) {
SBI_TLB_INFO_INIT(&tlb_info, regs->a1,
regs->a2, regs->a3, 0,
SBI_TLB_SFENCE_VMA_ASID,
source_hart);
ret = sbi_tlb_request(hmask, 0, &tlb_info);
} else {
- ret = 0;
trap.epc = regs->mepc;
sbi_trap_redirect(regs, &trap);
out->skip_regs_update = true;
--
2.34.1
next prev parent reply other threads:[~2023-12-12 9:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-12 9:59 [PATCH v2 0/6] Assorted improvements Anup Patel
2023-12-12 9:59 ` [PATCH v2 1/6] lib: sbi_tlb: Reduce size of struct sbi_tlb_info Anup Patel
2023-12-12 9:59 ` [PATCH v2 2/6] platform: generic: Fine tune fw_platform_calculate_heap_size() Anup Patel
2023-12-12 9:59 ` [PATCH v2 3/6] lib: utils/irqchip: Add shared MMIO region for PLIC in root domain Anup Patel
2023-12-12 9:59 ` [PATCH v2 4/6] lib: sbi: Allow ecall handlers to directly update register state Anup Patel
2023-12-12 9:59 ` Anup Patel [this message]
2023-12-12 9:59 ` [PATCH v2 6/6] lib: sbi: Do not enter OpenSBI with mseccfg.MML == 1 Anup Patel
2023-12-19 13:54 ` [PATCH v2 0/6] Assorted improvements Anup Patel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231212095926.13371-6-apatel@ventanamicro.com \
--to=apatel@ventanamicro.com \
--cc=opensbi@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox