patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

arch: common: guard the compilation of sw_isr_common with CMakeLists.txt

Browse source 
Instead of using a macro guard to prevent functions in
`sw_isr_common.c` from getting compiled when
`CONFIG_DYNAMIC_INTERRUPTS` isn't enabled, do that in
`CMakeLists.txt` instead.

Signed-off-by: Yong Cong Sin <ycsin@meta.com>
This commit is contained in:
Yong Cong Sin 2023-11-06 15:37:52 +08:00 committed by Carles Cufí
parent cdb606aa03
commit 63bd547e9f
3 changed files with 57 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/common/CMakeLists.txt
View file

@ -7,10 +7,15 @@ zephyr_library_include_directories(include)
# Library may be empty due to kconfigs # Library may be empty due to kconfigs
zephyr_library_property(ALLOW_EMPTY TRUE) zephyr_library_property(ALLOW_EMPTY TRUE)
zephyr_library_sources_ifdef( if(CONFIG_GEN_ISR_TABLES)
CONFIG_GEN_ISR_TABLES zephyr_library_sources(
sw_isr_common.c sw_isr_common.c
) )
zephyr_library_sources_ifdef(
CONFIG_DYNAMIC_INTERRUPTS
dynamic_isr.c
)
endif()
zephyr_library_sources_ifdef( zephyr_library_sources_ifdef(
CONFIG_MULTI_LEVEL_INTERRUPTS CONFIG_MULTI_LEVEL_INTERRUPTS

49
arch/common/dynamic_isr.c Normal file
View file

@ -0,0 +1,49 @@
/*
* Copyright (c) 2018 Intel Corporation.
*
* SPDX-License-Identifier: Apache-2.0
*/
#include "sw_isr_common.h"
#include <zephyr/sw_isr_table.h>
#include <zephyr/irq.h>
#include <zephyr/sys/__assert.h>
void __weak z_isr_install(unsigned int irq, void (*routine)(const void *),
const void *param)
{
unsigned int table_idx;
/*
* Do not assert on the IRQ enable status for ARM GIC since the SGI
* type interrupts are always enabled and attempting to install an ISR
* for them will cause the assertion to fail.
*/
#ifndef CONFIG_GIC
__ASSERT(!irq_is_enabled(irq), "IRQ %d is enabled", irq);
#endif /* !CONFIG_GIC */
table_idx = z_get_sw_isr_table_idx(irq);
/* If dynamic IRQs are enabled, then the _sw_isr_table is in RAM and
* can be modified
*/
_sw_isr_table[table_idx].arg = param;
_sw_isr_table[table_idx].isr = routine;
}
/* Some architectures don't/can't interpret flags or priority and have
* no more processing to do than this. Provide a generic fallback.
*/
int __weak arch_irq_connect_dynamic(unsigned int irq,
unsigned int priority,
void (*routine)(const void *),
const void *parameter,
uint32_t flags)
{
ARG_UNUSED(flags);
ARG_UNUSED(priority);
z_isr_install(irq, routine, parameter);
return irq;
}

43
arch/common/sw_isr_common.c
View file

@ -17,46 +17,3 @@ unsigned int __weak z_get_sw_isr_table_idx(unsigned int irq)
{ {
return irq - CONFIG_GEN_IRQ_START_VECTOR; return irq - CONFIG_GEN_IRQ_START_VECTOR;
} }
#ifdef CONFIG_DYNAMIC_INTERRUPTS
void __weak z_isr_install(unsigned int irq, void (*routine)(const void *),
const void *param)
{
unsigned int table_idx;
/*
* Do not assert on the IRQ enable status for ARM GIC since the SGI
* type interrupts are always enabled and attempting to install an ISR
* for them will cause the assertion to fail.
*/
#ifndef CONFIG_GIC
__ASSERT(!irq_is_enabled(irq), "IRQ %d is enabled", irq);
#endif /* !CONFIG_GIC */
table_idx = z_get_sw_isr_table_idx(irq);
/* If dynamic IRQs are enabled, then the _sw_isr_table is in RAM and
* can be modified
*/
_sw_isr_table[table_idx].arg = param;
_sw_isr_table[table_idx].isr = routine;
}
/* Some architectures don't/can't interpret flags or priority and have
* no more processing to do than this. Provide a generic fallback.
*/
int __weak arch_irq_connect_dynamic(unsigned int irq,
unsigned int priority,
void (*routine)(const void *),
const void *parameter,
uint32_t flags)
{
ARG_UNUSED(flags);
ARG_UNUSED(priority);
z_isr_install(irq, routine, parameter);
return irq;
}
#endif /* CONFIG_DYNAMIC_INTERRUPTS */