diff --git a/misc/acrn-config/hv_config/board_defconfig.py b/misc/acrn-config/hv_config/board_defconfig.py index 3806780ab..25d341587 100644 --- a/misc/acrn-config/hv_config/board_defconfig.py +++ b/misc/acrn-config/hv_config/board_defconfig.py @@ -18,8 +18,8 @@ VM_NUM_MAP_TOTAL_HV_RAM_SIZE = { 2:0x7800000, # 150M 3:0x9600000, - # 180M - 4:0xB400000, + # 190M + 4:0xBE00000, # 210M 5:0xD200000, # 250M diff --git a/misc/vm_configs/scenarios/hybrid_rt/cfl-k700-i7/cfl-k700-i7.config b/misc/vm_configs/scenarios/hybrid_rt/cfl-k700-i7/cfl-k700-i7.config index 654c82813..9ffb8e8e7 100644 --- a/misc/vm_configs/scenarios/hybrid_rt/cfl-k700-i7/cfl-k700-i7.config +++ b/misc/vm_configs/scenarios/hybrid_rt/cfl-k700-i7/cfl-k700-i7.config @@ -2,7 +2,7 @@ CONFIG_BOARD="cfl-k700-i7" CONFIG_HV_RAM_START=0x11000000 -CONFIG_HV_RAM_SIZE=0x9800000 +CONFIG_HV_RAM_SIZE=0xc000000 CONFIG_PLATFORM_RAM_SIZE=0x800000000 CONFIG_LOW_RAM_SIZE=0x00010000 CONFIG_SOS_RAM_SIZE=0x800000000 diff --git a/misc/vm_configs/scenarios/hybrid_rt/cfl-k700-i7/misc_cfg.h b/misc/vm_configs/scenarios/hybrid_rt/cfl-k700-i7/misc_cfg.h index ccdb46d08..cd20d1383 100644 --- a/misc/vm_configs/scenarios/hybrid_rt/cfl-k700-i7/misc_cfg.h +++ b/misc/vm_configs/scenarios/hybrid_rt/cfl-k700-i7/misc_cfg.h @@ -21,12 +21,13 @@ "no_timer_check " \ "hvlog=2M@0xe00000 " \ "memmap=0x200000$0xe00000 " \ - "maxcpus=2" + "maxcpus=6" -#define VM0_CONFIG_CPU_AFFINITY (AFFINITY_CPU(2U) | AFFINITY_CPU(3U)) +#define VM0_CONFIG_CPU_AFFINITY (AFFINITY_CPU(6U) | AFFINITY_CPU(7U)) -#define SOS_VM_CONFIG_CPU_AFFINITY (AFFINITY_CPU(0U) | AFFINITY_CPU(1U)) -#define VM2_CONFIG_CPU_AFFINITY (AFFINITY_CPU(1U)) +#define SOS_VM_CONFIG_CPU_AFFINITY (AFFINITY_CPU(0U) | AFFINITY_CPU(1U) | AFFINITY_CPU(2U) | AFFINITY_CPU(3U) | AFFINITY_CPU(4U) | AFFINITY_CPU(5U)) +#define VM2_CONFIG_CPU_AFFINITY (AFFINITY_CPU(0U) | AFFINITY_CPU(1U) | AFFINITY_CPU(2U) | AFFINITY_CPU(3U)) +#define VM3_CONFIG_CPU_AFFINITY (AFFINITY_CPU(4U) | AFFINITY_CPU(5U)) #ifdef CONFIG_RDT_ENABLED diff --git a/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/ehl-crb-b.config b/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/ehl-crb-b.config index 133db0a4e..163aee49a 100644 --- a/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/ehl-crb-b.config +++ b/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/ehl-crb-b.config @@ -2,7 +2,7 @@ CONFIG_BOARD="ehl-crb-b" CONFIG_HV_RAM_START=0x11000000 -CONFIG_HV_RAM_SIZE=0x9800000 +CONFIG_HV_RAM_SIZE=0xc000000 CONFIG_PLATFORM_RAM_SIZE=0x400000000 CONFIG_LOW_RAM_SIZE=0x00010000 CONFIG_SOS_RAM_SIZE=0x400000000 diff --git a/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/misc_cfg.h b/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/misc_cfg.h index d54aa43c5..046cf399c 100644 --- a/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/misc_cfg.h +++ b/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/misc_cfg.h @@ -28,7 +28,8 @@ #define VM0_CONFIG_CPU_AFFINITY (AFFINITY_CPU(2U) | AFFINITY_CPU(3U)) #define SOS_VM_CONFIG_CPU_AFFINITY (AFFINITY_CPU(0U) | AFFINITY_CPU(1U)) -#define VM2_CONFIG_CPU_AFFINITY (AFFINITY_CPU(1U)) +#define VM2_CONFIG_CPU_AFFINITY (AFFINITY_CPU(0U) | AFFINITY_CPU(1U)) +#define VM3_CONFIG_CPU_AFFINITY (AFFINITY_CPU(1U)) #ifdef CONFIG_RDT_ENABLED @@ -71,7 +72,8 @@ #define VM0_VCPU_CLOS {0U} #define VM1_VCPU_CLOS {0U} -#define VM2_VCPU_CLOS {0U} +#define VM2_VCPU_CLOS {0U, 0U} +#define VM3_VCPU_CLOS {0U} #endif #define VM0_CONFIG_PCI_DEV_NUM 4U diff --git a/misc/vm_configs/scenarios/hybrid_rt/vm_configurations.c b/misc/vm_configs/scenarios/hybrid_rt/vm_configurations.c index 1fcb0ae7e..db4547991 100644 --- a/misc/vm_configs/scenarios/hybrid_rt/vm_configurations.c +++ b/misc/vm_configs/scenarios/hybrid_rt/vm_configurations.c @@ -121,4 +121,20 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = { .addr.port_base = INVALID_COM_BASE, }, }, + { /* VM3 */ + CONFIG_POST_STD_VM(2), +#ifdef CONFIG_RDT_ENABLED + .clos = VM3_VCPU_CLOS, +#endif + .cpu_affinity = VM3_CONFIG_CPU_AFFINITY, + .vuart[0] = { + .type = VUART_LEGACY_PIO, + .addr.port_base = COM1_BASE, + .irq = COM1_IRQ, + }, + .vuart[1] = { + .type = VUART_LEGACY_PIO, + .addr.port_base = INVALID_COM_BASE, + }, + }, }; diff --git a/misc/vm_configs/scenarios/hybrid_rt/vm_configurations.h b/misc/vm_configs/scenarios/hybrid_rt/vm_configurations.h index f2363ffd1..357002a59 100644 --- a/misc/vm_configs/scenarios/hybrid_rt/vm_configurations.h +++ b/misc/vm_configs/scenarios/hybrid_rt/vm_configurations.h @@ -15,7 +15,7 @@ */ #define PRE_VM_NUM 1U #define SOS_VM_NUM 1U -#define MAX_POST_VM_NUM 1U +#define MAX_POST_VM_NUM 2U #define CONFIG_MAX_KATA_VM_NUM 0U /* Bits mask of guest flags that can be programmed by device model. Other bits are set by hypervisor only */ diff --git a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/misc_cfg.h b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/misc_cfg.h index 8730b8e02..1c072b1bf 100644 --- a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/misc_cfg.h +++ b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/misc_cfg.h @@ -29,7 +29,8 @@ #define VM0_CONFIG_CPU_AFFINITY (AFFINITY_CPU(2U) | AFFINITY_CPU(3U)) #define SOS_VM_CONFIG_CPU_AFFINITY (AFFINITY_CPU(0U) | AFFINITY_CPU(1U)) -#define VM2_CONFIG_CPU_AFFINITY (AFFINITY_CPU(1U)) +#define VM2_CONFIG_CPU_AFFINITY (AFFINITY_CPU(0U) | AFFINITY_CPU(1U)) +#define VM3_CONFIG_CPU_AFFINITY (AFFINITY_CPU(1U)) #ifdef CONFIG_RDT_ENABLED diff --git a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/whl-ipc-i5.config b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/whl-ipc-i5.config index 58412f5ed..3dc1370e1 100644 --- a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/whl-ipc-i5.config +++ b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/whl-ipc-i5.config @@ -2,7 +2,7 @@ CONFIG_BOARD="whl-ipc-i5" CONFIG_HV_RAM_START=0x11000000 -CONFIG_HV_RAM_SIZE=0x9800000 +CONFIG_HV_RAM_SIZE=0xc000000 CONFIG_PLATFORM_RAM_SIZE=0x400000000 CONFIG_LOW_RAM_SIZE=0x00010000 CONFIG_SOS_RAM_SIZE=0x400000000 diff --git a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/misc_cfg.h b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/misc_cfg.h index 8730b8e02..1c072b1bf 100644 --- a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/misc_cfg.h +++ b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/misc_cfg.h @@ -29,7 +29,8 @@ #define VM0_CONFIG_CPU_AFFINITY (AFFINITY_CPU(2U) | AFFINITY_CPU(3U)) #define SOS_VM_CONFIG_CPU_AFFINITY (AFFINITY_CPU(0U) | AFFINITY_CPU(1U)) -#define VM2_CONFIG_CPU_AFFINITY (AFFINITY_CPU(1U)) +#define VM2_CONFIG_CPU_AFFINITY (AFFINITY_CPU(0U) | AFFINITY_CPU(1U)) +#define VM3_CONFIG_CPU_AFFINITY (AFFINITY_CPU(1U)) #ifdef CONFIG_RDT_ENABLED diff --git a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/whl-ipc-i7.config b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/whl-ipc-i7.config index c4400f182..67862bbf8 100644 --- a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/whl-ipc-i7.config +++ b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/whl-ipc-i7.config @@ -2,7 +2,7 @@ CONFIG_BOARD="whl-ipc-i7" CONFIG_HV_RAM_START=0x11000000 -CONFIG_HV_RAM_SIZE=0x9800000 +CONFIG_HV_RAM_SIZE=0xc000000 CONFIG_PLATFORM_RAM_SIZE=0x400000000 CONFIG_LOW_RAM_SIZE=0x00010000 CONFIG_SOS_RAM_SIZE=0x400000000