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

acrn-config: supply optional passthrough device for vm

Browse Source 
To match launch config xml, supply more optional passthrough device to
vm.

Tracked-On: #3812
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
This commit is contained in:
Wei Liu 2019-10-14 18:04:01 +08:00 committed by ACRN System Integration
parent 826094638a
commit 89f53a409a
3 changed files with 8 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
misc/acrn-config/launch_config/com.py
View File

@ -362,7 +362,6 @@ def launch_end(names, args, vmid, config):
def set_dm_pt(names, sel, vmid, config): def set_dm_pt(names, sel, vmid, config):
#cap_pt = launch_cfg_lib.get_board_pt_dev(names, vmid)
uos_type = names['uos_types'][vmid] uos_type = names['uos_types'][vmid]
if sel.bdf['usb_xdci'][vmid] and sel.slot['usb_xdci'][vmid]: if sel.bdf['usb_xdci'][vmid] and sel.slot['usb_xdci'][vmid]:

5
misc/acrn-config/launch_config/pt.py
View File

@ -196,7 +196,7 @@ def media_pt(uos_type, sel, cap_pt, vmid, config):
def gen_pt(names, sel, vmid, config): def gen_pt(names, sel, vmid, config):
pt_none = True pt_none = True
cap_pt = launch_cfg_lib.get_board_pt_dev(names, vmid) cap_pt = launch_cfg_lib.get_pt_dev()
uos_type = names['uos_types'][vmid] uos_type = names['uos_types'][vmid]
for pt_dev in cap_pt: for pt_dev in cap_pt:
if sel.bdf[pt_dev][vmid]: if sel.bdf[pt_dev][vmid]:
@ -214,8 +214,7 @@ def gen_pt(names, sel, vmid, config):
def gen_pt_head(names, sel, vmid, config): def gen_pt_head(names, sel, vmid, config):
# get passthrough device for specify board and uos cap_pt = launch_cfg_lib.get_pt_dev()
cap_pt = launch_cfg_lib.get_board_pt_dev(names, vmid)
uos_type = names['uos_types'][vmid] uos_type = names['uos_types'][vmid]
pt_none = True pt_none = True

44
misc/acrn-config/library/launch_cfg_lib.py
View File

@ -38,15 +38,9 @@ PT_SUB_PCI['ethernet'] = ['Ethernet controller']
PT_SUB_PCI['sata'] = ['SATA controller'] PT_SUB_PCI['sata'] = ['SATA controller']
PT_SUB_PCI['nvme'] = ['Non-Volatile memory controller'] PT_SUB_PCI['nvme'] = ['Non-Volatile memory controller']
# passthrough device of board and uos sepcify # passthrough devices for board
NUC_RT_PASSTHRU = ['ethernet', 'nvme', 'sata'] PASSTHRU_DEVS = ['usb_xdci', 'ipu', 'ipu_i2c', 'cse', 'audio', 'sata',
NUC_WIN_PASSTHRU = ['audio', 'audio_codec'] 'nvme', 'audio_codec', 'sd_card', 'ethernet', 'wifi', 'bluetooth']
NUC_CLR_PASSTHRU = ['usb_xdci', 'ipu', 'ipu_i2c', 'cse', 'audio', 'audio_codec', 'sd_card', 'ethernet', 'bluetooth']
UP2_CLR_PASSTHRU = ['usb_xdci', 'ipu', 'ipu_i2c', 'cse']
UP2_ADR_PASSTHRU = ['usb_xdci', 'audio', 'audio_codec']
MRB_CLR_PASSTHRU = ['usb_xdci', 'ipu', 'ipu_i2c', 'cse', 'sd_card']
MRB_ADR_PASSTHRU = ['usb_xdci', 'audio', 'audio_codec', 'sd_card', 'wifi', 'bluetooth']
GENERIC_PASSTHRU = ['usb_xdci', 'ipu', 'ipu_i2c', 'cse', 'audio', 'sata', 'nvme', 'audio_codec', 'sd_card', 'ethernet', 'wifi', 'bluetooth']
PT_SLOT = { PT_SLOT = {
"hostbridge":0, "hostbridge":0,
@ -499,34 +493,8 @@ def get_slot(bdf_list, dev):
return slot_list return slot_list
def get_board_pt_dev(names, vmid): def get_pt_dev():
""" Get passthrough device list """
board_name = names['board_name'] cap_pt = PASSTHRU_DEVS
uos_type = names['uos_types'][vmid]
cap_pt = []
if 'mrb' in board_name:
if uos_type == "CLEARLINUX":
cap_pt = MRB_CLR_PASSTHRU
if uos_type == "ANDROID":
cap_pt = MRB_ADR_PASSTHRU
elif 'up2' in board_name:
if uos_type == "CLEARLINUX":
cap_pt = UP2_CLR_PASSTHRU
if uos_type == "ANDROID":
cap_pt = UP2_ADR_PASSTHRU
elif 'nuc' in board_name:
if uos_type == "CLEARLINUX":
cap_pt = NUC_CLR_PASSTHRU
elif uos_type == "PREEMPT-RT LINUX":
cap_pt = NUC_RT_PASSTHRU
elif uos_type == "WINDOWS":
cap_pt = NUC_WIN_PASSTHRU
else:
# zephyr/vxworks have no passthroug device
cap_pt = []
else:
# new board passthrough the generic device
cap_pt = GENERIC_PASSTHRU
return cap_pt return cap_pt