Commit 98318cd3 authored Jun 21, 2019 by Alexander Shishkin Committed by Greg Kroah-Hartman Jul 26, 2019

intel_th: msu: Fix single mode with disabled IOMMU

commit 918b8646497b5dba6ae82d4a7325f01b258972b9 upstream.

Commit 4e0eaf239fb3 ("intel_th: msu: Fix single mode with IOMMU") switched
the single mode code to use dma mapping pages obtained from the page
allocator, but with IOMMU disabled, that may lead to using SWIOTLB bounce
buffers and without additional sync'ing, produces empty trace buffers.

Fix this by using a DMA32 GFP flag to the page allocation in single mode,
as the device supports full 32-bit DMA addressing.

Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Fixes: 4e0eaf239fb3 ("intel_th: msu: Fix single mode with IOMMU")
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reported-by: Ammy Yi <ammy.yi@intel.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20190621161930.60785-4-alexander.shishkin@linux.intel.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent d6328d7c

drivers/hwtracing/intel_th/msu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -632,7 +632,7 @@ static int msc_buffer_contig_alloc(struct msc *msc, unsigned long size)
		goto err_out;

		ret = -ENOMEM;
		page = alloc_pages(GFP_KERNEL \| __GFP_ZERO, order);
		page = alloc_pages(GFP_KERNEL \| __GFP_ZERO \| GFP_DMA32, order);
		if (!page)
		goto err_free_sgt;