Skip to content

Commit db1f36c

Browse files
committed
[nrf fromlist] tests: kernel: interrupt: take into account table offset during setup
Some IRQ table entries may be reserved for some architecures. This was already introduced in dynamic shared irq tests but it was not taken into account during test setup which may be needed for some platforms.' Upstream PR #: 94225 Signed-off-by: Łukasz Stępnicki <[email protected]>
1 parent c0c8c5f commit db1f36c

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

tests/kernel/interrupt/src/dynamic_shared_irq.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,15 @@ static unsigned int get_irq_slot(unsigned int start)
8181
return TEST_INVALID_IRQ;
8282
}
8383

84+
#if defined(CONFIG_RISCV_RESERVED_IRQ_ISR_TABLES_OFFSET)
85+
#define TABLE_OFFSET CONFIG_RISCV_RESERVED_IRQ_ISR_TABLES_OFFSET
86+
#else
87+
#define TABLE_OFFSET 0
88+
#endif
89+
8490
static void *dynamic_shared_irq_suite_setup(void)
8591
{
86-
fixture.irq1 = get_irq_slot(CONFIG_GEN_IRQ_START_VECTOR);
92+
fixture.irq1 = get_irq_slot(CONFIG_GEN_IRQ_START_VECTOR + TABLE_OFFSET);
8793
zassert_true(fixture.irq1 != TEST_INVALID_IRQ,
8894
"no suitable value found for irq1");
8995
fixture.irq2 = get_irq_slot(fixture.irq1 + 1);
@@ -97,12 +103,6 @@ static void *dynamic_shared_irq_suite_setup(void)
97103
return NULL;
98104
}
99105

100-
#if defined(CONFIG_RISCV_RESERVED_IRQ_ISR_TABLES_OFFSET)
101-
#define TABLE_OFFSET CONFIG_RISCV_RESERVED_IRQ_ISR_TABLES_OFFSET
102-
#else
103-
#define TABLE_OFFSET 0
104-
#endif
105-
106106
static void dynamic_shared_irq_suite_before(void *data)
107107
{
108108
ARG_UNUSED(data);

0 commit comments

Comments
 (0)