diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-05-28 10:58:19 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-05-29 11:06:07 +0200 |
commit | 2f6108f93b3ee4dcc85b236593d4c57c7652bf1b (patch) | |
tree | 841e4daad0d7f0e1dcd7a6eb91271731662c77e4 /c/src/lib/libbsp/sparc | |
parent | smp: Delete bsp_smp_secondary_cpu_initialize() (diff) | |
download | rtems-2f6108f93b3ee4dcc85b236593d4c57c7652bf1b.tar.bz2 |
smp: Simplify SMP initialization sequence
Delete bsp_smp_wait_for(). Other parts of the system work without
timeout, e.g. the spinlocks. Using a timeout here does not make the
system more robust.
Delete bsp_smp_cpu_state and replace it with Per_CPU_State. The
Per_CPU_State follows the Score naming conventions. Add
_Per_CPU_Change_state() and _Per_CPU_Wait_for_state() functions to
change and observe states.
Use Per_CPU_State in Per_CPU_Control instead of the anonymous integer.
Add _CPU_Processor_event_broadcast() and _CPU_Processor_event_receive()
functions provided by the CPU port. Use these functions in
_Per_CPU_Change_state() and _Per_CPU_Wait_for_state().
Add prototype for _SMP_Send_message().
Delete RTEMS_BSP_SMP_FIRST_TASK message. The first context switch is
now performed in rtems_smp_secondary_cpu_initialize(). Issuing the
first context switch in the context of the inter-processor interrupt is
not possible on systems with a modern interrupt controller. Such an
interrupt controler usually requires a handshake protocol with interrupt
acknowledge and end of interrupt signals. A direct context switch in an
interrupt handler circumvents the interrupt processing epilogue and may
leave the system in an inconsistent state.
Release lock in rtems_smp_process_interrupt() even if no message was
delivered. This prevents deadlock of the system.
Simplify and format _SMP_Send_message(),
_SMP_Request_other_cores_to_perform_first_context_switch(),
_SMP_Request_other_cores_to_dispatch() and
_SMP_Request_other_cores_to_shutdown().
Diffstat (limited to 'c/src/lib/libbsp/sparc')
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/Makefile.am | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon2/Makefile.am | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c | 29 |
3 files changed, 8 insertions, 27 deletions
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am index ddb8d94c3b..988f3ec88a 100644 --- a/c/src/lib/libbsp/sparc/erc32/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am @@ -66,8 +66,7 @@ libbsp_a_SOURCES += \ ../../shared/src/irq-shell.c if HAS_SMP -libbsp_a_SOURCES += ../../shared/smp/getcpuid.c ../../shared/smp/smp_stub.c \ - ../../shared/smp/bspsmp_wait_for.c +libbsp_a_SOURCES += ../../shared/smp/getcpuid.c ../../shared/smp/smp_stub.c endif if HAS_NETWORKING diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am index 9699bf1a32..ae6dfb0155 100644 --- a/c/src/lib/libbsp/sparc/leon2/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am @@ -119,8 +119,7 @@ libbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c libbsp_a_SOURCES += timer/timer.c if HAS_SMP -libbsp_a_SOURCES += ../../shared/smp/getcpuid.c ../../shared/smp/smp_stub.c \ - ../../shared/smp/bspsmp_wait_for.c +libbsp_a_SOURCES += ../../shared/smp/getcpuid.c ../../shared/smp/smp_stub.c endif if HAS_NETWORKING diff --git a/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c b/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c index 6a9c189ec2..90818194cd 100644 --- a/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c +++ b/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c @@ -33,7 +33,7 @@ static inline unsigned int sparc_leon3_get_cctrl( void ) return v; } -rtems_isr bsp_ap_ipi_isr( +static rtems_isr bsp_ap_ipi_isr( rtems_vector_number vector ) { @@ -99,10 +99,11 @@ uint32_t bsp_smp_initialize( uint32_t configured_cpu_count ) bsp_smp_delay( 1000000 ); #if defined(RTEMS_DEBUG) printk( - "CPU %d is %s\n", - cpu, - ((_Per_CPU_Information[cpu].state == RTEMS_BSP_SMP_CPU_INITIALIZED) ? - "online" : "offline") + "CPU %d is %s\n", + cpu, + _Per_CPU_Information[cpu].state + == PER_CPU_STATE_READY_TO_BEGIN_MULTITASKING ? + "online" : "offline" ); #endif } @@ -160,21 +161,3 @@ void bsp_smp_delay( int max ) { __delay( max ); } - -void bsp_smp_wait_for( - volatile unsigned int *address, - unsigned int desired, - int maximum_usecs -) -{ - int iterations; - volatile unsigned int *p = address; - - for (iterations=0 ; iterations < maximum_usecs ; iterations++ ) { - if ( *p == desired ) - break; - bsp_smp_delay( 5000 ); - } -} - - |