github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-26 15:31:35 +00:00
Code Issues Projects Releases Wiki Activity

acrn-config: Add functionality to find unused vbar base

Browse Source 
Allocate unused vbar for SOS and pre-launched VMs.

- For SOS, find unused vbar in the range which is assigned to pci host
bridge. The allocated vbar cannot have confilicts with any existing pci devices
- For pre-launched VMs, find unused vbar in the range 0x80000000 to
0xfffffff. The alloacted vbar cannot have confilicts with any
passthrough devices and mmio.

Tracked-On: #5426
Signed-off-by: Yang, Yu-chu <yu-chu.yang@intel.com>
This commit is contained in:
Yang,Yu-chu 2020-10-24 01:50:17 -07:00 committed by wenlingz
parent b23374ccc9
commit bda53a3599
2 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
misc/acrn-config/board_config/vbar_base_h.py
View File

@ -212,15 +212,23 @@ def generate_file(config):
if all((d not in pci_devs_per_vm[i] for i in pci_devs_per_vm))
]
mmiolist_per_vm = {}
for vm_i in pci_devs_per_vm:
vm_type = common.VM_TYPES[vm_i]
if scenario_cfg_lib.VM_DB[vm_type]['load_type'] == "SOS_VM":
pci_devs_per_vm[vm_i] = sos_bdf_list
mmiolist_per_vm = {}
for vm_i,vm_type in common.VM_TYPES.items():
if vm_i not in mmiolist_per_vm.keys():
mmiolist_per_vm[vm_i] = []
if scenario_cfg_lib.VM_DB[vm_type]['load_type'] == "SOS_VM":
# pci_devs_per_vm[vm_i] = sos_bdf_list
mmiolist_per_vm[vm_i] = non_matching_mmios
else:
match, _ = get_mmio_windows_with_key(pci_devs[vm_i])
mmiolist_per_vm[vm_i] = match
if vm_i in pci_devs.keys():
match, _ = get_mmio_windows_with_key(pci_devs[vm_i])
mmiolist_per_vm[vm_i] = match
if scenario_cfg_lib.VM_DB[vm_type]['load_type'] == "PRE_LAUNCHED_VM":
if vm_i not in mmiolist_per_vm.keys():
mmiolist_per_vm[vm_i] = []
@ -240,11 +248,14 @@ def generate_file(config):
print(VBAR_INFO_DEFINE, file=config)
common.get_vm_types()
pre_vm = False
sos_vm = False
for vm_type in common.VM_TYPES.values():
if scenario_cfg_lib.VM_DB[vm_type]['load_type'] == "PRE_LAUNCHED_VM":
pre_vm = True
if scenario_cfg_lib.VM_DB[vm_type]['load_type'] == "SOS_VM":
sos_vm = True
if not pre_vm:
if not pre_vm and not sos_vm:
print(VBAR_INFO_ENDIF, file=config)
return
@ -266,7 +277,7 @@ def generate_file(config):
else:
print("#define IVSHMEM_DEVICE_%-23s" % (str(index) + "_VBAR"),
" .vbar_base[{}] = {}UL, \\".format(bar_i, bar_attr.addr), file=config)
bar_0 = MmioWindow(start = int(bar_attr.addr, 16), end = int(bar_attr.addr, 16) + 0x200100)
bar_0 = MmioWindow(start = int(bar_attr.addr, 16), end = int(bar_attr.addr, 16) + 0x100 - 1)
mmiolist_per_vm[vm_id].append(bar_0)
mmiolist_per_vm[vm_id].sort()
elif i_cnt == len(bar_attr_dic.keys()):
@ -287,7 +298,7 @@ def generate_file(config):
except:
int_size = 0
bar_2 = int(bar_attr.addr, 16)
mmiolist_per_vm[vm_id].append(MmioWindow(start = bar_2, end = bar_2 + int_size + 0x200000))
mmiolist_per_vm[vm_id].append(MmioWindow(start = bar_2, end = bar_2 + int_size - 1))
mmiolist_per_vm[vm_id].sort()
print("", file=config)

21
misc/acrn-config/library/common.py
View File

@ -415,6 +415,27 @@ def get_vuart_info_id(config_file, idx):
return tmp_tag
def get_vuart_info(config_file):
tmp_tag = {}
vm_id = 0
root = get_config_root(config_file)
for item in root:
if item.tag == "vm":
vm_id = int(item.attrib['id'])
tmp_tag[vm_id] = {}
for sub in item:
tmp_vuart = {}
for leaf in sub:
if sub.tag == "console_vuart" or sub.tag == "communication_vuart":
vuart_id = int(sub.attrib['id'])
tmp_vuart = get_vuart_id(tmp_vuart, leaf.tag, leaf.text)
if tmp_vuart:
tmp_tag[vm_id][vuart_id] = tmp_vuart
return tmp_tag
def get_hv_item_tag(config_file, branch_tag, tag_str='', leaf_str=''):