iommu/amd: Remove dev_data->passthrough

Make use of generic IOMMU infrastructure to gather the same information
carried in dev_data->passthrough and remove the struct member.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
Link: https://lore.kernel.org/r/20200429133712.31431-15-joro@8bytes.org
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 3e0d27f7622e627ed19354109c8e2e4835a36371..0b4b4faa876dfc949b5bf6e589e9acd204b33a76 100644 (file)
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2047,8 +2047,8 @@ out_err:
 static int attach_device(struct device *dev,
                         struct protection_domain *domain)
 {
-       struct pci_dev *pdev;
        struct iommu_dev_data *dev_data;
+       struct pci_dev *pdev;
        unsigned long flags;
        int ret;
 
@@ -2067,8 +2067,10 @@ static int attach_device(struct device *dev,
 
        pdev = to_pci_dev(dev);
        if (domain->flags & PD_IOMMUV2_MASK) {
+               struct iommu_domain *def_domain = iommu_get_dma_domain(dev);
+
                ret = -EINVAL;
-               if (!dev_data->passthrough)
+               if (def_domain->type != IOMMU_DOMAIN_IDENTITY)
                        goto out;
 
                if (dev_data->iommu_v2) {
@@ -2189,9 +2191,7 @@ static int amd_iommu_add_device(struct device *dev)
 
        /* Domains are initialized for this device - have a look what we ended up with */
        domain = iommu_get_domain_for_dev(dev);
-       if (domain->type == IOMMU_DOMAIN_IDENTITY)
-               dev_data->passthrough = true;
-       else if (domain->type == IOMMU_DOMAIN_DMA)
+       if (domain->type == IOMMU_DOMAIN_DMA)
                iommu_setup_dma_ops(dev, IOVA_START_PFN << PAGE_SHIFT, 0);
 
 out:

diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h
index ca8c4522045b35d1c57c76711a2af9cf0f03a439..d0d7b6a0c3d88f7f1187ae3dabb9cf20d6a527ae 100644 (file)
--- a/drivers/iommu/amd_iommu_types.h
+++ b/drivers/iommu/amd_iommu_types.h
@@ -640,7 +640,6 @@ struct iommu_dev_data {
        struct pci_dev *pdev;
        u16 devid;                        /* PCI Device ID */
        bool iommu_v2;                    /* Device can make use of IOMMUv2 */
-       bool passthrough;                 /* Device is identity mapped */
        struct {
                bool enabled;
                int qdep;