diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2009-05-10 12:16:06 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-05-10 14:49:52 -0400 |
commit | 4c25a2c1b90bf785fc2e2f0f0c74a80b3e070d39 (patch) | |
tree | 2784fbbf4d6782db300b92870d2bf6111ef26627 /include/linux/intel-iommu.h | |
parent | fa3b6dcd5298db2e7b63c17795c9e5570d3df8d9 (diff) |
intel-iommu: Clean up handling of "caching mode" vs. context flushing.
It really doesn't make a lot of sense to have some of the logic to
handle caching vs. non-caching mode duplicated in qi_flush_context() and
__iommu_flush_context(), while the return value indicates whether the
caller should take other action which depends on the same thing.
Especially since qi_flush_context() thought it was returning something
entirely different anyway.
This patch makes qi_flush_context() and __iommu_flush_context() both
return void, removes the 'non_present_entry_flush' argument and makes
the only call site which _set_ that argument to 1 do the right thing.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'include/linux/intel-iommu.h')
-rw-r--r-- | include/linux/intel-iommu.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index 7246971a7fe..f2b94dafbf3 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h | |||
@@ -281,8 +281,8 @@ struct ir_table { | |||
281 | #endif | 281 | #endif |
282 | 282 | ||
283 | struct iommu_flush { | 283 | struct iommu_flush { |
284 | int (*flush_context)(struct intel_iommu *iommu, u16 did, u16 sid, u8 fm, | 284 | void (*flush_context)(struct intel_iommu *iommu, u16 did, u16 sid, |
285 | u64 type, int non_present_entry_flush); | 285 | u8 fm, u64 type); |
286 | int (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr, | 286 | int (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr, |
287 | unsigned int size_order, u64 type, int non_present_entry_flush); | 287 | unsigned int size_order, u64 type, int non_present_entry_flush); |
288 | }; | 288 | }; |
@@ -339,8 +339,8 @@ extern void dmar_disable_qi(struct intel_iommu *iommu); | |||
339 | extern int dmar_reenable_qi(struct intel_iommu *iommu); | 339 | extern int dmar_reenable_qi(struct intel_iommu *iommu); |
340 | extern void qi_global_iec(struct intel_iommu *iommu); | 340 | extern void qi_global_iec(struct intel_iommu *iommu); |
341 | 341 | ||
342 | extern int qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid, | 342 | extern void qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid, |
343 | u8 fm, u64 type, int non_present_entry_flush); | 343 | u8 fm, u64 type); |
344 | extern int qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr, | 344 | extern int qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr, |
345 | unsigned int size_order, u64 type, | 345 | unsigned int size_order, u64 type, |
346 | int non_present_entry_flush); | 346 | int non_present_entry_flush); |