From e967efc95dbb6eae2bf27c2bd629109979fe33a0 Mon Sep 17 00:00:00 2001 From: Victor Sun Date: Thu, 16 Jul 2020 13:01:30 +0800 Subject: [PATCH] HV: Make: simplify acpi info header file check Previously we have complicated check mechanism on platform_acpi_info.h which is supposed to be generated by acrn-config tool, but given the reality that all configurations should be generated by acrn-config before build acrn hypervisor, this check is not needed anymore. Tracked-On: #5077 Signed-off-by: Victor Sun Reviewed-by: Jason Chen CJ Acked-by: Eddie Dong --- Makefile | 6 +----- hypervisor/Makefile | 38 ++----------------------------------- hypervisor/arch/x86/Kconfig | 9 --------- 3 files changed, 3 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index 9b14de72a..bca29b834 100644 --- a/Makefile +++ b/Makefile @@ -123,7 +123,6 @@ BUILD_TAG ?= HV_CFG_LOG = $(HV_OUT)/cfg.log VM_CONFIGS_DIR = $(T)/misc/vm_configs DEFCONFIG_FILE = scenarios/$(SCENARIO)/$(BOARD)/$(BOARD).config -GENED_ACPI_INFO_HEADER = $(VM_CONFIGS_DIR)/boards/$(BOARD)/$(BOARD)_acpi_info.h export TOOLS_OUT BOARD SCENARIO FIRMWARE RELEASE @@ -194,10 +193,7 @@ hypervisor: echo -e "\tSource code at:\t\t\t$(VM_CONFIGS_DIR)" >> $(HV_CFG_LOG); \ else \ echo -e "\tSource code at:\t\t\t$(TARGET_DIR)" >> $(HV_CFG_LOG); \ - fi; \ - if [ -f $(GENED_ACPI_INFO_HEADER) ] && [ "$(CONFIG_XML_ENABLED)" != "true" ] && [ "TARGET_DIR" = "" ]; then \ - echo -e "\033[33mWarning: The platform ACPI info is based on acrn-config generated $(GENED_ACPI_INFO_HEADER), please make sure its validity.\033[0m" >> $(HV_CFG_LOG); \ - fi + fi; @cat $(HV_CFG_LOG) devicemodel: tools diff --git a/hypervisor/Makefile b/hypervisor/Makefile index 14ad7fe3a..0fab62310 100644 --- a/hypervisor/Makefile +++ b/hypervisor/Makefile @@ -376,40 +376,6 @@ MODULES += $(SYS_INIT_MOD) DISTCLEAN_OBJS := $(shell find $(BASEDIR) -name '*.o') VERSION := $(HV_OBJDIR)/include/version.h -# Create platform_acpi_info.h -TEMPLATE_ACPI_INFO_HEADER := arch/x86/configs/platform_acpi_info.h -BOARDTEMPLATE_ACPI_INFO_HEADER := $(BOARD_INFO_DIR)/platform_acpi_info.h -SOURCE_ACPI_INFO_HEADER := $(BOARD_INFO_DIR)/$(BOARD)_acpi_info.h -TARGET_ACPI_INFO_HEADER := $(HV_OBJDIR)/include/platform_acpi_info.h - -$(TARGET_ACPI_INFO_HEADER): $(HV_OBJDIR)/$(HV_CONFIG) -ifeq ($(CONFIG_ENFORCE_VALIDATED_ACPI_INFO),y) - @if [ ! -f $(SOURCE_ACPI_INFO_HEADER) ]; then \ - echo "******* No ACPI info found *******" && \ - echo "Expected ACPI info header at $(SOURCE_ACPI_INFO_HEADER)" && \ - echo "" && \ - echo "The ACPI info header for this board is not available. Please use" && \ - echo "acrn-config tool for the target board to generate a validated one." && \ - echo "If you want to build the hypervisor with the template ACPI info," && \ - echo "unset ENFORCE_VALIDATED_ACPI_INFO using 'make menuconfig'." && \ - false; \ - else \ - echo "Found validated ACPI info file : $(SOURCE_ACPI_INFO_HEADER)"; \ - cp $(SOURCE_ACPI_INFO_HEADER) $(TARGET_ACPI_INFO_HEADER); \ - fi -else - @if [ -f $(SOURCE_ACPI_INFO_HEADER) ]; then \ - echo "Found validated ACPI info file : $(SOURCE_ACPI_INFO_HEADER)"; \ - cp $(SOURCE_ACPI_INFO_HEADER) $(TARGET_ACPI_INFO_HEADER); \ - elif [ -f $(BOARDTEMPLATE_ACPI_INFO_HEADER) ]; then \ - echo "No ACPI info found, using the template at $(BOARDTEMPLATE_ACPI_INFO_HEADER) instead"; \ - cp $(BOARDTEMPLATE_ACPI_INFO_HEADER) $(TARGET_ACPI_INFO_HEADER); \ - else \ - echo "No ACPI info found, using the template at $(TEMPLATE_ACPI_INFO_HEADER) instead"; \ - cp $(TEMPLATE_ACPI_INFO_HEADER) $(TARGET_ACPI_INFO_HEADER); \ - fi -endif - .PHONY: all all: pre_build $(HV_OBJDIR)/$(HV_FILE).32.out $(HV_OBJDIR)/$(HV_FILE).bin @@ -425,7 +391,7 @@ install-debug: $(HV_OBJDIR)/$(HV_FILE).map $(HV_OBJDIR)/$(HV_FILE).out pre_build: $(PRE_BUILD_OBJS) .PHONY: header -header: $(VERSION) $(HV_OBJDIR)/$(HV_CONFIG_H) $(TARGET_ACPI_INFO_HEADER) +header: $(VERSION) $(HV_OBJDIR)/$(HV_CONFIG_H) .PHONY: lib-mod boot-mod hw-mod vp-base-mod vp-dm-mod vp-trusty-mod vp-hcall-mod sys-init-mod $(LIB_MOD): $(LIB_C_OBJS) $(LIB_S_OBJS) @@ -548,7 +514,7 @@ $(VERSION): $(HV_OBJDIR)/$(HV_CONFIG_H) -include $(C_OBJS:.o=.d) -include $(S_OBJS:.o=.d) -$(HV_OBJDIR)/%.o: %.c $(VERSION) $(HV_OBJDIR)/$(HV_CONFIG_H) $(TARGET_ACPI_INFO_HEADER) +$(HV_OBJDIR)/%.o: %.c $(VERSION) $(HV_OBJDIR)/$(HV_CONFIG_H) [ ! -e $@ ] && mkdir -p $(dir $@) && mkdir -p $(HV_MODDIR); \ $(CC) $(patsubst %, -I%, $(INCLUDE_PATH)) -I. -c $(CFLAGS) $(ARCH_CFLAGS) $< -o $@ -MMD -MT $@ diff --git a/hypervisor/arch/x86/Kconfig b/hypervisor/arch/x86/Kconfig index a3d84553a..f1c969c84 100644 --- a/hypervisor/arch/x86/Kconfig +++ b/hypervisor/arch/x86/Kconfig @@ -309,15 +309,6 @@ config MAX_MSIX_TABLE_NUM range 1 2048 default 64 -config ENFORCE_VALIDATED_ACPI_INFO - bool "Enforce the use of validated ACPI info table" - default n - help - When set, the use of validated ACPI info tables is enforced and using - an offline tool to generate such data is required. Otherwise a - warning will be printed when validated ACPI info is unavailable, but - a binary can still be built with the ACPI info template. - config L1D_FLUSH_VMENTRY_ENABLED bool "Enable L1 cache flush before VM entry" default n