From: Anup Patel <apatel@ventanamicro.com>
To: opensbi@lists.infradead.org
Subject: [PATCH v2 08/10] lib: sbi: Remove regs parameter from trap irq handling functions
Date: Tue, 12 Mar 2024 15:58:02 +0530 [thread overview]
Message-ID: <20240312102804.1436376-9-apatel@ventanamicro.com> (raw)
In-Reply-To: <20240312102804.1436376-1-apatel@ventanamicro.com>
The trap irq handling functions no longer require regs parameter
so remove it.
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
---
lib/sbi/sbi_trap.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/lib/sbi/sbi_trap.c b/lib/sbi/sbi_trap.c
index 72b1788..ebf454d 100644
--- a/lib/sbi/sbi_trap.c
+++ b/lib/sbi/sbi_trap.c
@@ -198,10 +198,9 @@ int sbi_trap_redirect(struct sbi_trap_regs *regs,
return 0;
}
-static int sbi_trap_nonaia_irq(struct sbi_trap_regs *regs, ulong mcause)
+static int sbi_trap_nonaia_irq(unsigned long irq)
{
- mcause &= ~(1UL << (__riscv_xlen - 1));
- switch (mcause) {
+ switch (irq) {
case IRQ_M_TIMER:
sbi_timer_process();
break;
@@ -217,7 +216,7 @@ static int sbi_trap_nonaia_irq(struct sbi_trap_regs *regs, ulong mcause)
return 0;
}
-static int sbi_trap_aia_irq(struct sbi_trap_regs *regs, ulong mcause)
+static int sbi_trap_aia_irq(void)
{
int rc;
unsigned long mtopi;
@@ -273,12 +272,12 @@ struct sbi_trap_context *sbi_trap_handler(struct sbi_trap_context *tcntx)
tcntx->prev_context = sbi_trap_get_context(scratch);
sbi_trap_set_context(scratch, tcntx);
- if (mcause & (1UL << (__riscv_xlen - 1))) {
+ if (mcause & BIT(__riscv_xlen - 1)) {
if (sbi_hart_has_extension(sbi_scratch_thishart_ptr(),
SBI_HART_EXT_SMAIA))
- rc = sbi_trap_aia_irq(regs, mcause);
+ rc = sbi_trap_aia_irq();
else
- rc = sbi_trap_nonaia_irq(regs, mcause);
+ rc = sbi_trap_nonaia_irq(mcause & ~BIT(__riscv_xlen - 1));
msg = "unhandled local interrupt";
goto trap_done;
}
--
2.34.1
next prev parent reply other threads:[~2024-03-12 10:28 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-12 10:27 [PATCH v2 00/10] Improve trap handling for nested traps Anup Patel
2024-03-12 10:27 ` [PATCH v2 01/10] lib: sbi: Remove epc from struct sbi_trap_info Anup Patel
2024-03-12 10:27 ` [PATCH v2 02/10] lib: sbi: Remove sbi_trap_exit() and related code Anup Patel
2024-03-12 10:27 ` [PATCH v2 03/10] include: sbi: Add trap_context pointer in struct sbi_scratch Anup Patel
2024-03-12 16:55 ` Samuel Holland
2024-03-12 10:27 ` [PATCH v2 04/10] lib: sbi: Introduce trap context Anup Patel
2024-03-12 16:55 ` Samuel Holland
2024-03-13 4:56 ` Xiang W
2024-03-17 11:23 ` Anup Patel
2024-03-12 10:27 ` [PATCH v2 05/10] lib: sbi: Simplify parameters of misaligned and access fault handlers Anup Patel
2024-03-12 16:55 ` Samuel Holland
2024-03-13 13:45 ` Clément Léger
2024-03-12 10:28 ` [PATCH v2 06/10] lib: sbi: Simplify parameters of sbi_illegal_insn_handler() Anup Patel
2024-03-12 16:56 ` Samuel Holland
2024-03-13 13:42 ` Clément Léger
2024-03-17 11:28 ` Anup Patel
2024-03-12 10:28 ` [PATCH v2 07/10] lib: sbi: Remove regs paramter of sbi_irqchip_process() Anup Patel
2024-03-12 16:56 ` Samuel Holland
2024-03-13 13:39 ` Clément Léger
2024-03-17 11:30 ` Anup Patel
2024-03-12 10:28 ` Anup Patel [this message]
2024-03-12 16:56 ` [PATCH v2 08/10] lib: sbi: Remove regs parameter from trap irq handling functions Samuel Holland
2024-03-13 13:51 ` Clément Léger
2024-03-17 11:36 ` Anup Patel
2024-03-12 10:28 ` [PATCH v2 09/10] lib: sbi: Pass trap context pointer to sbi_ecall_handler() Anup Patel
2024-03-12 16:56 ` Samuel Holland
2024-03-13 13:47 ` Clément Léger
2024-03-12 10:28 ` [PATCH v2 10/10] lib: sbi: Extend sbi_trap_error() to dump state in a nested trap Anup Patel
2024-03-12 17:21 ` Samuel Holland
2024-03-17 11:55 ` 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=20240312102804.1436376-9-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