Changeset 208cd6b in rtems

Timestamp:

May 31, 2020, 2:22:57 PM (8 months ago)

Author:

Jan Sommer <jan.sommer@…>

Branches:

5, master

Children:

6369daf

Parents:

c954003

git-author:

Jan Sommer <jan.sommer@…> (05/31/20 14:22:57)

git-committer:

Chris Johns <chrisj@…> (06/11/20 03:29:27)

Message:

bsps/pc386: Separate smp API functions. Makes smpfatal08 link

Files:

• bsps/i386/include/bsp/smp-imps.h (modified) (1 diff)
• bsps/i386/pc386/include/bsp.h (modified) (1 diff)
• bsps/i386/pc386/start/bspsmp.c (added)
• bsps/i386/pc386/start/getcpuid.c (deleted)
• bsps/i386/pc386/start/smp-imps.c (modified) (5 diffs)
• c/src/lib/libbsp/i386/pc386/Makefile.am (modified) (1 diff)

bsps/i386/include/bsp/smp-imps.h

@@ -234 +234 @@
 extern char _binary_appstart_bin_size[];
 
+/** @brief base address of the local apic. Usually 0xFEE00000 */
+extern unsigned imps_lapic_addr;
+
 /*
  *  Defines that use variables

bsps/i386/pc386/include/bsp.h

@@ -253 +253 @@
 void C_dispatch_isr(int vector);
 
+#ifdef RTEMS_SMP
+  /* CPU specific functions used by the SMP API */
+  int imps_probe(void);
+  void ipi_install_irq(void);
+  int send_ipi(unsigned int dst, unsigned int v);
+#endif
+
 #ifdef __cplusplus
 }

bsps/i386/pc386/start/smp-imps.c

@@ -85 +85 @@
 extern void _pc386_delay(void);
 extern uint32_t* gdtdesc;
+
+static int lapic_dummy = 0;
+unsigned imps_lapic_addr = ((unsigned)(&lapic_dummy)) - LAPIC_ID;
 
 /* #define KERNEL_PRINT(_format)       printk(_format) */
@@ -221 +224 @@
  *  APIC ICR write and status check function.
  */
-static int
+int
 send_ipi(unsigned int dst, unsigned int v)
 {
@@ -699 +702 @@
  *  Function finished.
  */
-static int
+int
 imps_probe(void)
 {
@@ -769 +772 @@
 }
 
-static void ipi_install_irq(void)
+void
+ipi_install_irq(void)
 {
   rtems_status_code status;
@@ -803 +807 @@
   _SMP_Start_multitasking_on_secondary_processor( _Per_CPU_Get() );
 }
-
-uint32_t _CPU_SMP_Initialize( void )
-{
-  /* XXX need to deal with finding too many cores */
-
-  return (uint32_t) imps_probe();
-}
-
-void _CPU_SMP_Prepare_start_multitasking( void )
-{
-  /* Do nothing */
-}
-
-bool _CPU_SMP_Start_processor( uint32_t cpu_index )
-{
-  (void) cpu_index;
-
-  return true;
-}
-
-void _CPU_SMP_Finalize_initialization( uint32_t cpu_count )
-{
-  if ( cpu_count > 1 )
-    ipi_install_irq();
-}
-
-void _CPU_SMP_Send_interrupt( uint32_t target_processor_index )
-{
-  send_ipi( target_processor_index, 0x30 );
-}

c/src/lib/libbsp/i386/pc386/Makefile.am

@@ -111 +111 @@
 
 if HAS_SMP
-librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/getcpuid.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/smp-imps.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/bspsmp.c
 
 project_lib_DATA += appstart.$(OBJEXT)