From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 Dec 2019 19:05:00 +0000 (-0800)
Subject: Merge tag 'iommu-updates-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro... 
X-Git-Tag: v5.10.7~3741
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1daa56bcfd8b329447e0c1b1e91c3925d08489b7;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'iommu-updates-v5.5' of git://git./linux/kernel/git/joro/iommu

Pull iommu updates from Joerg Roedel:

 - Conversion of the AMD IOMMU driver to use the dma-iommu code for
   imlementing the DMA-API. This gets rid of quite some code in the
   driver itself, but also has some potential for regressions (non are
   known at the moment).

 - Support for the Qualcomm SMMUv2 implementation in the SDM845 SoC.
   This also includes some firmware interface changes, but those are
   acked by the respective maintainers.

 - Preparatory work to support two distinct page-tables per domain in
   the ARM-SMMU driver

 - Power management improvements for the ARM SMMUv2

 - Custom PASID allocator support

 - Multiple PCI DMA alias support for the AMD IOMMU driver

 - Adaption of the Mediatek driver to the changed IO/TLB flush interface
   of the IOMMU core code.

 - Preparatory patches for the Renesas IOMMU driver to support future
   hardware.

* tag 'iommu-updates-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (62 commits)
  iommu/rockchip: Don't provoke WARN for harmless IRQs
  iommu/vt-d: Turn off translations at shutdown
  iommu/vt-d: Check VT-d RMRR region in BIOS is reported as reserved
  iommu/arm-smmu: Remove duplicate error message
  iommu/arm-smmu-v3: Don't display an error when IRQ lines are missing
  iommu/ipmmu-vmsa: Add utlb_offset_base
  iommu/ipmmu-vmsa: Add helper functions for "uTLB" registers
  iommu/ipmmu-vmsa: Calculate context registers' offset instead of a macro
  iommu/ipmmu-vmsa: Add helper functions for MMU "context" registers
  iommu/ipmmu-vmsa: tidyup register definitions
  iommu/ipmmu-vmsa: Remove all unused register definitions
  iommu/mediatek: Reduce the tlb flush timeout value
  iommu/mediatek: Get rid of the pgtlock
  iommu/mediatek: Move the tlb_sync into tlb_flush
  iommu/mediatek: Delete the leaf in the tlb_flush
  iommu/mediatek: Use gather to achieve the tlb range flush
  iommu/mediatek: Add a new tlb_lock for tlb_flush
  iommu/mediatek: Correct the flush_iotlb_all callback
  iommu/io-pgtable-arm: Rename IOMMU_QCOM_SYS_CACHE and improve doc
  iommu/io-pgtable-arm: Rationalise MAIR handling
  ...
---

1daa56bcfd8b329447e0c1b1e91c3925d08489b7
diff --cc drivers/iommu/dma-iommu.c
index 646332f,ecc08ae..0cc702a
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@@ -710,10 -733,10 +732,10 @@@ static dma_addr_t iommu_dma_map_page(st
  	int prot = dma_info_to_prot(dir, coherent, attrs);
  	dma_addr_t dma_handle;
  
- 	dma_handle =__iommu_dma_map(dev, phys, size, prot);
+ 	dma_handle = __iommu_dma_map(dev, phys, size, prot, dma_get_mask(dev));
  	if (!coherent && !(attrs & DMA_ATTR_SKIP_CPU_SYNC) &&
  	    dma_handle != DMA_MAPPING_ERROR)
 -		arch_sync_dma_for_device(dev, phys, size, dir);
 +		arch_sync_dma_for_device(phys, size, dir);
  	return dma_handle;
  }