From 6b9367522590ff9eb22683aef9ada7554fc675b5 Mon Sep 17 00:00:00 2001 From: Shuo A Liu Date: Fri, 12 Jun 2020 09:40:48 +0800 Subject: [PATCH] hv: Change to a permissive check with broken DMAR table From the VT-d spec 8.3: If a DRHD structure with INCLUDE_PCI_ALL flag Set is reported for a Segment, it must be enumerated by BIOS after all other DRHD structures for the same Segment. However, some broken BIOS violate the rules. To bring up ACRN with them, change the ASSERT to a permissive check to unblock the BIOS limitation. Also, scan the DRHD list to find the one who has INCLUDE_PCI_ALL flag. Tracked-On: #4937 Signed-off-by: Shuo A Liu --- hypervisor/acpi_parser/dmar_parse.c | 5 +++-- hypervisor/hw/pci.c | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hypervisor/acpi_parser/dmar_parse.c b/hypervisor/acpi_parser/dmar_parse.c index 1c50cf45e..34440e093 100644 --- a/hypervisor/acpi_parser/dmar_parse.c +++ b/hypervisor/acpi_parser/dmar_parse.c @@ -197,8 +197,9 @@ int32_t parse_dmar_table(struct dmar_info *plat_dmar_info) /* Only support single PCI Segment */ if (acpi_drhd->flags & DRHD_FLAG_INCLUDE_PCI_ALL_MASK) { - ASSERT(!is_include_all_emulated, - "DRHD with INCLUDE_PCI_ALL flag should be the last one"); + if (!is_include_all_emulated) { + pr_warn("DRHD with INCLUDE_PCI_ALL flag is NOT the last one!"); + } is_include_all_emulated = true; } diff --git a/hypervisor/hw/pci.c b/hypervisor/hw/pci.c index 12c67fe7b..492e85db5 100644 --- a/hypervisor/hw/pci.c +++ b/hypervisor/hw/pci.c @@ -507,11 +507,11 @@ static void pci_parse_iommu_devscopes(struct pci_bdf_mapping_group *const bdfs_f */ } } - } - if ((plat_dmar_info.drhd_units[plat_dmar_info.drhd_count - 1U].flags & DRHD_FLAG_INCLUDE_PCI_ALL_MASK) - == DRHD_FLAG_INCLUDE_PCI_ALL_MASK) { - *drhd_idx_pci_all = plat_dmar_info.drhd_count - 1U; + if ((plat_dmar_info.drhd_units[drhd_index].flags & DRHD_FLAG_INCLUDE_PCI_ALL_MASK) + == DRHD_FLAG_INCLUDE_PCI_ALL_MASK) { + *drhd_idx_pci_all = drhd_index; + } } }