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

score: Add RTEMS_FATAL_SOURCE_SMP

Browse Source 
Use rtems_fatal() instead of _CPU_Fatal_halt() to shutdown processors in
SMP configurations since this allows intervention of BSP or application
specific fatal extensions.
This commit is contained in:
Sebastian Huber
2014-02-17 13:46:11 +01:00
parent 46d7fa5cd3
commit 9eec2f33e9
6 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cpukit/sapi/src/fatalsrctext.c
View File

@@ -36,7 +36,8 @@ static const char *const fatal_source_text[] = {
"RTEMS_FATAL_SOURCE_BSP", "RTEMS_FATAL_SOURCE_BSP",
"RTEMS_FATAL_SOURCE_ASSERT", "RTEMS_FATAL_SOURCE_ASSERT",
"RTEMS_FATAL_SOURCE_STACK_CHECKER", "RTEMS_FATAL_SOURCE_STACK_CHECKER",
"RTEMS_FATAL_SOURCE_EXCEPTION" "RTEMS_FATAL_SOURCE_EXCEPTION",
"RTEMS_FATAL_SOURCE_SMP"
}; };
const char *rtems_fatal_source_text( rtems_fatal_source source ) const char *rtems_fatal_source_text( rtems_fatal_source source )

7
cpukit/score/include/rtems/score/interr.h
View File

@@ -103,6 +103,13 @@ typedef enum {
*/ */
RTEMS_FATAL_SOURCE_EXCEPTION, RTEMS_FATAL_SOURCE_EXCEPTION,
/**
* @brief Fatal source of SMP domain.
*
* @see SMP_Fatal_code.
*/
RTEMS_FATAL_SOURCE_SMP,
/** /**
* @brief The last available fatal source. * @brief The last available fatal source.
* *

7
cpukit/score/include/rtems/score/smp.h
View File

@@ -43,6 +43,13 @@ extern "C" {
#if !defined( ASM ) #if !defined( ASM )
/**
* @brief SMP fatal codes.
*/
typedef enum {
SMP_FATAL_SHUTDOWN
} SMP_Fatal_code;
#if defined( RTEMS_SMP ) #if defined( RTEMS_SMP )
SCORE_EXTERN uint32_t _SMP_Processor_count; SCORE_EXTERN uint32_t _SMP_Processor_count;

7
cpukit/score/src/smp.c
View File

@@ -23,6 +23,7 @@
#include <rtems/score/threadimpl.h> #include <rtems/score/threadimpl.h>
#include <rtems/score/smp.h> #include <rtems/score/smp.h>
#include <rtems/config.h> #include <rtems/config.h>
#include <rtems/fatal.h>
#if defined(RTEMS_DEBUG) #if defined(RTEMS_DEBUG)
#include <rtems/bspIo.h> #include <rtems/bspIo.h>
@@ -75,13 +76,9 @@ void rtems_smp_process_interrupt( void )
#endif #endif
if ( ( message & RTEMS_BSP_SMP_SHUTDOWN ) != 0 ) { if ( ( message & RTEMS_BSP_SMP_SHUTDOWN ) != 0 ) {
_ISR_Disable_without_giant( level );
_Thread_Dispatch_set_disable_level( 0 );
_Per_CPU_Change_state( self_cpu, PER_CPU_STATE_SHUTDOWN ); _Per_CPU_Change_state( self_cpu, PER_CPU_STATE_SHUTDOWN );
_CPU_Fatal_halt( _Per_CPU_Get_index( self_cpu ) ); rtems_fatal( RTEMS_FATAL_SOURCE_SMP, SMP_FATAL_SHUTDOWN );
/* does not continue past here */ /* does not continue past here */
} }
} }

2
testsuites/sptests/spinternalerror02/init.c
View File

@@ -49,7 +49,7 @@ static void test_fatal_source_text(void)
puts( text ); puts( text );
} while ( text != text_last ); } while ( text != text_last );
rtems_test_assert( source - 3 == RTEMS_FATAL_SOURCE_EXCEPTION ); rtems_test_assert( source - 3 == RTEMS_FATAL_SOURCE_SMP );
} }
static void test_status_text(void) static void test_status_text(void)

1
testsuites/sptests/spinternalerror02/spinternalerror02.scn
View File

@@ -36,6 +36,7 @@ RTEMS_FATAL_SOURCE_BSP
RTEMS_FATAL_SOURCE_ASSERT RTEMS_FATAL_SOURCE_ASSERT
RTEMS_FATAL_SOURCE_STACK_CHECKER RTEMS_FATAL_SOURCE_STACK_CHECKER
RTEMS_FATAL_SOURCE_EXCEPTION RTEMS_FATAL_SOURCE_EXCEPTION
RTEMS_FATAL_SOURCE_SMP
? ?
? ?
RTEMS_SUCCESSFUL RTEMS_SUCCESSFUL