Commit cc7c8ad9 authored by Joerg Roedel's avatar Joerg Roedel

iommu/amd: Request passthrough mode from IOMMU core

Get rid of the iommu_pass_through variable and request
passthrough mode via the new iommu core function.
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent adab0b07
...@@ -436,7 +436,7 @@ static int iommu_init_device(struct device *dev) ...@@ -436,7 +436,7 @@ static int iommu_init_device(struct device *dev)
* invalid address), we ignore the capability for the device so * invalid address), we ignore the capability for the device so
* it'll be forced to go into translation mode. * it'll be forced to go into translation mode.
*/ */
if ((iommu_pass_through || !amd_iommu_force_isolation) && if ((iommu_default_passthrough() || !amd_iommu_force_isolation) &&
dev_is_pci(dev) && pci_iommuv2_capable(to_pci_dev(dev))) { dev_is_pci(dev) && pci_iommuv2_capable(to_pci_dev(dev))) {
struct amd_iommu *iommu; struct amd_iommu *iommu;
...@@ -2226,7 +2226,7 @@ static int amd_iommu_add_device(struct device *dev) ...@@ -2226,7 +2226,7 @@ static int amd_iommu_add_device(struct device *dev)
BUG_ON(!dev_data); BUG_ON(!dev_data);
if (iommu_pass_through || dev_data->iommu_v2) if (dev_data->iommu_v2)
iommu_request_dm_for_dev(dev); iommu_request_dm_for_dev(dev);
/* Domains are initialized for this device - have a look what we ended up with */ /* Domains are initialized for this device - have a look what we ended up with */
...@@ -2805,7 +2805,7 @@ int __init amd_iommu_init_api(void) ...@@ -2805,7 +2805,7 @@ int __init amd_iommu_init_api(void)
int __init amd_iommu_init_dma_ops(void) int __init amd_iommu_init_dma_ops(void)
{ {
swiotlb = (iommu_pass_through || sme_me_mask) ? 1 : 0; swiotlb = (iommu_default_passthrough() || sme_me_mask) ? 1 : 0;
iommu_detected = 1; iommu_detected = 1;
if (amd_iommu_unmap_flush) if (amd_iommu_unmap_flush)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment