acrn-config: Get vbar base and index for vmsix supported devices
Add functionality to get free vbar base for the vmsix devices. - The devices size is 4k. - The mmio range for non SOS VM is 2G to 4G - The mmio range for SOS is depended on the range which is assigned to PCI bus hostbridge - The next vbar index is based on last device vbar index vbar_i Tracked-On: #5422 Signed-off-by: Yang, Yu-chu <yu-chu.yang@intel.com>
This commit is contained in:
Yang, Yu-chu
wenlingz
parent
ec731bac0f
commit
d743aa9b42
|
|
@ -3,6 +3,9 @@
|
|||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
||||
import re
|
||||
from collections import namedtuple
|
||||
|
||||
import common
|
||||
import board_cfg_lib
|
||||
import scenario_cfg_lib
|
||||
|
|
@ -13,7 +16,47 @@ VBAR_INFO_DEFINE="""#ifndef VBAR_BASE_H_
|
|||
|
||||
VBAR_INFO_ENDIF="""#endif /* VBAR_BASE_H_ */"""
|
||||
|
||||
def write_vbar(i_cnt, bdf, pci_bar_dic, bar_attr, config):
|
||||
class MmioWindow(namedtuple(
|
||||
"MmioWindow", [
|
||||
"start",
|
||||
"end"])):
|
||||
|
||||
PATTERN = re.compile(r"\s*(?P<start>[0-9a-f]+)-(?P<end>[0-9a-f]+) ")
|
||||
|
||||
@classmethod
|
||||
def from_str(cls, value):
|
||||
if not isinstance(value, str):
|
||||
raise ValueError("value must be a str: {}".format(type(value)))
|
||||
|
||||
match = cls.PATTERN.fullmatch(value)
|
||||
if match:
|
||||
return MmioWindow(
|
||||
start=int(match.group("start"), 16),
|
||||
end=int(match.group("end"), 16))
|
||||
else:
|
||||
raise ValueError("not an mmio window: {!r}".format(value))
|
||||
|
||||
def overlaps(self, other):
|
||||
if not isinstance(other, MmioWindow):
|
||||
raise TypeError('overlaps() other must be an MmioWindow: {}'.format(type(other)))
|
||||
if other.end < self.start:
|
||||
return False
|
||||
if self.end < other.start:
|
||||
return False
|
||||
return True
|
||||
|
||||
|
||||
def get_devs_per_vm_with_key(pci_devs, keywords):
|
||||
devicelist = {}
|
||||
for vm_i, pci_devs_list in pci_devs.items():
|
||||
devicelist[vm_i] = [
|
||||
d for d in pci_devs_list if d in keywords
|
||||
]
|
||||
return devicelist
|
||||
|
||||
|
||||
def write_vbar(i_cnt, bdf, pci_bar_dic, bar_attr, \
|
||||
pci_devs_per_vm, mmiolist_per_vm, sos_mmio_range,config):
|
||||
"""
|
||||
Parser and generate vbar
|
||||
:param i_cnt: the number of pci devices have the same PCI sub class name
|
||||
|
|
@ -30,6 +73,21 @@ def write_vbar(i_cnt, bdf, pci_bar_dic, bar_attr, config):
|
|||
bar_list = list(pci_bar_dic[bdf].keys())
|
||||
bar_len = len(bar_list)
|
||||
bar_num = 0
|
||||
bar_val = ""
|
||||
free = MmioWindow(0, 0)
|
||||
is_vmsix = False
|
||||
# If the device is vmsix device, find a free mmio window up to 4k size
|
||||
for vm_i in pci_devs_per_vm:
|
||||
if bdf in pci_devs_per_vm[vm_i]:
|
||||
if scenario_cfg_lib.VM_DB[common.VM_TYPES[vm_i]]['load_type'] == "PRE_LAUNCHED_VM":
|
||||
is_vmsix = True
|
||||
bar_len += 1
|
||||
# For pre-launched VM, the windows range is form 2G to 4G
|
||||
free = get_free_mmio([MmioWindow(start=common.SIZE_2G, end=common.SIZE_4G-1)], \
|
||||
mmiolist_per_vm[vm_i], 4 * common.SIZE_K)
|
||||
mmiolist_per_vm[vm_i].append(free)
|
||||
mmiolist_per_vm[vm_i].sort()
|
||||
break
|
||||
for bar_i in bar_list:
|
||||
if not bar_attr.remappable:
|
||||
print("/* TODO: add {} 64bit BAR support */".format(tmp_sub_name), file=config)
|
||||
|
|
@ -48,10 +106,135 @@ def write_vbar(i_cnt, bdf, pci_bar_dic, bar_attr, config):
|
|||
print("#define %-38s" % (tmp_sub_name+"_VBAR"), " .vbar_base[{}] = {}{}UL, \\".format(bar_i, ptdev_mmio_str, bar_val), file=config)
|
||||
else:
|
||||
print("{}.vbar_base[{}] = {}{}UL, \\".format(align, bar_i, ptdev_mmio_str, bar_val), file=config)
|
||||
if is_vmsix:
|
||||
next_bar_idx = find_next_bar(bar_val, bar_list)
|
||||
print("{}.vbar_base[{}] = {}{}UL".format(align, next_bar_idx, ptdev_mmio_str, hex(free.start)), file=config)
|
||||
print("", file=config)
|
||||
|
||||
|
||||
def find_next_bar(bar_val, bar_list):
|
||||
pci_lines = board_cfg_lib.get_info(common.BOARD_INFO_FILE, "<PCI_DEVICE>", "</PCI_DEVICE>")
|
||||
idx = bar_list[-1]
|
||||
for line in pci_lines:
|
||||
if bar_val.split('x')[1] in line:
|
||||
if "32-bit" in line:
|
||||
idx += 1
|
||||
break
|
||||
elif "64-bit" in line:
|
||||
idx += 2
|
||||
break
|
||||
if int(idx) > 5:
|
||||
raise ValueError("Not enough bar region, last bar region is {}".format(idx))
|
||||
return idx
|
||||
|
||||
|
||||
def is_mmio_window_used(devinfo, keywords):
|
||||
for k in keywords:
|
||||
if k in devinfo:
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def get_mmio_windows_with_key(keywords):
|
||||
keyword_mmiolist = []
|
||||
exclusive_mmiolist = []
|
||||
iomem_lines = board_cfg_lib.get_info(common.BOARD_INFO_FILE, "<IOMEM_INFO>", "</IOMEM_INFO>")
|
||||
|
||||
for line in iomem_lines:
|
||||
mmio_range = line.split(':')[0]
|
||||
devmmio_tuple = MmioWindow.from_str(mmio_range)
|
||||
if is_mmio_window_used(line, keywords):
|
||||
keyword_mmiolist.append(devmmio_tuple)
|
||||
else:
|
||||
exclusive_mmiolist.append(devmmio_tuple)
|
||||
return sorted(keyword_mmiolist), sorted(exclusive_mmiolist)
|
||||
|
||||
|
||||
def removed_nested(list1, list2):
|
||||
if not list1 or not list2:
|
||||
raise ValueError("Invalid inputs: None, list1 is {}, \list2 is {}".format (list1, list2))
|
||||
|
||||
resolvedList = list1[:]
|
||||
for w1 in resolvedList:
|
||||
for w2 in list2:
|
||||
if w2.start <= w1.start <= w2.end and w2.start <= w1.end <= w2.end:
|
||||
resolvedList.remove(w1)
|
||||
return sorted(resolvedList)
|
||||
|
||||
|
||||
def merged_windows(windowslist):
|
||||
if not windowslist:
|
||||
return None
|
||||
|
||||
sortedlist = sorted(windowslist)
|
||||
resolvedList = []
|
||||
last = sortedlist[0]
|
||||
for cur in sortedlist:
|
||||
if cur.start <= last.end + 1:
|
||||
last = MmioWindow(start=last.start, end=max(last.end, cur.end))
|
||||
else:
|
||||
resolvedList.append(last)
|
||||
last = cur
|
||||
resolvedList.append(last)
|
||||
return sorted(resolvedList)
|
||||
|
||||
|
||||
def get_free_mmio(windowslist, used, size):
|
||||
for w in windowslist:
|
||||
window = MmioWindow(start=w.end-size+1, end=w.end)
|
||||
for u in used[::-1]:
|
||||
if window.overlaps(u):
|
||||
window = MmioWindow(start=u.start-size, end=u.start-1)
|
||||
continue
|
||||
if window.overlaps(w):
|
||||
return window
|
||||
raise ValueError("Not enough mmio window for a device size {}: {}".format(size, window))
|
||||
|
||||
|
||||
def generate_file(config):
|
||||
matching_mmios, non_matching_mmios = get_mmio_windows_with_key(['PCI Bus 0000:00'])
|
||||
matching_mmios = removed_nested(matching_mmios, non_matching_mmios)
|
||||
non_matching_mmios = [
|
||||
w for w in non_matching_mmios
|
||||
if any((w.overlaps(w2) for w2 in matching_mmios))
|
||||
]
|
||||
non_matching_mmios = merged_windows(non_matching_mmios)
|
||||
|
||||
# list of all vmsix supported device list in bdf format
|
||||
bdf_list = board_cfg_lib.get_known_caps_pci_devs().get('VMSIX', [])
|
||||
# list of all PRE_LAUNCHED_VMs' vmsix supported passthrough devices in bdf format
|
||||
pci_items = common.get_leaf_tag_map(common.SCENARIO_INFO_FILE, "pci_devs", "pci_dev")
|
||||
pci_devs = scenario_cfg_lib.get_pci_devs(pci_items)
|
||||
pci_devs_per_vm = get_devs_per_vm_with_key(pci_devs, bdf_list)
|
||||
# list SOS vmsix supported devices without other PRE_LAUNCHED_VMs' in bdf format
|
||||
sos_bdf_list = [
|
||||
d for d in bdf_list
|
||||
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[vm_i] = non_matching_mmios
|
||||
else:
|
||||
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] = []
|
||||
# TSN reserved region
|
||||
mmiolist_per_vm[vm_i].append(MmioWindow(start = 0xffff0000 , end = 0xffffffff))
|
||||
# For the pre-launched vm, if the TPM is passtrough, this address is used
|
||||
if vm_i == 0 and board_cfg_lib.is_tpm_passthru():
|
||||
mmiolist_per_vm[vm_i].append(MmioWindow(start = 0xfed40000, end = 0xfed40000 + 0x5000 - 1))
|
||||
# For the pre-launched vm o ehl-crb-b, if the p2sb is passtrough, this address is used
|
||||
if board_cfg_lib.is_matched_board(('ehl-crb-b')):
|
||||
p2sb_start = board_cfg_lib.find_p2sb_bar_addr()
|
||||
mmiolist_per_vm[vm_i].append(MmioWindow(start = p2sb_start, end = p2sb_start + 0x1000000 - 1))
|
||||
mmiolist_per_vm[vm_i].sort()
|
||||
|
||||
# start to generate board_info.h
|
||||
print("{0}".format(board_cfg_lib.HEADER_LICENSE), file=config)
|
||||
print(VBAR_INFO_DEFINE, file=config)
|
||||
|
|
@ -65,6 +248,49 @@ def generate_file(config):
|
|||
print(VBAR_INFO_ENDIF, file=config)
|
||||
return
|
||||
|
||||
ivshmem_enabled = common.get_hv_item_tag(common.SCENARIO_INFO_FILE, "FEATURES", "IVSHMEM", "IVSHMEM_ENABLED")
|
||||
if ivshmem_enabled == 'y':
|
||||
for vm_id,vm_type in common.VM_TYPES.items():
|
||||
free_bar = []
|
||||
if scenario_cfg_lib.VM_DB[vm_type]['load_type'] == "PRE_LAUNCHED_VM":
|
||||
board_cfg_lib.parse_mem()
|
||||
for shm_name, bar_attr_dic in board_cfg_lib.PCI_DEV_BAR_DESC.shm_bar_dic.items():
|
||||
index = shm_name[:shm_name.find('_')]
|
||||
i_cnt = 0
|
||||
for bar_i, bar_attr in bar_attr_dic.items():
|
||||
i_cnt += 1
|
||||
if bar_i == 0:
|
||||
if len(bar_attr_dic.keys()) == 1:
|
||||
print("#define IVSHMEM_DEVICE_%-23s" % (str(index) + "_VBAR"),
|
||||
" .vbar_base[{}] = {}UL".format(bar_i, bar_attr.addr), 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)
|
||||
mmiolist_per_vm[vm_id].append(bar_0)
|
||||
mmiolist_per_vm[vm_id].sort()
|
||||
elif i_cnt == len(bar_attr_dic.keys()):
|
||||
print("{}.vbar_base[{}] = {}UL".format(' ' * 54, bar_i, bar_attr.addr), file=config)
|
||||
else:
|
||||
print("{}.vbar_base[{}] = {}UL, \\".format(' ' * 54, bar_i, bar_attr.addr), file=config)
|
||||
if bar_i == 2:
|
||||
raw_shmem_regions = common.get_hv_item_tag(common.SCENARIO_INFO_FILE, "FEATURES", "IVSHMEM", "IVSHMEM_REGION")
|
||||
for shm in raw_shmem_regions:
|
||||
if shm is None or shm.strip() == '':
|
||||
continue
|
||||
shm_splited = shm.split(',')
|
||||
name = shm_splited[0].strip()
|
||||
size = shm_splited[1].strip()
|
||||
|
||||
try:
|
||||
int_size = int(size) * 0x100000
|
||||
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].sort()
|
||||
print("", file=config)
|
||||
|
||||
compared_bdf = []
|
||||
for cnt_sub_name in board_cfg_lib.SUB_NAME_COUNT.keys():
|
||||
i_cnt = 0
|
||||
|
|
@ -74,30 +300,9 @@ def generate_file(config):
|
|||
else:
|
||||
continue
|
||||
|
||||
write_vbar(i_cnt, bdf, board_cfg_lib.PCI_DEV_BAR_DESC.pci_bar_dic, bar_attr, config)
|
||||
write_vbar(i_cnt, bdf, board_cfg_lib.PCI_DEV_BAR_DESC.pci_bar_dic, bar_attr, \
|
||||
pci_devs_per_vm, mmiolist_per_vm, matching_mmios, config)
|
||||
|
||||
i_cnt += 1
|
||||
|
||||
ivshmem_enabled = common.get_hv_item_tag(common.SCENARIO_INFO_FILE, "FEATURES", "IVSHMEM", "IVSHMEM_ENABLED")
|
||||
if ivshmem_enabled == 'y':
|
||||
board_cfg_lib.parse_mem()
|
||||
for shm_name, bar_attr_dic in board_cfg_lib.PCI_DEV_BAR_DESC.shm_bar_dic.items():
|
||||
index = shm_name[:shm_name.find('_')]
|
||||
i_cnt = 0
|
||||
for bar_i, bar_attr in bar_attr_dic.items():
|
||||
i_cnt += 1
|
||||
if bar_i == 0:
|
||||
if len(bar_attr_dic.keys()) == 1:
|
||||
print("#define IVSHMEM_DEVICE_%-23s" % (str(index) + "_VBAR"),
|
||||
" .vbar_base[{}] = {}UL".format(bar_i, bar_attr.addr), file=config)
|
||||
else:
|
||||
print("#define IVSHMEM_DEVICE_%-23s" % (str(index) + "_VBAR"),
|
||||
" .vbar_base[{}] = {}UL, \\".format(bar_i, bar_attr.addr), file=config)
|
||||
elif i_cnt == len(bar_attr_dic.keys()):
|
||||
print("{}.vbar_base[{}] = {}UL".format(' ' * 54, bar_i, bar_attr.addr), file=config)
|
||||
else:
|
||||
print("{}.vbar_base[{}] = {}UL, \\".format(' ' * 54, bar_i, bar_attr.addr), file=config)
|
||||
|
||||
print("", file=config)
|
||||
|
||||
print(VBAR_INFO_ENDIF, file=config)
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ def add_instance_to_name(i_cnt, bdf, bar_attr):
|
|||
|
||||
board_cfg_lib.PCI_DEV_BAR_DESC.pci_dev_dic[bdf].name_w_i_cnt = tmp_sub_name
|
||||
|
||||
|
||||
def generate_file(vm_info, config):
|
||||
"""
|
||||
Generate pci_dev.c for Pre-Launched VMs in a scenario.
|
||||
|
|
|
|||
Loading…
Reference in New Issue