From ad3658ee17ae378f0d914052e2e1d011df54251b Mon Sep 17 00:00:00 2001 From: Victor Sun Date: Mon, 6 May 2019 19:19:15 +0800 Subject: [PATCH] HV: remove CONFIG_CONSTANT_ACPI from Kconfig The MACRO of CONFIG_CONSTANT_ACPI will be defined per scenario usage, so move it from Kconfig to vm_configurations.h; Tracked-On: #2291 Signed-off-by: Victor Sun Acked-by: Eddie Dong --- hypervisor/arch/x86/Kconfig | 9 --------- hypervisor/boot/acpi.c | 4 ++-- hypervisor/boot/include/acpi.h | 2 ++ .../scenarios/logical_partition/vm_configurations.h | 3 +++ 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/hypervisor/arch/x86/Kconfig b/hypervisor/arch/x86/Kconfig index 03eb9a62c..1956c113f 100644 --- a/hypervisor/arch/x86/Kconfig +++ b/hypervisor/arch/x86/Kconfig @@ -235,15 +235,6 @@ config SOS_RAM_SIZE A 64-bit integer indicating the size of the User OS RAM (MMIO not included). Now we assume each UOS uses same amount of RAM size. -config CONSTANT_ACPI - bool "The platform ACPI info is constant" - default n - help - Whether constant ACPI tables shall be used. If selected, the built-in - ACPI tables, usually generated on target platforms by an offline tool, - will be used. If not a fixup subroutine will be invoked to update the - built-in tables after parsing the real ACPI tables at runtime. - config DMAR_PARSE_ENABLED bool "Enable ACPI DMA Remapping tables parsing" default y diff --git a/hypervisor/boot/acpi.c b/hypervisor/boot/acpi.c index d5c54e0fb..e544c4f17 100644 --- a/hypervisor/boot/acpi.c +++ b/hypervisor/boot/acpi.c @@ -340,8 +340,8 @@ void *get_dmar_table(void) * * The second type of table, the ACPI Data Table, could be parsed here. * - * When ACRN go production, the platform ACPI data should be fixed. The - * Kconfig of CONSTANT_ACPI will be set to yes, then this code is not needed. + * When ACRN go FuSa, the platform ACPI data should be fixed. The MACRO of + * CONFIG_CONSTANT_ACPI will be defined, then this code is not needed. */ #define ACPI_SIG_FACS 0x53434146U /* "FACS" */ diff --git a/hypervisor/boot/include/acpi.h b/hypervisor/boot/include/acpi.h index dc6b93f3a..af644d4c8 100644 --- a/hypervisor/boot/include/acpi.h +++ b/hypervisor/boot/include/acpi.h @@ -7,6 +7,8 @@ #ifndef ACPI_H #define ACPI_H +#include + struct ioapic_info; uint16_t parse_madt(uint32_t lapic_id_array[CONFIG_MAX_PCPU_NUM]); uint16_t parse_madt_ioapic(struct ioapic_info *ioapic_id_array); diff --git a/hypervisor/scenarios/logical_partition/vm_configurations.h b/hypervisor/scenarios/logical_partition/vm_configurations.h index 064fb8ef8..795c1f1bc 100644 --- a/hypervisor/scenarios/logical_partition/vm_configurations.h +++ b/hypervisor/scenarios/logical_partition/vm_configurations.h @@ -9,6 +9,9 @@ #include +/* Use constant ACPI info which defined in platform_acpi_info.h instead of parsing it. */ +#define CONFIG_CONSTANT_ACPI + /* Bits mask of guest flags that can be programmed by device model. Other bits are set by hypervisor only */ #define DM_OWNED_GUEST_FLAG_MASK 0UL