Skip to content

Commit b6684f5

Browse files
jsun26intelwenlingz
authored andcommitted
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 <victor.sun@intel.com>
1 parent 64bf4fb commit b6684f5

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

hypervisor/arch/x86/configs/whl-ipc-i5.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ CONFIG_BOARD="whl-ipc-i5"
66
CONFIG_SERIAL_LEGACY=y
77
CONFIG_SERIAL_PIO_BASE=0x3F8
88
CONFIG_HV_RAM_START=0x11000000
9-
CONFIG_HV_RAM_SIZE=0x7800000
109
CONFIG_RDT_ENABLED=n

hypervisor/arch/x86/configs/whl-ipc-i5/misc_cfg.h

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,25 @@
88
#ifndef MISC_CFG_H
99
#define MISC_CFG_H
1010

11-
#define MAX_PCPU_NUM 4U
11+
#define MAX_PCPU_NUM 4U
1212
#define MAX_PLATFORM_CLOS_NUM 0U
13+
1314
#define ROOTFS_0 "root=/dev/nvme0n1p3 "
1415
#define ROOTFS_1 "root=/dev/sda3 "
1516

17+
#define SOS_ROOTFS ROOTFS_1
18+
#define SOS_CONSOLE "console=ttyS0 "
19+
#define SOS_COM1_BASE 0x3F8U
20+
#define SOS_COM1_IRQ 4U
21+
#define SOS_COM2_BASE 0x2F8U
22+
#define SOS_COM2_IRQ 3U
1623

24+
#ifndef CONFIG_RELEASE
25+
#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000 " \
26+
"memmap=0x200000$0x1fe00000 "
27+
#else
28+
#define SOS_BOOTARGS_DIFF ""
29+
#endif
1730

1831
#define MAX_HIDDEN_PDEVS_NUM 0U
1932

hypervisor/arch/x86/configs/whl-ipc-i5/whl-ipc-i5_acpi_info.h renamed to hypervisor/arch/x86/configs/whl-ipc-i5/platform_acpi_info.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#define PM1A_EVT_ADDRESS 0x1800UL
2828
#define PM1A_EVT_ACCESS_SIZE 0x2U
2929
#define PM1A_CNT_ADDRESS 0x1804UL
30-
/* S3 is not supported by BIOS */
3130

31+
/* S3 is not supported by BIOS */
3232
#undef S3_PKG_VAL_PM1A
3333
#define S3_PKG_VAL_PM1A 0x0U
3434

0 commit comments

Comments
 (0)