diff options
author | Joerg Roedel <jroedel@suse.de> | 2014-08-05 10:38:38 -0400 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2014-08-26 05:37:37 -0400 |
commit | 50917e265ebd2ea33bc34b22b3981f1e88415eae (patch) | |
tree | 87038b03e515d2c7c436ecfcde23953c0baedcc8 | |
parent | 52addcf9d6669fa439387610bc65c92fa0980cef (diff) |
iommu/amd: Move struct iommu_dev_data to amd_iommu.c
The struct is only used there, so it doesn't need to be in
the header file.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
-rw-r--r-- | drivers/iommu/amd_iommu.c | 21 | ||||
-rw-r--r-- | drivers/iommu/amd_iommu_types.h | 21 |
2 files changed, 21 insertions, 21 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index ecb0109a5360..fe6d7cc715f7 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c | |||
@@ -88,6 +88,27 @@ int amd_iommu_max_glx_val = -1; | |||
88 | static struct dma_map_ops amd_iommu_dma_ops; | 88 | static struct dma_map_ops amd_iommu_dma_ops; |
89 | 89 | ||
90 | /* | 90 | /* |
91 | * This struct contains device specific data for the IOMMU | ||
92 | */ | ||
93 | struct iommu_dev_data { | ||
94 | struct list_head list; /* For domain->dev_list */ | ||
95 | struct list_head dev_data_list; /* For global dev_data_list */ | ||
96 | struct iommu_dev_data *alias_data;/* The alias dev_data */ | ||
97 | struct protection_domain *domain; /* Domain the device is bound to */ | ||
98 | atomic_t bind; /* Domain attach reference count */ | ||
99 | u16 devid; /* PCI Device ID */ | ||
100 | bool iommu_v2; /* Device can make use of IOMMUv2 */ | ||
101 | bool passthrough; /* Default for device is pt_domain */ | ||
102 | struct { | ||
103 | bool enabled; | ||
104 | int qdep; | ||
105 | } ats; /* ATS state */ | ||
106 | bool pri_tlp; /* PASID TLB required for | ||
107 | PPR completions */ | ||
108 | u32 errata; /* Bitmap for errata to apply */ | ||
109 | }; | ||
110 | |||
111 | /* | ||
91 | * general struct to manage commands send to an IOMMU | 112 | * general struct to manage commands send to an IOMMU |
92 | */ | 113 | */ |
93 | struct iommu_cmd { | 114 | struct iommu_cmd { |
diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h index 8e43b7cba133..cec51a8ba844 100644 --- a/drivers/iommu/amd_iommu_types.h +++ b/drivers/iommu/amd_iommu_types.h | |||
@@ -418,27 +418,6 @@ struct protection_domain { | |||
418 | }; | 418 | }; |
419 | 419 | ||
420 | /* | 420 | /* |
421 | * This struct contains device specific data for the IOMMU | ||
422 | */ | ||
423 | struct iommu_dev_data { | ||
424 | struct list_head list; /* For domain->dev_list */ | ||
425 | struct list_head dev_data_list; /* For global dev_data_list */ | ||
426 | struct iommu_dev_data *alias_data;/* The alias dev_data */ | ||
427 | struct protection_domain *domain; /* Domain the device is bound to */ | ||
428 | atomic_t bind; /* Domain attach reference count */ | ||
429 | u16 devid; /* PCI Device ID */ | ||
430 | bool iommu_v2; /* Device can make use of IOMMUv2 */ | ||
431 | bool passthrough; /* Default for device is pt_domain */ | ||
432 | struct { | ||
433 | bool enabled; | ||
434 | int qdep; | ||
435 | } ats; /* ATS state */ | ||
436 | bool pri_tlp; /* PASID TLB required for | ||
437 | PPR completions */ | ||
438 | u32 errata; /* Bitmap for errata to apply */ | ||
439 | }; | ||
440 | |||
441 | /* | ||
442 | * For dynamic growth the aperture size is split into ranges of 128MB of | 421 | * For dynamic growth the aperture size is split into ranges of 128MB of |
443 | * DMA address space each. This struct represents one such range. | 422 | * DMA address space each. This struct represents one such range. |
444 | */ | 423 | */ |