diff --git a/hypervisor/arch/x86/Kconfig b/hypervisor/arch/x86/Kconfig index 68a04936e..e1c5b8fa7 100644 --- a/hypervisor/arch/x86/Kconfig +++ b/hypervisor/arch/x86/Kconfig @@ -6,8 +6,6 @@ config SCENARIO to build the hypervisor. Currently ACRN provides below reference scenarios: sdc: Typical scenario for automotive Software Defined Cockpit system. sdc will have one pre-launched SOS VM and one post-launched VM; - sdc2: Extended scenario for automotive Software Defined Cockpit system. - sdc2 will have one pre-launched SOS VM and up to three post-launched VMs; industry: Typical scenario for industry usage with 8 VMs: one pre-launched SOS VM, one post-launched KATA VM, one post-launched RT VM for real-time control, and up to five post-launched Standard VMs; diff --git a/hypervisor/scenarios/sdc2/vm_configurations.c b/hypervisor/scenarios/sdc2/vm_configurations.c deleted file mode 100644 index 8ce9992b1..000000000 --- a/hypervisor/scenarios/sdc2/vm_configurations.c +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (C) 2018 Intel Corporation. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include -#include -#include - -struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = { - { /* VM0 */ - CONFIG_SOS_VM, - .name = "ACRN SOS VM", - - /* Allow SOS to reboot the host since there is supposed to be the highest severity guest */ - .guest_flags = 0UL, - .memory = { - .start_hpa = 0UL, - .size = CONFIG_SOS_RAM_SIZE, - }, - .os_config = { - .name = "ACRN Service OS", - .kernel_type = KERNEL_BZIMAGE, - .kernel_mod_tag = "Linux_bzImage", - .bootargs = SOS_VM_BOOTARGS, - }, - .vuart[0] = { - .type = VUART_LEGACY_PIO, - .addr.port_base = SOS_COM1_BASE, - .irq = SOS_COM1_IRQ, - }, - .vuart[1] = { - .type = VUART_LEGACY_PIO, - .addr.port_base = INVALID_COM_BASE, - }, - }, - { /* VM1 */ - CONFIG_POST_STD_VM(1), - .vcpu_num = 1U, - .vcpu_affinity = VM1_CONFIG_VCPU_AFFINITY, - .vuart[0] = { - .type = VUART_LEGACY_PIO, - .addr.port_base = INVALID_COM_BASE, - }, - .vuart[1] = { - .type = VUART_LEGACY_PIO, - .addr.port_base = INVALID_COM_BASE, - } - - }, - { /* VM2 */ - CONFIG_POST_STD_VM(2), - .vcpu_num = 1U, - .vcpu_affinity = VM2_CONFIG_VCPU_AFFINITY, - .vuart[0] = { - .type = VUART_LEGACY_PIO, - .addr.port_base = INVALID_COM_BASE, - }, - .vuart[1] = { - .type = VUART_LEGACY_PIO, - .addr.port_base = INVALID_COM_BASE, - } - - }, - { /* VM3 */ - CONFIG_POST_STD_VM(3), - .vcpu_num = 1U, - .vcpu_affinity = VM3_CONFIG_VCPU_AFFINITY, - .vuart[0] = { - .type = VUART_LEGACY_PIO, - .addr.port_base = INVALID_COM_BASE, - }, - .vuart[1] = { - .type = VUART_LEGACY_PIO, - .addr.port_base = INVALID_COM_BASE, - } - - } -}; diff --git a/hypervisor/scenarios/sdc2/vm_configurations.h b/hypervisor/scenarios/sdc2/vm_configurations.h deleted file mode 100644 index ad66c7bf4..000000000 --- a/hypervisor/scenarios/sdc2/vm_configurations.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2018 Intel Corporation. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef VM_CONFIGURATIONS_H -#define VM_CONFIGURATIONS_H - -#include - -/* SOS_VM_NUM can only be 0U or 1U; - * When SOS_VM_NUM is 0U, MAX_POST_VM_NUM must be 0U too; - * MAX_POST_VM_NUM must be bigger than CONFIG_MAX_KATA_VM_NUM; - */ -#define PRE_VM_NUM 0U -#define SOS_VM_NUM 1U -#define MAX_POST_VM_NUM 3U -#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 */ -#define DM_OWNED_GUEST_FLAG_MASK (GUEST_FLAG_SECURE_WORLD_ENABLED | GUEST_FLAG_LAPIC_PASSTHROUGH | \ - GUEST_FLAG_RT | GUEST_FLAG_IO_COMPLETION_POLLING) - -#define SOS_VM_BOOTARGS SOS_ROOTFS \ - "rw rootwait " \ - "console=tty0 " \ - SOS_CONSOLE \ - "consoleblank=0 " \ - "no_timer_check " \ - "quiet loglevel=3 " \ - "i915.nuclear_pageflip=1 " \ - "i915.avail_planes_per_pipe=0x01010F " \ - "i915.domain_plane_owners=0x011111110000 " \ - "i915.enable_gvt=1 idle=halt " \ - SOS_BOOTARGS_DIFF - -#define VM1_CONFIG_VCPU_AFFINITY {AFFINITY_CPU(1U)} -#define VM2_CONFIG_VCPU_AFFINITY {AFFINITY_CPU(2U)} -#define VM3_CONFIG_VCPU_AFFINITY {AFFINITY_CPU(3U)} - -#endif /* VM_CONFIGURATIONS_H */