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

Pull IOMMU updates from Joerg Roedel:
 "This time the updates contain:

   - Tracepoints for certain IOMMU-API functions to make their use
     easier to debug
   - A tracepoint for IOMMU page faults to make it easier to get them in
     user space
   - Updates and fixes for the new ARM SMMU driver after the first
     hardware showed up
   - Various other fixes and cleanups in other IOMMU drivers"

* tag 'iommu-updates-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (26 commits)
  iommu/shmobile: Enable the driver on all ARM platforms
  iommu/tegra-smmu: Staticize tegra_smmu_pm_ops
  iommu/tegra-gart: Staticize tegra_gart_pm_ops
  iommu/vt-d: Use list_for_each_entry_safe() for dmar_domain->devices traversal
  iommu/vt-d: Use for_each_drhd_unit() instead of list_for_each_entry()
  iommu/vt-d: Fixed interaction of VFIO_IOMMU_MAP_DMA with IOMMU address limits
  iommu/arm-smmu: Clear global and context bank fault status registers
  iommu/arm-smmu: Print context fault information
  iommu/arm-smmu: Check for num_context_irqs > 0 to avoid divide by zero exception
  iommu/arm-smmu: Refine check for proper size of mapped region
  iommu/arm-smmu: Switch to subsys_initcall for driver registration
  iommu/arm-smmu: use relaxed accessors where possible
  iommu/arm-smmu: replace devm_request_and_ioremap by devm_ioremap_resource
  iommu: Remove stack trace from broken irq remapping warning
  iommu: Change iommu driver to call io_page_fault trace event
  iommu: Add iommu_error class event to iommu trace
  iommu/tegra: gart: cleanup devm_* functions usage
  iommu/tegra: Print phys_addr_t using %pa
  iommu: No need to pass '0x' when '%pa' is used
  iommu: Change iommu driver to call unmap trace event
  ...

1 files changed, 162 insertions, 0 deletions

diff --git a/include/trace/events/iommu.h b/include/trace/events/iommu.h
new file mode 100644
index 000000000000..a8f5c32d174b
--- /dev/null
+++ b/include/trace/events/iommu.h
@@ -0,0 +1,162 @@
+/*
+ * iommu trace points
+ *
+ * Copyright (C) 2013 Shuah Khan <shuah.kh@samsung.com>
+ *
+ */
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM iommu
+
+#if !defined(_TRACE_IOMMU_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_IOMMU_H
+
+#include <linux/tracepoint.h>
+#include <linux/pci.h>
+
+struct device;
+
+DECLARE_EVENT_CLASS(iommu_group_event,
+
+        TP_PROTO(int group_id, struct device *dev),
+
+        TP_ARGS(group_id, dev),
+
+        TP_STRUCT__entry(
+                __field(int, gid)
+                __string(device, dev_name(dev))
+        ),
+
+        TP_fast_assign(
+                __entry->gid = group_id;
+                __assign_str(device, dev_name(dev));
+        ),
+
+        TP_printk("IOMMU: groupID=%d device=%s",
+                        __entry->gid, __get_str(device)
+        )
+);
+
+DEFINE_EVENT(iommu_group_event, add_device_to_group,
+
+        TP_PROTO(int group_id, struct device *dev),
+
+        TP_ARGS(group_id, dev)
+
+);
+
+DEFINE_EVENT(iommu_group_event, remove_device_from_group,
+
+        TP_PROTO(int group_id, struct device *dev),
+
+        TP_ARGS(group_id, dev)
+);
+
+DECLARE_EVENT_CLASS(iommu_device_event,
+
+        TP_PROTO(struct device *dev),
+
+        TP_ARGS(dev),
+
+        TP_STRUCT__entry(
+                __string(device, dev_name(dev))
+        ),
+
+        TP_fast_assign(
+                __assign_str(device, dev_name(dev));
+        ),
+
+        TP_printk("IOMMU: device=%s", __get_str(device)
+        )
+);
+
+DEFINE_EVENT(iommu_device_event, attach_device_to_domain,
+
+        TP_PROTO(struct device *dev),
+
+        TP_ARGS(dev)
+);
+
+DEFINE_EVENT(iommu_device_event, detach_device_from_domain,
+
+        TP_PROTO(struct device *dev),
+
+        TP_ARGS(dev)
+);
+
+DECLARE_EVENT_CLASS(iommu_map_unmap,
+
+        TP_PROTO(unsigned long iova, phys_addr_t paddr, size_t size),
+
+        TP_ARGS(iova, paddr, size),
+
+        TP_STRUCT__entry(
+                __field(u64, iova)
+                __field(u64, paddr)
+                __field(int, size)
+        ),
+
+        TP_fast_assign(
+                __entry->iova = iova;
+                __entry->paddr = paddr;
+                __entry->size = size;
+        ),
+
+        TP_printk("IOMMU: iova=0x%016llx paddr=0x%016llx size=0x%x",
+                        __entry->iova, __entry->paddr, __entry->size
+        )
+);
+
+DEFINE_EVENT(iommu_map_unmap, map,
+
+        TP_PROTO(unsigned long iova, phys_addr_t paddr, size_t size),
+
+        TP_ARGS(iova, paddr, size)
+);
+
+DEFINE_EVENT_PRINT(iommu_map_unmap, unmap,
+
+        TP_PROTO(unsigned long iova, phys_addr_t paddr, size_t size),
+
+        TP_ARGS(iova, paddr, size),
+
+        TP_printk("IOMMU: iova=0x%016llx size=0x%x",
+                        __entry->iova, __entry->size
+        )
+);
+
+DECLARE_EVENT_CLASS(iommu_error,
+
+        TP_PROTO(struct device *dev, unsigned long iova, int flags),
+
+        TP_ARGS(dev, iova, flags),
+
+        TP_STRUCT__entry(
+                __string(device, dev_name(dev))
+                __string(driver, dev_driver_string(dev))
+                __field(u64, iova)
+                __field(int, flags)
+        ),
+
+        TP_fast_assign(
+                __assign_str(device, dev_name(dev));
+                __assign_str(driver, dev_driver_string(dev));
+                __entry->iova = iova;
+                __entry->flags = flags;
+        ),
+
+        TP_printk("IOMMU:%s %s iova=0x%016llx flags=0x%04x",
+                        __get_str(driver), __get_str(device),
+                        __entry->iova, __entry->flags
+        )
+);
+
+DEFINE_EVENT(iommu_error, io_page_fault,
+
+        TP_PROTO(struct device *dev, unsigned long iova, int flags),
+
+        TP_ARGS(dev, iova, flags)
+);
+#endif /* _TRACE_IOMMU_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>