diff options
| author | Will Deacon <will@kernel.org> | 2020-12-08 18:11:58 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-12-08 18:11:58 +0300 |
| commit | 113eb4ce4fc33ef3deda1431497811d43342c0cc (patch) | |
| tree | 72e525d955ee5cb41d988cb39353b7334dc62aef /include/linux/iommu.h | |
| parent | c5257e39a4eca34ce067e084657926411eb5270b (diff) | |
| parent | 33e07157105e472b746b70b3ed4197c57c43ab68 (diff) | |
| download | linux-113eb4ce4fc33ef3deda1431497811d43342c0cc.tar.xz | |
Merge branch 'for-next/iommu/vt-d' into for-next/iommu/core
Intel VT-D updates for 5.11. The main thing here is converting the code
over to the iommu-dma API, which required some improvements to the core
code to preserve existing functionality.
* for-next/iommu/vt-d:
iommu/vt-d: Avoid GFP_ATOMIC where it is not needed
iommu/vt-d: Remove set but not used variable
iommu/vt-d: Cleanup after converting to dma-iommu ops
iommu/vt-d: Convert intel iommu driver to the iommu ops
iommu/vt-d: Update domain geometry in iommu_ops.at(de)tach_dev
iommu: Add quirk for Intel graphic devices in map_sg
iommu: Allow the dma-iommu api to use bounce buffers
iommu: Add iommu_dma_free_cpu_cached_iovas()
iommu: Handle freelists when using deferred flushing in iommu drivers
iommu/vt-d: include conditionally on CONFIG_INTEL_IOMMU_SVM
Diffstat (limited to 'include/linux/iommu.h')
| -rw-r--r-- | include/linux/iommu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/iommu.h b/include/linux/iommu.h index ffaa389ea128..b3f0e2018c62 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -181,6 +181,7 @@ struct iommu_iotlb_gather { unsigned long start; unsigned long end; size_t pgsize; + struct page *freelist; }; /** |