bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

riscv: Allow SOC to override arch_irq_{lock,unlock,unlocked}

Browse Source 
RISC-V has a modular design. Some hardware with a custom interrupt
controller needs a bit more work to lock / unlock IRQs.

Account for this hardware by introducing a set of new
z_soc_irq_* functions that can override the default behaviour.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
This commit is contained in:
Carlo Caione 2023-01-03 17:56:18 +01:00 committed by Carles Cufí
parent e92b067b7f
commit 43a61329cc
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/riscv/Kconfig
View File

@ -77,6 +77,18 @@ config RISCV_SOC_HAS_ISR_STACKING
saved on the stack by the hardware, and the registers saved by the
software macros. The structure must be called '__esf'.
config RISCV_SOC_HAS_CUSTOM_IRQ_LOCK_OPS
bool
help
Hidden option to allow SoC to overwrite arch_irq_lock(),
arch_irq_unlock() and arch_irq_unlocked() functions with
platform-specific versions named z_soc_irq_lock(), z_soc_irq_unlock()
and z_soc_irq_unlocked().
Enable this hidden option and specialize the z_soc_* functions when
the RISC-V SoC needs to do something different and more than reading and
writing the mstatus register to lock and unlock the IRQs.
config RISCV_SOC_CONTEXT_SAVE
bool "SOC-based context saving in IRQ handlers"
select RISCV_SOC_OFFSETS

12
include/zephyr/arch/riscv/arch.h
View File

@ -220,6 +220,9 @@ extern void z_irq_spurious(const void *unused);
*/
static ALWAYS_INLINE unsigned int arch_irq_lock(void)
{
#ifdef CONFIG_RISCV_SOC_HAS_CUSTOM_IRQ_LOCK_OPS
return z_soc_irq_lock();
#else
unsigned int key;
__asm__ volatile ("csrrc %0, mstatus, %1"
@ -228,6 +231,7 @@ static ALWAYS_INLINE unsigned int arch_irq_lock(void)
: "memory");
return key;
#endif
}
/*
@ -236,15 +240,23 @@ static ALWAYS_INLINE unsigned int arch_irq_lock(void)
*/
static ALWAYS_INLINE void arch_irq_unlock(unsigned int key)
{
#ifdef CONFIG_RISCV_SOC_HAS_CUSTOM_IRQ_LOCK_OPS
z_soc_irq_unlock(key);
#else
__asm__ volatile ("csrs mstatus, %0"
:
: "r" (key & MSTATUS_IEN)
: "memory");
#endif
}
static ALWAYS_INLINE bool arch_irq_unlocked(unsigned int key)
{
#ifdef CONFIG_RISCV_SOC_HAS_CUSTOM_IRQ_LOCK_OPS
return z_soc_irq_unlocked(key);
#else
return (key & MSTATUS_IEN) != 0;
#endif
}
static ALWAYS_INLINE void arch_nop(void)