From b6684f5b61e7094871e1217b465248fbe61872b2 Mon Sep 17 00:00:00 2001 From: Victor Sun Date: Thu, 5 Mar 2020 10:46:55 +0800 Subject: [PATCH] HV: sanitize config file for whl-ipc-i5 - remove limit of CONFIG_HV_RAM_SIZE which is for scenario of 2 VMs only, the default size from Kconfig could build scenario which up to 5 VMs; - rename whl-ipc-i5_acpi_info.h to platform_acpi_info.h, since the former one should be generated by acrn-config tool; - add SOS related macros in misc.h, otherwise build scenarios which has SOS VM would be failed; Tracked-On: #4463 Signed-off-by: Victor Sun --- hypervisor/arch/x86/configs/whl-ipc-i5.config | 1 - hypervisor/arch/x86/configs/whl-ipc-i5/misc_cfg.h | 15 ++++++++++++++- ...hl-ipc-i5_acpi_info.h => platform_acpi_info.h} | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) rename hypervisor/arch/x86/configs/whl-ipc-i5/{whl-ipc-i5_acpi_info.h => platform_acpi_info.h} (98%) diff --git a/hypervisor/arch/x86/configs/whl-ipc-i5.config b/hypervisor/arch/x86/configs/whl-ipc-i5.config index 77266588b..c4dd956a5 100644 --- a/hypervisor/arch/x86/configs/whl-ipc-i5.config +++ b/hypervisor/arch/x86/configs/whl-ipc-i5.config @@ -6,5 +6,4 @@ CONFIG_BOARD="whl-ipc-i5" CONFIG_SERIAL_LEGACY=y CONFIG_SERIAL_PIO_BASE=0x3F8 CONFIG_HV_RAM_START=0x11000000 -CONFIG_HV_RAM_SIZE=0x7800000 CONFIG_RDT_ENABLED=n diff --git a/hypervisor/arch/x86/configs/whl-ipc-i5/misc_cfg.h b/hypervisor/arch/x86/configs/whl-ipc-i5/misc_cfg.h index 1c92a4679..b46b3946f 100644 --- a/hypervisor/arch/x86/configs/whl-ipc-i5/misc_cfg.h +++ b/hypervisor/arch/x86/configs/whl-ipc-i5/misc_cfg.h @@ -8,12 +8,25 @@ #ifndef MISC_CFG_H #define MISC_CFG_H -#define MAX_PCPU_NUM 4U +#define MAX_PCPU_NUM 4U #define MAX_PLATFORM_CLOS_NUM 0U + #define ROOTFS_0 "root=/dev/nvme0n1p3 " #define ROOTFS_1 "root=/dev/sda3 " +#define SOS_ROOTFS ROOTFS_1 +#define SOS_CONSOLE "console=ttyS0 " +#define SOS_COM1_BASE 0x3F8U +#define SOS_COM1_IRQ 4U +#define SOS_COM2_BASE 0x2F8U +#define SOS_COM2_IRQ 3U +#ifndef CONFIG_RELEASE +#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000 " \ + "memmap=0x200000$0x1fe00000 " +#else +#define SOS_BOOTARGS_DIFF "" +#endif #define MAX_HIDDEN_PDEVS_NUM 0U diff --git a/hypervisor/arch/x86/configs/whl-ipc-i5/whl-ipc-i5_acpi_info.h b/hypervisor/arch/x86/configs/whl-ipc-i5/platform_acpi_info.h similarity index 98% rename from hypervisor/arch/x86/configs/whl-ipc-i5/whl-ipc-i5_acpi_info.h rename to hypervisor/arch/x86/configs/whl-ipc-i5/platform_acpi_info.h index bf5f6bdcc..3b9080db2 100644 --- a/hypervisor/arch/x86/configs/whl-ipc-i5/whl-ipc-i5_acpi_info.h +++ b/hypervisor/arch/x86/configs/whl-ipc-i5/platform_acpi_info.h @@ -27,8 +27,8 @@ #define PM1A_EVT_ADDRESS 0x1800UL #define PM1A_EVT_ACCESS_SIZE 0x2U #define PM1A_CNT_ADDRESS 0x1804UL - /* S3 is not supported by BIOS */ +/* S3 is not supported by BIOS */ #undef S3_PKG_VAL_PM1A #define S3_PKG_VAL_PM1A 0x0U