Skip to content
  • Linus Torvalds's avatar
    Merge branch 'stable/for-linus-5.15' of... · 3de18c86
    Linus Torvalds authored
    Merge branch 'stable/for-linus-5.15' of git://
    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:// (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