hv: merge SBL and UEFI related stuff under bsp

This patch unifies the bsp interface between UEFI and SBL.

Tracked-On: #2708
Signed-off-by: Tw <wei.tan@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>

hypervisor/arch/x86/cpu.c

@@ -25,6 +25,7 @@
 #include <ld_sym.h>
 #include <logmsg.h>
 #include <cat.h>
+#include <firmware.h>
 
 struct per_cpu_region per_cpu_data[CONFIG_MAX_PCPU_NUM] __aligned(PAGE_SIZE);
 static uint16_t phys_cpu_num = 0U;
@@ -112,6 +113,8 @@ void init_cpu_pre(uint16_t pcpu_id_args)
 		 */
 		init_cpu_capabilities();
 
+		init_firmware_operations();
+
 		init_cpu_model_name();
 
 		load_cpu_state_data();

hypervisor/arch/x86/init.c

@@ -62,8 +62,8 @@ static void enter_guest_mode(uint16_t pcpu_id)
 
 static void init_primary_cpu_post(void)
 {
-	/* Perform any necessary BSP initialization */
-	init_bsp();
+	/* Perform any necessary firmware initialization */
+	init_firmware();
 
 	init_debug_pre();
 

hypervisor/arch/x86/irq.c

@@ -15,7 +15,7 @@
 #include <ioapic.h>
 #include <lapic.h>
 #include <softirq.h>
-#include <bsp_extern.h>
+#include <firmware.h>
 #include <dump.h>
 #include <logmsg.h>
 
@@ -480,5 +480,5 @@ void interrupt_init(uint16_t pcpu_id)
 	init_lapic(pcpu_id);
 	init_default_irqs(pcpu_id);
 
-	bsp_init_irq();
+	firmware_init_irq();
 }

hypervisor/arch/x86/trampoline.c

@@ -9,7 +9,7 @@
 #include <per_cpu.h>
 #include <trampoline.h>
 #include <reloc.h>
-#include <bsp_extern.h>
+#include <firmware.h>
 #include <ld_sym.h>
 
 static uint64_t trampoline_start16_paddr;
@@ -110,7 +110,7 @@ uint64_t prepare_trampoline(void)
 	uint64_t size, dest_pa, i;
 
 	size = (uint64_t)(&ld_trampoline_end - &ld_trampoline_start);
-	dest_pa = bsp_get_ap_trampoline();
+	dest_pa = firmware_get_ap_trampoline();
 
 	pr_dbg("trampoline code: %llx size %x", dest_pa, size);