tree 1011cf611967e70d2619af0806cd1a5511fde319
parent bd8b1c2bba7caadb6f5ce786afcefdadc2f95cf8
parent 982ca334e5596780f3b540b31bf36d4e217e0429
author Oleksandr Tymoshenko <ovt@google.com> 1641505175 +0000
committer Oleksandr Tymoshenko <ovt@google.com> 1641509424 +0000

Merge branch contrib/swiotlb-fix-5.4-backport into branch: main-R89-cos-5.4

Changelog:
-------------------------------------------------------------

Jianxiong Gao (9):
      driver core: add a min_align_mask field to struct device_dma_parameters
      swiotlb: add a IO_TLB_SIZE define
      swiotlb: factor out an io_tlb_offset helper
      swiotlb: factor out a nr_slots helper
      swiotlb: clean up swiotlb_tbl_unmap_single
      swiotlb: refactor swiotlb_tbl_map_single
      swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single
      swiotlb: respect min_align_mask
      nvme-pci: set min_align_mask

BUG=b/205968222
TEST=presubmit
RELEASE_NOTE=None

cos-patch: lts-refresh
Signed-off-by: Oleksandr Tymoshenko <ovt@google.com>
Change-Id: I654348eb8559b1c7a2932ab1dc83f5d245ef237e