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>

Author: tw4452852

hypervisor/Makefile

@@ -226,15 +226,16 @@ C_SRCS += dm/vpci/msi.c
 C_SRCS += dm/vpci/msix.c
 endif
 
+C_SRCS += bsp/firmware_wrapper.c
+C_SRCS += bsp/firmware_sbl.c
+C_SRCS += bsp/firmware_uefi.c
+C_SRCS += bsp/cmdline.c
+C_SRCS += bsp/const_dmar.c
+
 ifeq ($(CONFIG_PLATFORM_UEFI),y)
-INCLUDE_PATH += bsp/include/uefi
-C_SRCS += bsp/uefi/uefi.c
-C_SRCS += bsp/uefi/cmdline.c
 C_SRCS += boot/uefi/uefi_boot.c
 else
 ifeq ($(CONFIG_PLATFORM_SBL),y)
-C_SRCS += bsp/sbl/sbl.c
-C_SRCS += bsp/sbl/const_dmar.c
 C_SRCS += boot/sbl/multiboot.c
 C_SRCS += boot/sbl/sbl_seed_parse.c
 C_SRCS += boot/sbl/abl_seed_parse.c

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);
 

hypervisor/boot/acpi.c

@@ -146,7 +146,7 @@ static struct acpi_table_rsdp *get_rsdp(void)
 	struct acpi_table_rsdp *rsdp = NULL;
 	uint16_t *addr;
 
-	rsdp = (struct acpi_table_rsdp *)bsp_get_rsdp();
+	rsdp = (struct acpi_table_rsdp *)firmware_get_rsdp();
 	if (rsdp == NULL) {
 		/* EBDA is addressed by the 16 bit pointer at 0x40E */
 		addr = (uint16_t *)hpa2hva(0x40eUL);

hypervisor/boot/uefi/uefi_boot.c

@@ -9,19 +9,6 @@
 #include <boot_context.h>
 #include <uefi.h>
 
-static void efi_spurious_handler(int32_t vector)
-{
-	if (get_cpu_id() == BOOT_CPU_ID) {
-		struct acrn_vcpu *vcpu = per_cpu(vcpu, BOOT_CPU_ID);
-
-		if (vcpu != NULL) {
-			vlapic_set_intr(vcpu, vector, LAPIC_TRIG_EDGE);
-		} else {
-			pr_err("%s vcpu or vlapic is not ready, interrupt lost\n", __func__);
-		}
-	}
-}
-
 static int32_t uefi_sw_loader(struct acrn_vm *vm)
 {
 	int32_t ret = 0;
@@ -56,7 +43,6 @@ static int32_t uefi_sw_loader(struct acrn_vm *vm)
 int32_t init_vm_boot_info(__unused struct acrn_vm *vm)
 {
 	vm_sw_loader = uefi_sw_loader;
-	spurious_handler = (spurious_handler_t)efi_spurious_handler;
 
 	return 0;
 }

hypervisor/bsp/uefi/cmdline.c renamed to hypervisor/bsp/cmdline.c

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2019 Intel Corporation. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/* this is for both SBL and ABL platform */
+
+#include <hypervisor.h>
+#include <firmware_sbl.h>
+
+static void sbl_init(void)
+{
+	/* nothing to do for now */
+}
+
+
+/* @post: return != 0UL */
+static uint64_t sbl_get_ap_trampoline(void)
+{
+	return e820_alloc_low_memory(CONFIG_LOW_RAM_SIZE);
+}
+
+static void* sbl_get_rsdp(void)
+{
+	return NULL;
+}
+
+static void sbl_init_irq(void)
+{
+	CPU_IRQ_ENABLE();
+}
+
+static struct firmware_operations firmware_sbl_ops = {
+	.init = sbl_init,
+	.get_ap_trampoline = sbl_get_ap_trampoline,
+	.get_rsdp = sbl_get_rsdp,
+	.init_irq = sbl_init_irq,
+};
+
+struct firmware_operations* sbl_get_firmware_operations(void)
+{
+	return &firmware_sbl_ops;
+}