From: Anup Patel <apatel@ventanamicro.com>
To: opensbi@lists.infradead.org
Subject: [PATCH v3 07/10] lib: sbi: Remove regs paramter of sbi_irqchip_process()
Date: Sun, 17 Mar 2024 18:32:28 +0530 [thread overview]
Message-ID: <20240317130231.1705888-8-apatel@ventanamicro.com> (raw)
In-Reply-To: <20240317130231.1705888-1-apatel@ventanamicro.com>
The irqchip handlers will typically not need pointer to trap registers
so remove regs parameter of sbi_irqchip_process().
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Samuel Holland <samuel.holland@sifive.com>
Tested-by: Samuel Holland <samuel.holland@sifive.com>
Reviewed-by: Cl?ment L?ger <cleger@rivosinc.com>
---
include/sbi/sbi_irqchip.h | 5 ++---
lib/sbi/sbi_irqchip.c | 10 +++++-----
lib/sbi/sbi_trap.c | 4 ++--
lib/utils/irqchip/imsic.c | 2 +-
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/include/sbi/sbi_irqchip.h b/include/sbi/sbi_irqchip.h
index 6acc6e3..0ed02eb 100644
--- a/include/sbi/sbi_irqchip.h
+++ b/include/sbi/sbi_irqchip.h
@@ -13,7 +13,6 @@
#include <sbi/sbi_types.h>
struct sbi_scratch;
-struct sbi_trap_regs;
/**
* Set external interrupt handling function
@@ -23,7 +22,7 @@ struct sbi_trap_regs;
*
* @param fn function pointer for handling external irqs
*/
-void sbi_irqchip_set_irqfn(int (*fn)(struct sbi_trap_regs *regs));
+void sbi_irqchip_set_irqfn(int (*fn)(void));
/**
* Process external interrupts
@@ -33,7 +32,7 @@ void sbi_irqchip_set_irqfn(int (*fn)(struct sbi_trap_regs *regs));
*
* @param regs pointer for trap registers
*/
-int sbi_irqchip_process(struct sbi_trap_regs *regs);
+int sbi_irqchip_process(void);
/** Initialize interrupt controllers */
int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot);
diff --git a/lib/sbi/sbi_irqchip.c b/lib/sbi/sbi_irqchip.c
index 24128be..0ae604a 100644
--- a/lib/sbi/sbi_irqchip.c
+++ b/lib/sbi/sbi_irqchip.c
@@ -10,22 +10,22 @@
#include <sbi/sbi_irqchip.h>
#include <sbi/sbi_platform.h>
-static int default_irqfn(struct sbi_trap_regs *regs)
+static int default_irqfn(void)
{
return SBI_ENODEV;
}
-static int (*ext_irqfn)(struct sbi_trap_regs *regs) = default_irqfn;
+static int (*ext_irqfn)(void) = default_irqfn;
-void sbi_irqchip_set_irqfn(int (*fn)(struct sbi_trap_regs *regs))
+void sbi_irqchip_set_irqfn(int (*fn)(void))
{
if (fn)
ext_irqfn = fn;
}
-int sbi_irqchip_process(struct sbi_trap_regs *regs)
+int sbi_irqchip_process(void)
{
- return ext_irqfn(regs);
+ return ext_irqfn();
}
int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot)
diff --git a/lib/sbi/sbi_trap.c b/lib/sbi/sbi_trap.c
index 4e691df..72b1788 100644
--- a/lib/sbi/sbi_trap.c
+++ b/lib/sbi/sbi_trap.c
@@ -209,7 +209,7 @@ static int sbi_trap_nonaia_irq(struct sbi_trap_regs *regs, ulong mcause)
sbi_ipi_process();
break;
case IRQ_M_EXT:
- return sbi_irqchip_process(regs);
+ return sbi_irqchip_process();
default:
return SBI_ENOENT;
}
@@ -232,7 +232,7 @@ static int sbi_trap_aia_irq(struct sbi_trap_regs *regs, ulong mcause)
sbi_ipi_process();
break;
case IRQ_M_EXT:
- rc = sbi_irqchip_process(regs);
+ rc = sbi_irqchip_process();
if (rc)
return rc;
break;
diff --git a/lib/utils/irqchip/imsic.c b/lib/utils/irqchip/imsic.c
index 36ef66c..f2a35c6 100644
--- a/lib/utils/irqchip/imsic.c
+++ b/lib/utils/irqchip/imsic.c
@@ -140,7 +140,7 @@ int imsic_get_target_file(u32 hartid)
return imsic_get_hart_file(scratch);
}
-static int imsic_external_irqfn(struct sbi_trap_regs *regs)
+static int imsic_external_irqfn(void)
{
ulong mirq;
--
2.34.1
next prev parent reply other threads:[~2024-03-17 13:02 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-17 13:02 [PATCH v3 00/10] Improve trap handling for nested traps Anup Patel
2024-03-17 13:02 ` [PATCH v3 01/10] lib: sbi: Remove epc from struct sbi_trap_info Anup Patel
2024-03-17 13:02 ` [PATCH v3 02/10] lib: sbi: Remove sbi_trap_exit() and related code Anup Patel
2024-03-17 13:02 ` [PATCH v3 03/10] include: sbi: Add trap_context pointer in struct sbi_scratch Anup Patel
2024-03-17 13:02 ` [PATCH v3 04/10] lib: sbi: Introduce trap context Anup Patel
2024-03-17 13:02 ` [PATCH v3 05/10] lib: sbi: Simplify parameters of misaligned and access fault handlers Anup Patel
2024-03-17 13:02 ` [PATCH v3 06/10] lib: sbi: Simplify parameters of sbi_illegal_insn_handler() Anup Patel
2024-03-17 13:02 ` Anup Patel [this message]
2024-03-17 13:02 ` [PATCH v3 08/10] lib: sbi: Remove regs parameter from trap irq handling functions Anup Patel
2024-03-17 13:02 ` [PATCH v3 09/10] lib: sbi: Pass trap context pointer to sbi_ecall_handler() Anup Patel
2024-03-17 13:02 ` [PATCH v3 10/10] lib: sbi: Extend sbi_trap_error() to dump state in a nested trap Anup Patel
2024-03-19 6:06 ` [PATCH v3 00/10] Improve trap handling for nested traps 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=20240317130231.1705888-8-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