Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 203f80f1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable/for-linus-4.10' of... 

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

Pull swiotlb fix from Konrad Rzeszutek Wilk:
 "A tiny fix to make sure that page-sized mappings are page-aligned (and
  not say straddle two pages). This is important for some drivers (such
  as NVME)"

* 'stable/for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb: ensure that page-sized mappings are page-aligned
parents 7e84b303 602d9858

lib/swiotlb.c

+3 −3
Original line number Diff line number Diff line
@@ -483,11 +483,11 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, 
		    : 1UL << (BITS_PER_LONG - IO_TLB_SHIFT);



	/*

	 * For mappings greater than a page, we limit the stride (and

	 * hence alignment) to a page size.

	 * For mappings greater than or equal to a page, we limit the stride

	 * (and hence alignment) to a page size.

	 */

	nslots = ALIGN(size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT;

	if (size > PAGE_SIZE)

	if (size >= PAGE_SIZE)

		stride = (1 << (PAGE_SHIFT - IO_TLB_SHIFT));

	else

		stride = 1;