diff options
| author | Will Deacon <will@kernel.org> | 2019-08-23 17:05:45 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2019-08-23 17:05:45 +0300 |
| commit | 1554240ff864da9eb99e2233d3faf191c567c47a (patch) | |
| tree | 610e14f0e68dfd2807f4ca935433823b527041b3 /drivers/iommu/virtio-iommu.c | |
| parent | d720e64150c79d14f4faf931604faa1f0755134d (diff) | |
| parent | a91bcc2b65370e7debf1fc26b93a4c2a54433220 (diff) | |
| download | linux-1554240ff864da9eb99e2233d3faf191c567c47a.tar.xz | |
Merge branches 'for-joerg/arm-smmu/smmu-v2' and 'for-joerg/arm-smmu/smmu-v3' into for-joerg/arm-smmu/updates
* for-joerg/arm-smmu/smmu-v2:
Refactoring to allow for implementation-specific hooks in 'arm-smmu-impl.c'
* for-joerg/arm-smmu/smmu-v3:
Support for deferred TLB invalidation and batching of commands
Rework ATC invalidation for ATS-enabled PCIe masters
Diffstat (limited to 'drivers/iommu/virtio-iommu.c')
| -rw-r--r-- | drivers/iommu/virtio-iommu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c index 433f4d2ee956..5f9f91a4d7f3 100644 --- a/drivers/iommu/virtio-iommu.c +++ b/drivers/iommu/virtio-iommu.c @@ -742,7 +742,7 @@ static int viommu_map(struct iommu_domain *domain, unsigned long iova, } static size_t viommu_unmap(struct iommu_domain *domain, unsigned long iova, - size_t size) + size_t size, struct iommu_iotlb_gather *gather) { int ret = 0; size_t unmapped; @@ -788,7 +788,8 @@ static phys_addr_t viommu_iova_to_phys(struct iommu_domain *domain, return paddr; } -static void viommu_iotlb_sync(struct iommu_domain *domain) +static void viommu_iotlb_sync(struct iommu_domain *domain, + struct iommu_iotlb_gather *gather) { struct viommu_domain *vdomain = to_viommu_domain(domain); |