From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Feb 2021 21:59:32 +0000 (-0800)
Subject: Merge branch 'stable/for-linus-5.12' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.12-rc1-dontuse~16
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ef9856a734af9bc71e5a8554374380e200fe7fc4;p=linux-block.git

Merge branch 'stable/for-linus-5.12' of git://git./linux/kernel/git/konrad/swiotlb

Pull swiotlb updates from Konrad Rzeszutek Wilk:
 "Two memory encryption related patches (SWIOTLB is enabled by default
  for AMD-SEV):

   - Add support for alignment so that NVME can properly work

   - Keep track of requested DMA buffers length, as underlaying hardware
     devices can trip SWIOTLB to bounce too much and crash the kernel

  And a tiny fix to use proper APIs in drivers"

* 'stable/for-linus-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb: Validate bounce size in the sync/unmap path
  nvme-pci: set min_align_mask
  swiotlb: respect min_align_mask
  swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single
  swiotlb: refactor swiotlb_tbl_map_single
  swiotlb: clean up swiotlb_tbl_unmap_single
  swiotlb: factor out a nr_slots helper
  swiotlb: factor out an io_tlb_offset helper
  swiotlb: add a IO_TLB_SIZE define
  driver core: add a min_align_mask field to struct device_dma_parameters
  sdhci: stop poking into swiotlb internals
---

ef9856a734af9bc71e5a8554374380e200fe7fc4