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

acrn-config: insert vbdf in hex format and vuart vbdf logic

Browse Source 
Bug fix:
1. The bdf were inserted in decimal. Fix it with hexadecimal
format.
2. The vuart vbdf will only take the dev which no used bdf has
the same dev. For example: If 00:01.1 is in used but not 00:01.0,
vuart vbdf will skip 00:01.0 and look for 00:02.0, 00:03.0 and so on.

Tracked-On: #5482
Signed-off-by: Yang,Yu-chu <yu-chu.yang@intel.com>
This commit is contained in:
Yang,Yu-chu 2020-11-03 22:35:43 -08:00 committed by wenlingz
parent 63593694e4
commit c25f9ee0f0
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
misc/acrn-config/scenario_config/pci_dev_c.py
View File

@ -55,7 +55,8 @@ def find_unused_bdf(used_bdf, case):
# vuart device cannot detect function difference, find vbdf based on dev increment # vuart device cannot detect function difference, find vbdf based on dev increment
for dev in range(0x20): for dev in range(0x20):
bdf = BusDevFunc(bus=0x00, dev=dev, func=0x0) bdf = BusDevFunc(bus=0x00, dev=dev, func=0x0)
if bdf not in used_bdf: #if bdf not in used_bdf:
if all((bdf.dev != in_use_bdf.dev for in_use_bdf in used_bdf)):
return bdf return bdf
else: else:
for dev in range(0x20): for dev in range(0x20):
@ -105,6 +106,8 @@ def generate_file(vm_info, config):
for bdf in compared_bdf: for bdf in compared_bdf:
bdf_tuple = BusDevFunc.from_str(bdf) bdf_tuple = BusDevFunc.from_str(bdf)
sos_used_bdf.append(bdf_tuple) sos_used_bdf.append(bdf_tuple)
bdf_tuple = BusDevFunc(bus=0,dev=1,func=0)
sos_used_bdf.append(bdf_tuple)
vuarts = common.get_vuart_info(common.SCENARIO_INFO_FILE) vuarts = common.get_vuart_info(common.SCENARIO_INFO_FILE)
vuarts_num = scenario_cfg_lib.get_vuart_num(vuarts) vuarts_num = scenario_cfg_lib.get_vuart_num(vuarts)
@ -191,7 +194,7 @@ def generate_file(vm_info, config):
fun = int(pci_bdf_dev.split('.')[1], 16) fun = int(pci_bdf_dev.split('.')[1], 16)
print("\t{", file=config) print("\t{", file=config)
print("\t\t.emu_type = {},".format(PCI_DEV_TYPE[1]), file=config) print("\t\t.emu_type = {},".format(PCI_DEV_TYPE[1]), file=config)
print("\t\t.vbdf.bits = {{.b = 0x00U, .d = 0x{0:02d}U, .f = 0x00U}},".format(pci_cnt), file=config) print("\t\t.vbdf.bits = {{.b = 0x00U, .d = 0x{0:02x}U, .f = 0x00U}},".format(pci_cnt), file=config)
for bdf, bar_attr in board_cfg_lib.PCI_DEV_BAR_DESC.pci_dev_dic.items(): for bdf, bar_attr in board_cfg_lib.PCI_DEV_BAR_DESC.pci_dev_dic.items():
if bdf == pci_bdf_dev: if bdf == pci_bdf_dev:
print("\t\tPTDEV({}),".format(board_cfg_lib.PCI_DEV_BAR_DESC.pci_dev_dic[bdf].name_w_i_cnt), file=config) print("\t\tPTDEV({}),".format(board_cfg_lib.PCI_DEV_BAR_DESC.pci_dev_dic[bdf].name_w_i_cnt), file=config)
@ -213,18 +216,18 @@ def generate_file(vm_info, config):
if vm_i in vm_info.cfg_pci.pci_devs.keys(): if vm_i in vm_info.cfg_pci.pci_devs.keys():
if scenario_cfg_lib.VM_DB[vm_type]['load_type'] == "SOS_VM": if scenario_cfg_lib.VM_DB[vm_type]['load_type'] == "SOS_VM":
free_bdf = find_unused_bdf(sos_used_bdf, "ivshmem") free_bdf = find_unused_bdf(sos_used_bdf, "ivshmem")
print("\t\t.vbdf.bits = {{.b = 0x00U, .d = 0x{:02d}U, .f = 0x{:02d}U}}," \ print("\t\t.vbdf.bits = {{.b = 0x00U, .d = 0x{:02x}U, .f = 0x{:02x}U}}," \
.format(free_bdf.dev,free_bdf.func), file=config) .format(free_bdf.dev,free_bdf.func), file=config)
print("\t\t.vdev_ops = &vpci_ivshmem_ops,", file=config) print("\t\t.vdev_ops = &vpci_ivshmem_ops,", file=config)
sos_used_bdf.append(free_bdf) sos_used_bdf.append(free_bdf)
else: else:
print("\t\t.vbdf.bits = {{.b = 0x00U, .d = 0x{0:02d}U, .f = 0x00U}},".format(pci_cnt), file=config) print("\t\t.vbdf.bits = {{.b = 0x00U, .d = 0x{0:02x}U, .f = 0x00U}},".format(pci_cnt), file=config)
print("\t\t.vdev_ops = &vpci_ivshmem_ops,", file=config) print("\t\t.vdev_ops = &vpci_ivshmem_ops,", file=config)
bdf_tuple = BusDevFunc(0,pci_cnt,0) bdf_tuple = BusDevFunc(0,pci_cnt,0)
vm_used_bdf.append(bdf_tuple) vm_used_bdf.append(bdf_tuple)
elif vm_i not in vm_info.cfg_pci.pci_devs.keys(): elif vm_i not in vm_info.cfg_pci.pci_devs.keys():
if scenario_cfg_lib.VM_DB[vm_type]['load_type'] == "PRE_LAUNCHED_VM": if scenario_cfg_lib.VM_DB[vm_type]['load_type'] == "PRE_LAUNCHED_VM":
print("\t\t.vbdf.bits = {{.b = 0x00U, .d = 0x{0:02d}U, .f = 0x00U}},".format(pci_cnt), file=config) print("\t\t.vbdf.bits = {{.b = 0x00U, .d = 0x{0:02x}U, .f = 0x00U}},".format(pci_cnt), file=config)
bdf_tuple = BusDevFunc(0,pci_cnt,0) bdf_tuple = BusDevFunc(0,pci_cnt,0)
vm_used_bdf.append(bdf_tuple) vm_used_bdf.append(bdf_tuple)
elif scenario_cfg_lib.VM_DB[vm_type]['load_type'] == "POST_LAUNCHED_VM": elif scenario_cfg_lib.VM_DB[vm_type]['load_type'] == "POST_LAUNCHED_VM":
@ -283,7 +286,7 @@ def generate_file(vm_info, config):
elif scenario_cfg_lib.VM_DB[vm_type]['load_type'] == "SOS_VM": elif scenario_cfg_lib.VM_DB[vm_type]['load_type'] == "SOS_VM":
free_bdf = find_unused_bdf(sos_used_bdf, "vuart") free_bdf = find_unused_bdf(sos_used_bdf, "vuart")
sos_used_bdf.append(free_bdf) sos_used_bdf.append(free_bdf)
print("\t\t.vbdf.bits = {{.b = 0x00U, .d = 0x{:02d}U, .f = 0x{:02d}U}},".format(free_bdf.dev,free_bdf.func), file=config) print("\t\t.vbdf.bits = {{.b = 0x00U, .d = 0x{:02x}U, .f = 0x00U}},".format(free_bdf.dev,free_bdf.func), file=config)
if vuart_id != 0: if vuart_id != 0:
print("\t\t.t_vuart.vm_id = {},".format(vuarts[vm_i][vuart_id]['target_vm_id']), file=config) print("\t\t.t_vuart.vm_id = {},".format(vuarts[vm_i][vuart_id]['target_vm_id']), file=config)