Skip to content

[libcpu][cortex-r52]Fix duplicate interrupt dispatch on RZ/N2L #11765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CYFS3 wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −27
Open

[libcpu][cortex-r52]Fix duplicate interrupt dispatch on RZ/N2L #11765

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 25 additions & 27 deletions libcpu/arm/cortex-r52/trap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <gicv3.h>
#include <rtthread.h>
#include <rthw.h>
//#include <board.h>

#include "interrupt.h"

Expand Down Expand Up @@ -257,16 +256,8 @@ void rt_hw_trap_irq(void)
}

#ifdef SOC_SERIES_R9A07G0
extern fsp_vector_t g_vector_table[BSP_ICU_VECTOR_MAX_ENTRIES];

bsp_common_interrupt_handler((uint32_t)ir);
Comment on lines 258 to 259
if (ir < MAX_HANDLERS)
{
/* get interrupt service routine */
isr_table[ir].handler = (rt_isr_handler_t)g_vector_table[ir];
isr_table[ir].param = RT_NULL;
}
#endif
#else
/* get interrupt service routine */
isr_func = isr_table[ir].handler;

Expand All @@ -280,39 +271,46 @@ void rt_hw_trap_irq(void)
/* turn to interrupt service routine */
isr_func(ir, param);
}

#endif
/* end of interrupt */
rt_hw_interrupt_ack(int_ack);
}

void rt_hw_trap_fiq(void)
{
void *param;
int int_ack;
int ir;
rt_isr_handler_t isr_func;
volatile rt_isr_handler_t isr_func;
extern struct rt_irq_desc isr_table[];

ir = rt_hw_interrupt_get_irq();

#ifdef SOC_SERIES_R9A07G0
extern fsp_vector_t g_vector_table[BSP_ICU_VECTOR_MAX_ENTRIES];
int_ack = rt_hw_interrupt_get_irq();

bsp_common_interrupt_handler((uint32_t)ir);
if (ir < MAX_HANDLERS)
ir = int_ack & GIC_ACK_INTID_MASK;
if (ir == 1023)
{
/* get interrupt service routine */
isr_table[ir].handler = (rt_isr_handler_t)g_vector_table[ir];
isr_table[ir].param = RT_NULL;
/* Spurious interrupt */
return;
}
#endif

#ifdef SOC_SERIES_R9A07G0
bsp_common_interrupt_handler((uint32_t)ir);
Comment on lines +296 to +297
#else
/* get interrupt service routine */
isr_func = isr_table[ir].handler;
param = isr_table[ir].param;

/* turn to interrupt service routine */
isr_func(ir, param);

#ifdef RT_USING_INTERRUPT_INFO
isr_table[ir].counter++;
#endif
if (isr_func)
{
/* Interrupt for myself. */
param = isr_table[ir].param;
/* turn to interrupt service routine */
isr_func(ir, param);
}
#endif
/* end of interrupt */
rt_hw_interrupt_ack(ir);
rt_hw_interrupt_ack(int_ack);
}

Loading