@@ -430,7 +430,7 @@ void bsp_boot_init(void)
430
430
CPU_CONTEXT_OFFSET_IA32_SPEC_CTRL ,
431
431
"run_context ia32_spec_ctrl offset not match" );
432
432
433
- __bitmap_set (CPU_BOOT_ID , & pcpu_active_bitmap );
433
+ __bitmap_set (BOOT_CPU_ID , & pcpu_active_bitmap );
434
434
435
435
/* Get CPU capabilities thru CPUID, including the physical address bit
436
436
* limit which is required for initializing paging.
@@ -467,7 +467,7 @@ static void bsp_boot_post(void)
467
467
cpu_xsave_init ();
468
468
469
469
/* Set state for this CPU to initializing */
470
- cpu_set_current_state (CPU_BOOT_ID , CPU_STATE_INITIALIZING );
470
+ cpu_set_current_state (BOOT_CPU_ID , CPU_STATE_INITIALIZING );
471
471
472
472
/* Perform any necessary BSP initialization */
473
473
init_bsp ();
@@ -502,7 +502,7 @@ static void bsp_boot_post(void)
502
502
503
503
pr_acrnlog ("Detect processor: %s" , boot_cpu_data .model_name );
504
504
505
- pr_dbg ("Core %hu is up" , CPU_BOOT_ID );
505
+ pr_dbg ("Core %hu is up" , BOOT_CPU_ID );
506
506
507
507
if (hardware_detect_support () != 0 ) {
508
508
pr_fatal ("hardware not support!\n" );
@@ -522,7 +522,7 @@ static void bsp_boot_post(void)
522
522
shell_init ();
523
523
524
524
/* Initialize interrupts */
525
- interrupt_init (CPU_BOOT_ID );
525
+ interrupt_init (BOOT_CPU_ID );
526
526
527
527
timer_init ();
528
528
setup_notification ();
@@ -536,7 +536,7 @@ static void bsp_boot_post(void)
536
536
/* Trigger event to allow secondary CPUs to continue */
537
537
__bitmap_set (0U , & pcpu_sync );
538
538
539
- ASSERT (get_cpu_id () == CPU_BOOT_ID , "" );
539
+ ASSERT (get_cpu_id () == BOOT_CPU_ID , "" );
540
540
541
541
if (init_iommu () != 0 ) {
542
542
pr_fatal ("%s, init iommu failed\n" , __func__ );
@@ -546,11 +546,11 @@ static void bsp_boot_post(void)
546
546
console_setup_timer ();
547
547
548
548
/* Start initializing the VM for this CPU */
549
- if (hv_main (CPU_BOOT_ID ) != 0 )
549
+ if (hv_main (BOOT_CPU_ID ) != 0 )
550
550
panic ("failed to start VM for bsp\n" );
551
551
552
552
/* Control should not come here */
553
- cpu_dead (CPU_BOOT_ID );
553
+ cpu_dead (BOOT_CPU_ID );
554
554
}
555
555
556
556
/* NOTE: this function is using temp stack, and after SWITCH_TO(runtime_sp, to)
@@ -928,7 +928,7 @@ static void cpu_xsave_init(void)
928
928
val64 |= CR4_OSXSAVE ;
929
929
CPU_CR_WRITE (cr4 , val64 );
930
930
931
- if (get_cpu_id () == CPU_BOOT_ID ) {
931
+ if (get_cpu_id () == BOOT_CPU_ID ) {
932
932
uint32_t ecx , unused ;
933
933
cpuid (CPUID_FEATURES , & unused , & unused , & ecx , & unused );
934
934
0 commit comments