diff --git a/hypervisor/acpi_parser/dmar_parse.c b/hypervisor/acpi_parser/dmar_parse.c index e1dfee5c8..56a4859bf 100644 --- a/hypervisor/acpi_parser/dmar_parse.c +++ b/hypervisor/acpi_parser/dmar_parse.c @@ -134,7 +134,7 @@ static int32_t handle_one_drhd(struct acpi_dmar_hardware_unit *acpi_drhd, struct if (is_apl_platform()) { if ((((uint32_t)drhd->segment << 16U) | ((uint32_t)dev_scope->bus << 8U) | - dev_scope->devfun) == CONFIG_GPU_SBDF) { + dev_scope->devfun) == CONFIG_IGD_SBDF) { drhd->ignore = true; } } diff --git a/hypervisor/dm/vpci/pci_pt.c b/hypervisor/dm/vpci/pci_pt.c index 976537cc1..287c8ee83 100644 --- a/hypervisor/dm/vpci/pci_pt.c +++ b/hypervisor/dm/vpci/pci_pt.c @@ -540,7 +540,7 @@ void init_vdev_pt(struct pci_vdev *vdev, bool is_pf_vdev) if (vdev->phyfun == NULL) { init_bars(vdev, is_pf_vdev); init_vmsix_on_msi(vdev); - if (is_service_vm(vpci2vm(vdev->vpci)) && (vdev->pdev->bdf.value == CONFIG_GPU_SBDF)) { + if (is_service_vm(vpci2vm(vdev->vpci)) && (vdev->pdev->bdf.value == CONFIG_IGD_SBDF)) { pci_vdev_write_vcfg(vdev, PCIR_ASLS_CTL, 4U, pci_pdev_read_cfg(vdev->pdev->bdf, PCIR_ASLS_CTL, 4U)); } if (is_prelaunched_vm(vpci2vm(vdev->vpci)) && (!is_pf_vdev)) { @@ -550,7 +550,7 @@ void init_vdev_pt(struct pci_vdev *vdev, bool is_pf_vdev) pci_command |= 0x400U; pci_pdev_write_cfg(vdev->pdev->bdf, PCIR_COMMAND, 2U, pci_command); - if (vdev->pdev->bdf.value == CONFIG_GPU_SBDF) { + if (vdev->pdev->bdf.value == CONFIG_IGD_SBDF) { passthru_gpu_opregion(vdev); } } diff --git a/hypervisor/dm/vpci/vpci.c b/hypervisor/dm/vpci/vpci.c index 2d0828b19..710832368 100644 --- a/hypervisor/dm/vpci/vpci.c +++ b/hypervisor/dm/vpci/vpci.c @@ -520,7 +520,7 @@ static int32_t write_pt_dev_cfg(struct pci_vdev *vdev, uint32_t offset, } else { if (offset != vdev->pdev->sriov.pre_pos) { if (!is_quirk_ptdev(vdev)) { - if ((vdev->pdev->bdf.value != CONFIG_GPU_SBDF) || (offset != PCIR_ASLS_CTL)) { + if ((vdev->pdev->bdf.value != CONFIG_IGD_SBDF) || (offset != PCIR_ASLS_CTL)) { /* passthru to physical device */ pci_pdev_write_cfg(vdev->pdev->bdf, offset, bytes, val); } @@ -550,7 +550,7 @@ static int32_t read_pt_dev_cfg(const struct pci_vdev *vdev, uint32_t offset, } else if (!is_quirk_ptdev(vdev)) { /* passthru to physical device */ *val = pci_pdev_read_cfg(vdev->pdev->bdf, offset, bytes); - if ((vdev->pdev->bdf.value == CONFIG_GPU_SBDF) && (offset == PCIR_ASLS_CTL)) { + if ((vdev->pdev->bdf.value == CONFIG_IGD_SBDF) && (offset == PCIR_ASLS_CTL)) { *val = pci_vdev_read_vcfg(vdev, offset, bytes); } } else { diff --git a/misc/config_tools/board_inspector/legacy/dmar.py b/misc/config_tools/board_inspector/legacy/dmar.py index a04b10553..509330f1b 100644 --- a/misc/config_tools/board_inspector/legacy/dmar.py +++ b/misc/config_tools/board_inspector/legacy/dmar.py @@ -167,7 +167,7 @@ class DmarTbl: # TODO: Get board information is independent part of acrn-config tools, it does not get the GPU_SBDF default # config from the other part of tools, so hard code the GPU_SBDF to gernerate DRHDx_IGNORE macro -CONFIG_GPU_SBDF = 0x10 +CONFIG_IGD_SBDF = 0x10 PCI_BRIDGE_HEADER = 1 @@ -257,7 +257,7 @@ def walk_pci_bus(tmp_pdf, dmar_tbl, dmar_hw_list, drhd_cnt): get_secondary_bus(dmar_tbl, tmp_pdf.device, tmp_pdf.function) if ((dmar_tbl.dmar_drhd.segment << 16) | ( - dmar_tbl.dmar_dev_scope.bus << 8) | tmp_pdf.path) == CONFIG_GPU_SBDF: + dmar_tbl.dmar_dev_scope.bus << 8) | tmp_pdf.path) == CONFIG_IGD_SBDF: dmar_hw_list.hw_ignore[drhd_cnt] = 'true' dmar_tbl.path_offset += ctypes.sizeof(DevScopePath) diff --git a/misc/config_tools/static_allocators/bdf.py b/misc/config_tools/static_allocators/bdf.py index 1644b815f..6d76da09f 100644 --- a/misc/config_tools/static_allocators/bdf.py +++ b/misc/config_tools/static_allocators/bdf.py @@ -119,7 +119,7 @@ def create_device_node(allocation_etree, vm_id, devdict): if common.get_node(f"./func", dev_node) is None: common.append_node(f"./func", f"{bdf.func:#04x}", dev_node) -def create_gpu_sbdf(board_etree, allocation_etree): +def create_igd_sbdf(board_etree, allocation_etree): """ Extract the integrated GPU bdf from board.xml. If the device is not present, set bdf to "0xFFFF" which indicates the device doesn't exist. @@ -127,15 +127,15 @@ def create_gpu_sbdf(board_etree, allocation_etree): bus = "0x0" device_node = common.get_node(f"//bus[@type='pci' and @address='{bus}']/device[vendor='0x8086' and class='0x030000']", board_etree) if device_node is None: - common.append_node("/acrn-config/hv/MISC_CFG/GPU_SBDF", '0xFFFF', allocation_etree) + common.append_node("/acrn-config/hv/MISC_CFG/IGD_SBDF", '0xFFFF', allocation_etree) else: address = device_node.get('address') dev = int(address, 16) >> 16 func = int(address, 16) & 0xffff - common.append_node("/acrn-config/hv/MISC_CFG/GPU_SBDF", f"{(int(bus, 16) << 8) | (dev << 3) | func:#06x}", allocation_etree) + common.append_node("/acrn-config/hv/MISC_CFG/IGD_SBDF", f"{(int(bus, 16) << 8) | (dev << 3) | func:#06x}", allocation_etree) def fn(board_etree, scenario_etree, allocation_etree): - create_gpu_sbdf(board_etree, allocation_etree) + create_igd_sbdf(board_etree, allocation_etree) vm_nodes = scenario_etree.xpath("//vm") for vm_node in vm_nodes: vm_id = vm_node.get('id') diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl index 632cd3199..826b6118e 100644 --- a/misc/config_tools/xforms/config_common.xsl +++ b/misc/config_tools/xforms/config_common.xsl @@ -248,8 +248,8 @@ - - + +