github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-28 08:16:54 +00:00
Code Issues Projects Releases Wiki Activity

HV: remove CONFIG_CONSTANT_ACPI from Kconfig

Browse Source 
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 <victor.sun@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Victor Sun 2019-05-06 19:19:15 +08:00 committed by wenlingz
parent e2d723d4fa
commit ad3658ee17
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hypervisor/arch/x86/Kconfig
View File

@ -235,15 +235,6 @@ config SOS_RAM_SIZE
A 64-bit integer indicating the size of the User OS RAM (MMIO not 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. 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 config DMAR_PARSE_ENABLED
bool "Enable ACPI DMA Remapping tables parsing" bool "Enable ACPI DMA Remapping tables parsing"
default y default y

4
hypervisor/boot/acpi.c
View File

@ -340,8 +340,8 @@ void *get_dmar_table(void)
* *
* The second type of table, the ACPI Data Table, could be parsed here. * 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 * When ACRN go FuSa, the platform ACPI data should be fixed. The MACRO of
* Kconfig of CONSTANT_ACPI will be set to yes, then this code is not needed. * CONFIG_CONSTANT_ACPI will be defined, then this code is not needed.
*/ */
#define ACPI_SIG_FACS 0x53434146U /* "FACS" */ #define ACPI_SIG_FACS 0x53434146U /* "FACS" */

2
hypervisor/boot/include/acpi.h
View File

@ -7,6 +7,8 @@
#ifndef ACPI_H #ifndef ACPI_H
#define ACPI_H #define ACPI_H
#include <vm_configurations.h>
struct ioapic_info; struct ioapic_info;
uint16_t parse_madt(uint32_t lapic_id_array[CONFIG_MAX_PCPU_NUM]); uint16_t parse_madt(uint32_t lapic_id_array[CONFIG_MAX_PCPU_NUM]);
uint16_t parse_madt_ioapic(struct ioapic_info *ioapic_id_array); uint16_t parse_madt_ioapic(struct ioapic_info *ioapic_id_array);

3
hypervisor/scenarios/logical_partition/vm_configurations.h
View File

@ -9,6 +9,9 @@
#include <pci_devices.h> #include <pci_devices.h>
/* 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 */ /* 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 #define DM_OWNED_GUEST_FLAG_MASK 0UL