From ba1ab781515e85f24108cd87e1d13e316aebf0e1 Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: May 16 2018 01:49:32 +0000
Subject: Silence unwanted "swiotlb buffer is full" warnings (rhbz 1556797)


---

diff --git a/kernel.spec b/kernel.spec
index dc74556..2f7d2a5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -666,6 +666,9 @@ Patch511: 0001-xfs-set-format-back-to-extents-if-xfs_bmap_extents_t.patch
 # rhbz 1566258
 Patch512: KVM-vmx-update-sec-exec-controls-for-UMIP-iff-emulating-UMIP.patch
 
+# rhbz 1556797
+Patch513: swiotlb-silent-unwanted-warning-buffer-is-full.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1939,6 +1942,9 @@ fi
 #
 #
 %changelog
+* Tue May 15 2018 Jeremy Cline <jeremy@jcline.org>
+- Silence unwanted "swiotlb buffer is full" warnings (rhbz 1556797)
+
 * Thu May 10 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.8-101
 - Bump the release for a rebuild
 
diff --git a/swiotlb-silent-unwanted-warning-buffer-is-full.patch b/swiotlb-silent-unwanted-warning-buffer-is-full.patch
new file mode 100644
index 0000000..3537110
--- /dev/null
+++ b/swiotlb-silent-unwanted-warning-buffer-is-full.patch
@@ -0,0 +1,43 @@
+From 05e13bb57e6f181d7605f8608181c7e6fb7f591d Mon Sep 17 00:00:00 2001
+From: Jean Delvare <jdelvare@suse.de>
+Date: Sat, 12 May 2018 11:57:37 +0200
+Subject: [PATCH] swiotlb: silent unwanted warning "buffer is full"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If DMA_ATTR_NO_WARN is passed to swiotlb_alloc_buffer(), it should be
+passed further down to swiotlb_tbl_map_single(). Otherwise we escape
+half of the warnings but still log the other half.
+
+This is one of the multiple causes of spurious warnings reported at:
+https://bugs.freedesktop.org/show_bug.cgi?id=104082
+
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+Fixes: 0176adb00406 ("swiotlb: refactor coherent buffer allocation")
+Cc: Christoph Hellwig <hch@lst.de>
+Cc: Christian König <christian.koenig@amd.com>
+Cc: Michel Dänzer <michel@daenzer.net>
+Cc: Takashi Iwai <tiwai@suse.de>
+Cc: stable@vger.kernel.org # v4.16
+Signed-off-by: Jeremy Cline <jcline@redhat.com>
+---
+ lib/swiotlb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/swiotlb.c b/lib/swiotlb.c
+index 12fbaa445637..cc640588f145 100644
+--- a/lib/swiotlb.c
++++ b/lib/swiotlb.c
+@@ -714,7 +714,7 @@ swiotlb_alloc_buffer(struct device *dev, size_t size, dma_addr_t *dma_handle,
+ 
+ 	phys_addr = swiotlb_tbl_map_single(dev,
+ 			__phys_to_dma(dev, io_tlb_start),
+-			0, size, DMA_FROM_DEVICE, 0);
++			0, size, DMA_FROM_DEVICE, attrs);
+ 	if (phys_addr == SWIOTLB_MAP_ERROR)
+ 		goto out_warn;
+ 
+-- 
+2.17.0
+