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

hv: rename CONFIG_GPU_SBDF to CONFIG_IGD_SBDF

Browse Source 
The name CONFIG_IGD_SBDF indicates the bdf of an integrated GPU on platform.

Tracked-On: #6855
Signed-off-by: Yang,Yu-chu <yu-chu.yang@intel.com>
This commit is contained in:
Yang,Yu-chu 2021-11-22 10:58:21 -08:00 committed by wenlingz
parent 68136b7f7a
commit 30951f7a83
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hypervisor/acpi_parser/dmar_parse.c
View File

@ -134,7 +134,7 @@ static int32_t handle_one_drhd(struct acpi_dmar_hardware_unit *acpi_drhd, struct
if (is_apl_platform()) { if (is_apl_platform()) {
if ((((uint32_t)drhd->segment << 16U) | if ((((uint32_t)drhd->segment << 16U) |
((uint32_t)dev_scope->bus << 8U) | ((uint32_t)dev_scope->bus << 8U) |
dev_scope->devfun) == CONFIG_GPU_SBDF) { dev_scope->devfun) == CONFIG_IGD_SBDF) {
drhd->ignore = true; drhd->ignore = true;
} }
} }

4
hypervisor/dm/vpci/pci_pt.c
View File

@ -540,7 +540,7 @@ void init_vdev_pt(struct pci_vdev *vdev, bool is_pf_vdev)
if (vdev->phyfun == NULL) { if (vdev->phyfun == NULL) {
init_bars(vdev, is_pf_vdev); init_bars(vdev, is_pf_vdev);
init_vmsix_on_msi(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)); 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)) { 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_command |= 0x400U;
pci_pdev_write_cfg(vdev->pdev->bdf, PCIR_COMMAND, 2U, pci_command); 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); passthru_gpu_opregion(vdev);
} }
} }

4
hypervisor/dm/vpci/vpci.c
View File

@ -520,7 +520,7 @@ static int32_t write_pt_dev_cfg(struct pci_vdev *vdev, uint32_t offset,
} else { } else {
if (offset != vdev->pdev->sriov.pre_pos) { if (offset != vdev->pdev->sriov.pre_pos) {
if (!is_quirk_ptdev(vdev)) { 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 */ /* passthru to physical device */
pci_pdev_write_cfg(vdev->pdev->bdf, offset, bytes, val); 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)) { } else if (!is_quirk_ptdev(vdev)) {
/* passthru to physical device */ /* passthru to physical device */
*val = pci_pdev_read_cfg(vdev->pdev->bdf, offset, bytes); *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); *val = pci_vdev_read_vcfg(vdev, offset, bytes);
} }
} else { } else {

4
misc/config_tools/board_inspector/legacy/dmar.py
View File

@ -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 # 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 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 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) get_secondary_bus(dmar_tbl, tmp_pdf.device, tmp_pdf.function)
if ((dmar_tbl.dmar_drhd.segment << 16) | ( 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_hw_list.hw_ignore[drhd_cnt] = 'true'
dmar_tbl.path_offset += ctypes.sizeof(DevScopePath) dmar_tbl.path_offset += ctypes.sizeof(DevScopePath)

8
misc/config_tools/static_allocators/bdf.py
View File

@ -119,7 +119,7 @@ def create_device_node(allocation_etree, vm_id, devdict):
if common.get_node(f"./func", dev_node) is None: if common.get_node(f"./func", dev_node) is None:
common.append_node(f"./func", f"{bdf.func:#04x}", dev_node) 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 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. doesn't exist.
@ -127,15 +127,15 @@ def create_gpu_sbdf(board_etree, allocation_etree):
bus = "0x0" bus = "0x0"
device_node = common.get_node(f"//bus[@type='pci' and @address='{bus}']/device[vendor='0x8086' and class='0x030000']", board_etree) 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: 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: else:
address = device_node.get('address') address = device_node.get('address')
dev = int(address, 16) >> 16 dev = int(address, 16) >> 16
func = int(address, 16) & 0xffff 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): 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") vm_nodes = scenario_etree.xpath("//vm")
for vm_node in vm_nodes: for vm_node in vm_nodes:
vm_id = vm_node.get('id') vm_id = vm_node.get('id')

4
misc/config_tools/xforms/config_common.xsl
View File

@ -248,8 +248,8 @@
<xsl:template match="MISC_CFG"> <xsl:template match="MISC_CFG">
<xsl:call-template name="integer-by-key-value"> <xsl:call-template name="integer-by-key-value">
<xsl:with-param name="key" select="'GPU_SBDF'" /> <xsl:with-param name="key" select="'IGD_SBDF'" />
<xsl:with-param name="value" select="//allocation-data/acrn-config/hv/MISC_CFG/GPU_SBDF" /> <xsl:with-param name="value" select="//allocation-data/acrn-config/hv/MISC_CFG/IGD_SBDF" />
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>