Merge branch 'stable/for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb

Pull swiotlb fixes from Konrad Rzeszutek Wilk:
 "This has one fix to make i915 work when using Xen SWIOTLB, and a
  feature from Geert to aid in debugging of devices that can't do DMA
  outside the 32-bit address space.

  The feature from Geert is on top of v4.10 merge window commit
  (specifically you pulling my previous branch), as his changes were
  dependent on the Documentation/ movement patches.

  I figured it would just easier than me trying than to cherry-pick the
  Documentation patches to satisfy git.

  The patches have been soaking since 12/20, albeit I updated the last
  patch due to linux-next catching an compiler error and adding an
  Tested-and-Reported-by tag"

* 'stable/for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb: Export swiotlb_max_segment to users
  swiotlb: Add swiotlb=noforce debug option
  swiotlb: Convert swiotlb_force from int to enum
  x86, swiotlb: Simplify pci_swiotlb_detect_override()

1 files changed, 10 insertions, 7 deletions

diff --git a/include/trace/events/swiotlb.h b/include/trace/events/swiotlb.h
index 7ea4c5e7c448..288c0c54a2b4 100644
--- a/include/trace/events/swiotlb.h
+++ b/include/trace/events/swiotlb.h
@@ -11,16 +11,16 @@ TRACE_EVENT(swiotlb_bounced,
         TP_PROTO(struct device *dev,
                  dma_addr_t dev_addr,
                  size_t size,
-                 int swiotlb_force),
+                 enum swiotlb_force swiotlb_force),
 
         TP_ARGS(dev, dev_addr, size, swiotlb_force),
 
         TP_STRUCT__entry(
-                __string(       dev_name,       dev_name(dev)   )
-                __field(        u64,    dma_mask                )
-                __field(        dma_addr_t,     dev_addr        )
-                __field(        size_t, size                    )
-                __field(        int,    swiotlb_force           )
+                __string(       dev_name,       dev_name(dev)           )
+                __field(        u64,    dma_mask                        )
+                __field(        dma_addr_t,     dev_addr                )
+                __field(        size_t, size                            )
+                __field(        enum swiotlb_force,     swiotlb_force   )
         ),
 
         TP_fast_assign(
@@ -37,7 +37,10 @@ TRACE_EVENT(swiotlb_bounced,
                 __entry->dma_mask,
                 (unsigned long long)__entry->dev_addr,
                 __entry->size,
-                __entry->swiotlb_force ? "swiotlb_force" : "" )
+                __print_symbolic(__entry->swiotlb_force,
+                        { SWIOTLB_NORMAL,       "NORMAL" },
+                        { SWIOTLB_FORCE,        "FORCE" },
+                        { SWIOTLB_NO_FORCE,     "NO_FORCE" }))
 );
 
 #endif /*  _TRACE_SWIOTLB_H */