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

Pull swiotlb updates from Konrad Rzeszutek Wilk:
 "A new feature called restricted DMA pools. It allows SWIOTLB to
  utilize per-device (or per-platform) allocated memory pools instead of
  using the global one.

  The first big user of this is ARM Confidential Computing where the
  memory for DMA operations can be set per platform"

* 'stable/for-linus-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb: (23 commits)
  swiotlb: use depends on for DMA_RESTRICTED_POOL
  of: restricted dma: Don't fail device probe on rmem init failure
  of: Move of_dma_set_restricted_buffer() into device.c
  powerpc/svm: Don't issue ultracalls if !mem_encrypt_active()
  s390/pv: fix the forcing of the swiotlb
  swiotlb: Free tbl memory in swiotlb_exit()
  swiotlb: Emit diagnostic in swiotlb_exit()
  swiotlb: Convert io_default_tlb_mem to static allocation
  of: Return success from of_dma_set_restricted_buffer() when !OF_ADDRESS
  swiotlb: add overflow checks to swiotlb_bounce
  swiotlb: fix implicit debugfs declarations
  of: Add plumbing for restricted DMA pool
  dt-bindings: of: Add restricted DMA pool
  swiotlb: Add restricted DMA pool initialization
  swiotlb: Add restricted DMA alloc/free support
  swiotlb: Refactor swiotlb_tbl_unmap_single
  swiotlb: Move alloc_size to swiotlb_find_slots
  swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing
  swiotlb: Update is_swiotlb_active to add a struct device argument
  swiotlb: Update is_swiotlb_buffer to add a struct device argument
  ...

diff --cc arch/s390/mm/init.c
Simple merge

diff --cc drivers/base/core.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_internal.c
Simple merge

diff --cc drivers/iommu/dma-iommu.c
Simple merge

diff --cc drivers/pci/xen-pcifront.c
Simple merge

diff --cc drivers/xen/swiotlb-xen.c
Simple merge

diff --cc include/linux/device.h
Simple merge

diff --cc kernel/dma/Kconfig
Simple merge

diff --cc kernel/dma/direct.c
index 8dca4f9,2de33e5..4c6c5e0
--- 1/kernel/dma/direct.c
--- 2/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@@ -155,15 -174,10 +174,16 @@@ void *dma_direct_alloc(struct device *d
        }
  
        if (!IS_ENABLED(CONFIG_ARCH_HAS_DMA_SET_UNCACHED) &&
 -          !IS_ENABLED(CONFIG_DMA_DIRECT_REMAP) && !dev_is_dma_coherent(dev) &&
 +          !IS_ENABLED(CONFIG_DMA_DIRECT_REMAP) &&
 +          !IS_ENABLED(CONFIG_DMA_GLOBAL_POOL) &&
-           !dev_is_dma_coherent(dev))
++          !dev_is_dma_coherent(dev) &&
+           !is_swiotlb_for_alloc(dev))
                return arch_dma_alloc(dev, size, dma_handle, gfp, attrs);
  
 +      if (IS_ENABLED(CONFIG_DMA_GLOBAL_POOL) &&
 +          !dev_is_dma_coherent(dev))
 +              return dma_alloc_from_global_coherent(dev, size, dma_handle);
 +
        /*
         * Remapping or decrypting memory may block. If either is required and
         * we can't block, allocate the memory from the atomic pools.
@@@ -259,9 -278,8 +284,10 @@@ void dma_direct_free(struct device *dev
        }
  
        if (!IS_ENABLED(CONFIG_ARCH_HAS_DMA_SET_UNCACHED) &&
 -          !IS_ENABLED(CONFIG_DMA_DIRECT_REMAP) && !dev_is_dma_coherent(dev) &&
 +          !IS_ENABLED(CONFIG_DMA_DIRECT_REMAP) &&
 +          !IS_ENABLED(CONFIG_DMA_GLOBAL_POOL) &&
-           !dev_is_dma_coherent(dev)) {
++          !dev_is_dma_coherent(dev) &&
+           !is_swiotlb_for_alloc(dev)) {
                arch_dma_free(dev, size, cpu_addr, dma_addr, attrs);
                return;
        }