forked from Mirrors/opensbi
lib: sbi: Remove regs paramter of sbi_irqchip_process()
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>
This commit is contained in:
@@ -13,7 +13,6 @@
|
|||||||
#include <sbi/sbi_types.h>
|
#include <sbi/sbi_types.h>
|
||||||
|
|
||||||
struct sbi_scratch;
|
struct sbi_scratch;
|
||||||
struct sbi_trap_regs;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set external interrupt handling function
|
* Set external interrupt handling function
|
||||||
@@ -23,7 +22,7 @@ struct sbi_trap_regs;
|
|||||||
*
|
*
|
||||||
* @param fn function pointer for handling external irqs
|
* @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
|
* 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
|
* @param regs pointer for trap registers
|
||||||
*/
|
*/
|
||||||
int sbi_irqchip_process(struct sbi_trap_regs *regs);
|
int sbi_irqchip_process(void);
|
||||||
|
|
||||||
/** Initialize interrupt controllers */
|
/** Initialize interrupt controllers */
|
||||||
int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot);
|
int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot);
|
||||||
|
@@ -10,22 +10,22 @@
|
|||||||
#include <sbi/sbi_irqchip.h>
|
#include <sbi/sbi_irqchip.h>
|
||||||
#include <sbi/sbi_platform.h>
|
#include <sbi/sbi_platform.h>
|
||||||
|
|
||||||
static int default_irqfn(struct sbi_trap_regs *regs)
|
static int default_irqfn(void)
|
||||||
{
|
{
|
||||||
return SBI_ENODEV;
|
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)
|
if (fn)
|
||||||
ext_irqfn = 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)
|
int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot)
|
||||||
|
@@ -209,7 +209,7 @@ static int sbi_trap_nonaia_irq(struct sbi_trap_regs *regs, ulong mcause)
|
|||||||
sbi_ipi_process();
|
sbi_ipi_process();
|
||||||
break;
|
break;
|
||||||
case IRQ_M_EXT:
|
case IRQ_M_EXT:
|
||||||
return sbi_irqchip_process(regs);
|
return sbi_irqchip_process();
|
||||||
default:
|
default:
|
||||||
return SBI_ENOENT;
|
return SBI_ENOENT;
|
||||||
}
|
}
|
||||||
@@ -232,7 +232,7 @@ static int sbi_trap_aia_irq(struct sbi_trap_regs *regs, ulong mcause)
|
|||||||
sbi_ipi_process();
|
sbi_ipi_process();
|
||||||
break;
|
break;
|
||||||
case IRQ_M_EXT:
|
case IRQ_M_EXT:
|
||||||
rc = sbi_irqchip_process(regs);
|
rc = sbi_irqchip_process();
|
||||||
if (rc)
|
if (rc)
|
||||||
return rc;
|
return rc;
|
||||||
break;
|
break;
|
||||||
|
@@ -140,7 +140,7 @@ int imsic_get_target_file(u32 hartid)
|
|||||||
return imsic_get_hart_file(scratch);
|
return imsic_get_hart_file(scratch);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int imsic_external_irqfn(struct sbi_trap_regs *regs)
|
static int imsic_external_irqfn(void)
|
||||||
{
|
{
|
||||||
ulong mirq;
|
ulong mirq;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user