RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

arm/raspberrypi: remove duplicate setup of IRQ handler in the main ARM exception table.

Browse Source 
Exception table setup is processed by common CPU architecture support.
For ARM architecture, it can be found in the file

rtems/c/src/lib/libbsp/arm/shared/start/start.S

and ends by bsp_vector_table_copy_done label.
The actual tabel content can be found at

  bsp_start_vector_table_begin

For ARMv7-A and even other variant with hypervisor mode support,
it is even not necessary to copy table to address 0 at all
because CP15 register can be used to specify alternative
table start address

  arm_cp15_set_vector_base_address(&)bsp_start_vector_table_begin;

ARMv7-M have register to set exception table base as well.

Updates #2783
This commit is contained in:
Pavel Pisa
2016-07-23 12:07:10 +02:00
parent b5501ba492
commit acb488ff59
2 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/arm/raspberrypi/include/irq.h
View File

@@ -62,9 +62,5 @@
#define BSP_IRQ_COUNT (BCM2835_INTC_TOTAL_IRQ) #define BSP_IRQ_COUNT (BCM2835_INTC_TOTAL_IRQ)
void raspberrypi_set_exception_handler(Arm_symbolic_exception_name exception,
void (*handler)(void));
#endif /* ASM */ #endif /* ASM */
#endif /* LIBBSP_ARM_RASPBERRYPI_IRQ_H */ #endif /* LIBBSP_ARM_RASPBERRYPI_IRQ_H */

17
c/src/lib/libbsp/arm/raspberrypi/irq/irq.c
View File

@@ -28,22 +28,6 @@
#include <bsp/linker-symbols.h> #include <bsp/linker-symbols.h>
#include <bsp/mmu.h> #include <bsp/mmu.h>
/*
** This sets the main exception vectors
*/
void raspberrypi_set_exception_handler(
Arm_symbolic_exception_name exception,
void (*handler)(void)
)
{
if ((unsigned) exception < MAX_EXCEPTIONS)
{
uint32_t *table = (uint32_t *) bsp_section_vector_begin + MAX_EXCEPTIONS;
table [exception] = (uint32_t) handler;
}
}
/* /*
** Determine the source of the interrupt and dispatch the correct handler. ** Determine the source of the interrupt and dispatch the correct handler.
*/ */
@@ -119,7 +103,6 @@ void bsp_interrupt_handler_default(rtems_vector_number vector)
rtems_status_code bsp_interrupt_facility_initialize(void) rtems_status_code bsp_interrupt_facility_initialize(void)
{ {
raspberrypi_set_exception_handler(ARM_EXCEPTION_IRQ, _ARMV4_Exception_interrupt);
BCM2835_REG(BCM2835_IRQ_DISABLE1) = 0xffffffff; BCM2835_REG(BCM2835_IRQ_DISABLE1) = 0xffffffff;
BCM2835_REG(BCM2835_IRQ_DISABLE2) = 0xffffffff; BCM2835_REG(BCM2835_IRQ_DISABLE2) = 0xffffffff;
BCM2835_REG(BCM2835_IRQ_DISABLE_BASIC) = 0xffffffff; BCM2835_REG(BCM2835_IRQ_DISABLE_BASIC) = 0xffffffff;