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

LEON3 SMP: support static interrupt affinity

Browse Source 
Changed LEON3_irq-mp to const also.
This commit is contained in:
Daniel Hellstrom
2014-05-29 21:39:18 +02:00
parent fa40ec5288
commit fad33860ae
3 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
c/src/lib/libbsp/sparc/leon3/include/bsp.h
View File

@@ -220,7 +220,18 @@ extern void BSP_shared_interrupt_mask(int irq);
* to override the BSP default.
* See startup/bspsmp.c for the default value.
*/
extern unsigned char LEON3_mp_irq;
extern const unsigned char LEON3_mp_irq;
#ifdef RTEMS_SMP
/* Weak table used to implement static interrupt CPU affinity in a SMP
* configuration. The array index is the interrupt to be looked up, and
* the array[INTERRUPT] content is the CPU number relative to boot CPU
* index that will be servicing the interrupts from the IRQ source. The
* default is to let the first CPU (the boot cpu) to handle all
* interrupts (all zeros).
*/
extern const unsigned char LEON3_irq_to_cpu[32];
#endif
#ifdef __cplusplus
}

2
c/src/lib/libbsp/sparc/leon3/startup/bspsmp.c
View File

@@ -24,7 +24,7 @@
/* Irq used by shared memory driver and for inter-processor interrupts.
* Can be overridden by being defined in the application.
*/
unsigned char LEON3_mp_irq __attribute__((weak)) = 14;
const unsigned char LEON3_mp_irq __attribute__((weak)) = 14;
#if !defined(__leon__) || defined(RTEMS_PARAVIRT)
uint32_t _CPU_SMP_Get_current_processor( void )

39
c/src/lib/libbsp/sparc/shared/irq/irq-shared.c
View File

@@ -2,6 +2,31 @@
#include <bsp.h>
#include <bsp/irq-generic.h>
#if defined(RTEMS_SMP) && defined(LEON3)
/* Interrupt to CPU map. Default to CPU0 since in BSS. */
const unsigned char LEON3_irq_to_cpu[32] __attribute__((weak));
/* On SMP use map table above relative to SMP Boot CPU (normally CPU0) */
static inline int bsp_irq_cpu(int irq)
{
/* protect from bad user configuration, default to boot cpu */
if (rtems_configuration_get_maximum_processors() <= LEON3_irq_to_cpu[irq])
return LEON3_Cpu_Index;
else
return LEON3_Cpu_Index + LEON3_irq_to_cpu[irq];
}
#else
/* when not SMP the local CPU is returned */
static inline int bsp_irq_cpu(int irq)
{
#ifdef LEON3
return _LEON3_Get_current_processor();
#else
return 0;
#endif
}
#endif
static inline void bsp_dispatch_irq(int irq)
{
bsp_interrupt_handler_entry *e =
@@ -54,26 +79,28 @@ rtems_status_code bsp_interrupt_facility_initialize(void)
rtems_status_code bsp_interrupt_vector_enable(rtems_vector_number vector)
{
BSP_Unmask_interrupt((int)vector);
int irq = (int)vector;
BSP_Cpu_Unmask_interrupt(irq, bsp_irq_cpu(irq));
return RTEMS_SUCCESSFUL;
return RTEMS_SUCCESSFUL;
}
rtems_status_code bsp_interrupt_vector_disable(rtems_vector_number vector)
{
BSP_Mask_interrupt((int)vector);
int irq = (int)vector;
BSP_Cpu_Mask_interrupt(irq, bsp_irq_cpu(irq));
return RTEMS_SUCCESSFUL;
return RTEMS_SUCCESSFUL;
}
void BSP_shared_interrupt_mask(int irq)
{
BSP_Mask_interrupt(irq);
BSP_Cpu_Mask_interrupt(irq, bsp_irq_cpu(irq));
}
void BSP_shared_interrupt_unmask(int irq)
{
BSP_Unmask_interrupt(irq);
BSP_Cpu_Unmask_interrupt(irq, bsp_irq_cpu(irq));
}
void BSP_shared_interrupt_clear(int irq)