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

hv: passthru DHRD-ignored device

Browse Source 
When trying to passthru a DHRD-ignored PCI device,
iommu_attach_device shall report success. Otherwise,
the assign_vdev_pt_iommu_domain will result in HV panic.
Same for iommu_detach_device case.

Tracked-On: #5240
Signed-off-by: Stanley Chang <stanley.chang@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Stanley Chang 2020-08-28 18:28:53 +08:00 committed by wenlingz
parent 57ce23034c
commit d55813e80b
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hypervisor/arch/x86/vtd.c
View File

@ -979,6 +979,17 @@ static void resume_dmar(struct dmar_drhd_rt *dmar_unit)
dmar_enable_intr_remapping(dmar_unit); dmar_enable_intr_remapping(dmar_unit);
} }
static inline bool is_dmar_unit_ignored(const struct dmar_drhd_rt *dmar_unit)
{
bool ignored = false;
if ((dmar_unit != NULL) && (dmar_unit->drhd->ignore)) {
ignored = true;
}
return ignored;
}
static bool is_dmar_unit_valid(const struct dmar_drhd_rt *dmar_unit, union pci_bdf sid) static bool is_dmar_unit_valid(const struct dmar_drhd_rt *dmar_unit, union pci_bdf sid)
{ {
bool valid = false; bool valid = false;
@ -1066,6 +1077,8 @@ static int32_t iommu_attach_device(const struct iommu_domain *domain, uint8_t bu
iommu_flush_cache(context_entry, sizeof(struct dmar_entry)); iommu_flush_cache(context_entry, sizeof(struct dmar_entry));
ret = 0; ret = 0;
} }
} else if (is_dmar_unit_ignored(dmar_unit)) {
ret = 0;
} }
return ret; return ret;
@ -1119,7 +1132,10 @@ static int32_t iommu_detach_device(const struct iommu_domain *domain, uint8_t bu
dmar_invalid_iotlb(dmar_unit, vmid_to_domainid(domain->vm_id), 0UL, 0U, false, dmar_invalid_iotlb(dmar_unit, vmid_to_domainid(domain->vm_id), 0UL, 0U, false,
DMAR_IIRG_DOMAIN); DMAR_IIRG_DOMAIN);
} }
} else if (is_dmar_unit_ignored(dmar_unit)) {
ret = 0;
} }
return ret; return ret;
} }