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

hv: vtd: fix device assign failure for partition mode

Browse Source 
For partition mode, there is no vm0_domain created for iommu.
In current code, it will return error when try to remove a device
from vm0_domain, which casue failure of device assignment in
partition mode.

Tracked-On: #1680
Signed-off-by: Binbin Wu <binbin.wu@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Binbin Wu 2018-10-26 18:34:34 +08:00 committed by lijinxia
parent 9ae79496be
commit 43f6bdb726
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1109,9 +1109,10 @@ int assign_iommu_device(const struct iommu_domain *domain, uint8_t bus,
{
/* TODO: check if the device assigned */
if (remove_iommu_device(vm0_domain, 0U, bus, devfun) == 1) {
if ((vm0_domain != NULL) && (remove_iommu_device(vm0_domain, 0U, bus, devfun) == 1)) {
return 1;
}
return add_iommu_device(domain, 0U, bus, devfun);
}
@ -1123,7 +1124,12 @@ int unassign_iommu_device(const struct iommu_domain *domain, uint8_t bus,
if (remove_iommu_device(domain, 0U, bus, devfun) == 1) {
return 1;
}
return add_iommu_device(vm0_domain, 0U, bus, devfun);
if ((vm0_domain != NULL) && (add_iommu_device(vm0_domain, 0U, bus, devfun) == 1)) {
return 1;
}
return 0;
}
void enable_iommu(void)