diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml index b5400e3a0..6ccb2ed18 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml @@ -36,8 +36,6 @@ 0x2000 - - 0x00010000 0x800000000 diff --git a/misc/config_tools/data/cfl-k700-i7/shared.xml b/misc/config_tools/data/cfl-k700-i7/shared.xml index e49e52e68..6b535af71 100644 --- a/misc/config_tools/data/cfl-k700-i7/shared.xml +++ b/misc/config_tools/data/cfl-k700-i7/shared.xml @@ -36,8 +36,6 @@ 0x2000 - 0x16800000 - 0x00010000 0x800000000 diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml index 693600c08..3e5ae619a 100644 --- a/misc/config_tools/data/generic_board/hybrid.xml +++ b/misc/config_tools/data/generic_board/hybrid.xml @@ -41,8 +41,6 @@ 0x2000 - - 0x00010000 0x400000000 diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml index 67c599b36..59525726e 100644 --- a/misc/config_tools/data/generic_board/partitioned.xml +++ b/misc/config_tools/data/generic_board/partitioned.xml @@ -41,8 +41,6 @@ 0x2000 - - 0x00010000 0x400000000 diff --git a/misc/config_tools/data/generic_board/shared.xml b/misc/config_tools/data/generic_board/shared.xml index d40da15f8..42ae89a5d 100644 --- a/misc/config_tools/data/generic_board/shared.xml +++ b/misc/config_tools/data/generic_board/shared.xml @@ -41,8 +41,6 @@ 0x2000 - - 0x00010000 0x400000000 diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid.xml b/misc/config_tools/data/nuc11tnbi5/hybrid.xml index 9595df72a..30fdb0308 100644 --- a/misc/config_tools/data/nuc11tnbi5/hybrid.xml +++ b/misc/config_tools/data/nuc11tnbi5/hybrid.xml @@ -41,8 +41,6 @@ 0x2000 - - 0x00010000 0x400000000 diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml index 8ec51269a..6168099ed 100644 --- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml +++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml @@ -41,8 +41,6 @@ 0x2000 - - 0x00010000 0x400000000 diff --git a/misc/config_tools/data/nuc11tnbi5/shared.xml b/misc/config_tools/data/nuc11tnbi5/shared.xml index b0f00a290..07b5b82a5 100644 --- a/misc/config_tools/data/nuc11tnbi5/shared.xml +++ b/misc/config_tools/data/nuc11tnbi5/shared.xml @@ -41,8 +41,6 @@ 0x2000 - - 0x00010000 0x400000000 diff --git a/misc/config_tools/data/qemu/sdc.xml b/misc/config_tools/data/qemu/sdc.xml index 15a9afea6..f6bf0d7db 100644 --- a/misc/config_tools/data/qemu/sdc.xml +++ b/misc/config_tools/data/qemu/sdc.xml @@ -36,7 +36,6 @@ 0x2000 - 0x07800000 0x11000000 0x00010000 0x100000000 diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml index 010b268a3..b9b2f0580 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml @@ -36,8 +36,6 @@ 0x2000 - - 0x00010000 0x400000000 diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml index 16f5bd895..1b8047673 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml @@ -36,8 +36,6 @@ 0x2000 - - 0x00010000 0x400000000 diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml index 71e38299a..7c4805ccb 100644 --- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml +++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml @@ -36,8 +36,6 @@ 0x2000 - - 0x00010000 0x400000000 diff --git a/misc/config_tools/data/whl-ipc-i5/sdc.xml b/misc/config_tools/data/whl-ipc-i5/sdc.xml index 1f7efa60e..a8335d98b 100644 --- a/misc/config_tools/data/whl-ipc-i5/sdc.xml +++ b/misc/config_tools/data/whl-ipc-i5/sdc.xml @@ -36,8 +36,6 @@ 0x2000 - - 0x00010000 0x400000000 diff --git a/misc/config_tools/data/whl-ipc-i5/shared.xml b/misc/config_tools/data/whl-ipc-i5/shared.xml index 156dd4604..28c0d3a3d 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared.xml @@ -36,8 +36,6 @@ 0x2000 - - 0x00010000 0x400000000 diff --git a/misc/config_tools/hv_config/board_defconfig.py b/misc/config_tools/hv_config/board_defconfig.py index 04a9efc4f..1d158cb61 100644 --- a/misc/config_tools/hv_config/board_defconfig.py +++ b/misc/config_tools/hv_config/board_defconfig.py @@ -107,10 +107,6 @@ def get_memory(hv_info, config): print("CONFIG_HV_RAM_START={}".format(hex(hv_start_addr)), file=config) else: print("CONFIG_HV_RAM_START={}".format(hv_info.mem.hv_ram_start), file=config) - if not hv_info.mem.hv_ram_size: - print("CONFIG_HV_RAM_SIZE={}".format(hex(hv_ram_size)), file=config) - else: - print("CONFIG_HV_RAM_SIZE={}".format(hv_info.mem.hv_ram_size), file=config) print("CONFIG_PLATFORM_RAM_SIZE={}".format(hv_info.mem.platform_ram_size), file=config) print("CONFIG_LOW_RAM_SIZE={}".format(hv_info.mem.low_ram_size), file=config) diff --git a/misc/config_tools/hv_config/hv_item.py b/misc/config_tools/hv_config/hv_item.py index c3f8503da..114bb1f46 100644 --- a/misc/config_tools/hv_config/hv_item.py +++ b/misc/config_tools/hv_config/hv_item.py @@ -150,7 +150,6 @@ class Memory: self.stack_size = 0 self.low_ram_size = 0 self.hv_ram_start = 0 - self.hv_ram_size = 0 self.platform_ram_size = 0 self.sos_ram_size = 0 self.uos_ram_size = 0 @@ -160,7 +159,6 @@ class Memory: def get_info(self): self.stack_size = common.get_hv_item_tag(self.hv_file, "MEMORY", "STACK_SIZE") self.low_ram_size = common.get_hv_item_tag(self.hv_file, "MEMORY", "LOW_RAM_SIZE") - self.hv_ram_size = common.get_hv_item_tag(self.hv_file, "MEMORY", "HV_RAM_SIZE") self.hv_ram_start = common.get_hv_item_tag(self.hv_file, "MEMORY", "HV_RAM_START") self.platform_ram_size = common.get_hv_item_tag(self.hv_file, "MEMORY", "PLATFORM_RAM_SIZE") self.ivshmem_enable = common.get_hv_item_tag(self.hv_file, "FEATURES", "IVSHMEM", "IVSHMEM_ENABLED") diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd index cd56386cd..cd5031755 100644 --- a/misc/config_tools/schema/config.xsd +++ b/misc/config_tools/schema/config.xsd @@ -195,12 +195,7 @@ physical core. Each core uses one stack for normal operation and another three for specific exceptions. - - - Size of the RAM region used by the hypervisor. - - - + The 2MB-aligned starting physical address of the RAM region used by the hypervisor. diff --git a/misc/config_tools/schema/types.xsd b/misc/config_tools/schema/types.xsd index f0cb41e3c..c7e6e61d9 100644 --- a/misc/config_tools/schema/types.xsd +++ b/misc/config_tools/schema/types.xsd @@ -26,20 +26,6 @@ - - - Either empty, or an Integer value in hexadecimal format. - - - - - - - Either empty, or an Integer value in hexadecimal format. - - - - Either empty, or an Integer value in hexadecimal format. diff --git a/misc/config_tools/static_allocators/hv_ram.py b/misc/config_tools/static_allocators/hv_ram.py deleted file mode 100644 index eb7cee2bb..000000000 --- a/misc/config_tools/static_allocators/hv_ram.py +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env python3 -# -# Copyright (C) 2021 Intel Corporation. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -import sys, os -sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'library')) -import common, board_cfg_lib, scenario_cfg_lib - -HV_RAM_SIZE_MAX = 0x40000000 - -MEM_ALIGN = 2 * common.SIZE_M - -def fn(board_etree, scenario_etree, allocation_etree): - # this dictonary mapped with 'address start':'mem range' - ram_range = {} - - post_launched_vm_num = 0 - for id in common.VM_TYPES: - if common.VM_TYPES[id] in scenario_cfg_lib.VM_DB and \ - scenario_cfg_lib.VM_DB[common.VM_TYPES[id]]["load_type"] == "POST_LAUNCHED_VM": - post_launched_vm_num += 1 - hv_ram_size = common.HV_BASE_RAM_SIZE + common.POST_LAUNCHED_VM_RAM_SIZE * post_launched_vm_num - - ivshmem_enabled = common.get_node("//IVSHMEM_ENABLED/text()", scenario_etree) - total_shm_size = 0 - if ivshmem_enabled == 'y': - raw_shmem_regions = scenario_etree.xpath("//IVSHMEM_REGION/text()") - for raw_shm in raw_shmem_regions: - if raw_shm.strip() == '': - continue - raw_shm_splited = raw_shm.split(',') - if len(raw_shm_splited) == 3 and raw_shm_splited[0].strip() != '' \ - and raw_shm_splited[1].strip() != '' and len(raw_shm_splited[2].strip().split(':')) >= 1: - try: - size = raw_shm_splited[1].strip() - int_size = int(size) * 0x100000 - total_shm_size += int_size - except Exception as e: - print(e) - hv_ram_size += 2 * max(total_shm_size, 0x200000) - assert(hv_ram_size <= HV_RAM_SIZE_MAX) - - # reseve 16M memory for hv sbuf, ramoops, etc. - reserved_ram = 0x1000000 - # We recommend to put hv ram start address high than 0x10000000 to - # reduce memory conflict with GRUB/SOS Kernel. - hv_start_offset = 0x10000000 - total_size = reserved_ram + hv_ram_size - for start_addr in list(board_cfg_lib.USED_RAM_RANGE): - if hv_start_offset <= start_addr < 0x80000000: - del board_cfg_lib.USED_RAM_RANGE[start_addr] - ram_range = board_cfg_lib.get_ram_range() - avl_start_addr = board_cfg_lib.find_avl_memory(ram_range, str(total_size), hv_start_offset) - hv_start_addr = int(avl_start_addr, 16) + int(hex(reserved_ram), 16) - hv_start_addr = common.round_up(hv_start_addr, MEM_ALIGN) - board_cfg_lib.USED_RAM_RANGE[hv_start_addr] = total_size - - common.append_node("/acrn-config/hv/MEMORY/HV_RAM_START", hex(hv_start_addr), allocation_etree) - common.append_node("/acrn-config/hv/MEMORY/HV_RAM_SIZE", hex(hv_ram_size), allocation_etree) diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl index e4bb228d4..0fc699595 100644 --- a/misc/config_tools/xforms/config_common.xsl +++ b/misc/config_tools/xforms/config_common.xsl @@ -140,11 +140,6 @@ - - - - -