Merge tag 'iommu-updates-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Pull IOMMU updates from Joerg Roedel:
 "This time with:

   - Generic page-table framework for ARM IOMMUs using the LPAE
     page-table format, ARM-SMMU and Renesas IPMMU make use of it
     already.

   - Break out the IO virtual address allocator from the Intel IOMMU so
     that it can be used by other DMA-API implementations too.  The
     first user will be the ARM64 common DMA-API implementation for
     IOMMUs

   - Device tree support for Renesas IPMMU

   - Various fixes and cleanups all over the place"

* tag 'iommu-updates-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (36 commits)
  iommu/amd: Convert non-returned local variable to boolean when relevant
  iommu: Update my email address
  iommu/amd: Use wait_event in put_pasid_state_wait
  iommu/amd: Fix amd_iommu_free_device()
  iommu/arm-smmu: Avoid build warning
  iommu/fsl: Various cleanups
  iommu/fsl: Use %pa to print phys_addr_t
  iommu/omap: Print phys_addr_t using %pa
  iommu: Make more drivers depend on COMPILE_TEST
  iommu/ipmmu-vmsa: Fix IOMMU lookup when multiple IOMMUs are registered
  iommu: Disable on !MMU builds
  iommu/fsl: Remove unused fsl_of_pamu_ids[]
  iommu/fsl: Fix section mismatch
  iommu/ipmmu-vmsa: Use the ARM LPAE page table allocator
  iommu: Fix trace_map() to report original iova and original size
  iommu/arm-smmu: add support for iova_to_phys through ATS1PR
  iopoll: Introduce memory-mapped IO polling macros
  iommu/arm-smmu: don't touch the secure STLBIALL register
  iommu/arm-smmu: make use of generic LPAE allocator
  iommu: io-pgtable-arm: add non-secure quirk
  ...

1 files changed, 18 insertions, 13 deletions

diff --git a/include/trace/events/iommu.h b/include/trace/events/iommu.h
index a8f5c32d174b..2c7befb10f13 100644
--- a/include/trace/events/iommu.h
+++ b/include/trace/events/iommu.h
@@ -83,7 +83,7 @@ DEFINE_EVENT(iommu_device_event, detach_device_from_domain,
         TP_ARGS(dev)
 );
 
-DECLARE_EVENT_CLASS(iommu_map_unmap,
+TRACE_EVENT(map,
 
         TP_PROTO(unsigned long iova, phys_addr_t paddr, size_t size),
 
@@ -92,7 +92,7 @@ DECLARE_EVENT_CLASS(iommu_map_unmap,
         TP_STRUCT__entry(
                 __field(u64, iova)
                 __field(u64, paddr)
-                __field(int, size)
+                __field(size_t, size)
         ),
 
         TP_fast_assign(
@@ -101,26 +101,31 @@ DECLARE_EVENT_CLASS(iommu_map_unmap,
                 __entry->size = size;
         ),
 
-        TP_printk("IOMMU: iova=0x%016llx paddr=0x%016llx size=0x%x",
+        TP_printk("IOMMU: iova=0x%016llx paddr=0x%016llx size=%zu",
                         __entry->iova, __entry->paddr, __entry->size
         )
 );
 
-DEFINE_EVENT(iommu_map_unmap, map,
+TRACE_EVENT(unmap,
 
-        TP_PROTO(unsigned long iova, phys_addr_t paddr, size_t size),
-
-        TP_ARGS(iova, paddr, size)
-);
+        TP_PROTO(unsigned long iova, size_t size, size_t unmapped_size),
 
-DEFINE_EVENT_PRINT(iommu_map_unmap, unmap,
+        TP_ARGS(iova, size, unmapped_size),
 
-        TP_PROTO(unsigned long iova, phys_addr_t paddr, size_t size),
+        TP_STRUCT__entry(
+                __field(u64, iova)
+                __field(size_t, size)
+                __field(size_t, unmapped_size)
+        ),
 
-        TP_ARGS(iova, paddr, size),
+        TP_fast_assign(
+                __entry->iova = iova;
+                __entry->size = size;
+                __entry->unmapped_size = unmapped_size;
+        ),
 
-        TP_printk("IOMMU: iova=0x%016llx size=0x%x",
-                        __entry->iova, __entry->size
+        TP_printk("IOMMU: iova=0x%016llx size=%zu unmapped_size=%zu",
+                        __entry->iova, __entry->size, __entry->unmapped_size
         )
 );