• Linus Torvalds's avatar
    Merge tag 'dma-mapping-5.19-2022-05-25' of git://git.infradead.org/users/hch/dma-mapping · 3f306ea2
    Linus Torvalds authored
    Pull dma-mapping updates from Christoph Hellwig:
    
     - don't over-decrypt memory (Robin Murphy)
    
     - takes min align mask into account for the swiotlb max mapping size
       (Tianyu Lan)
    
     - use GFP_ATOMIC in dma-debug (Mikulas Patocka)
    
     - fix DMA_ATTR_NO_KERNEL_MAPPING on xen/arm (me)
    
     - don't fail on highmem CMA pages in dma_direct_alloc_pages (me)
    
     - cleanup swiotlb initialization and share more code with swiotlb-xen
       (me, Stefano Stabellini)
    
    * tag 'dma-mapping-5.19-2022-05-25' of git://git.infradead.org/users/hch/dma-mapping: (23 commits)
      dma-direct: don't over-decrypt memory
      swiotlb: max mapping size takes min align mask into account
      swiotlb: use the right nslabs-derived sizes in swiotlb_init_late
      swiotlb: use the right nslabs value in swiotlb_init_remap
      swiotlb: don't panic when the swiotlb buffer can't be allocated
      dma-debug: change allocation mode from GFP_NOWAIT to GFP_ATIOMIC
      dma-direct: don't fail on highmem CMA pages in dma_direct_alloc_pages
      swiotlb-xen: fix DMA_ATTR_NO_KERNEL_MAPPING on arm
      x86: remove cruft from <asm/dma-mapping.h>
      swiotlb: remove swiotlb_init_with_tbl and swiotlb_init_late_with_tbl
      swiotlb: merge swiotlb-xen initialization into swiotlb
      swiotlb: provide swiotlb_init variants that remap the buffer
      swiotlb: pass a gfp_mask argument to swiotlb_init_late
      swiotlb: add a SWIOTLB_ANY flag to lift the low memory restriction
      swiotlb: make the swiotlb_init interface more useful
      x86: centralize setting SWIOTLB_FORCE when guest memory encryption is enabled
      x86: remove the IOMMU table infrastructure
      MIPS/octeon: use swiotlb_init instead of open coding it
      arm/xen: don't check for xen_initial_domain() in xen_create_contiguous_region
      swiotlb: rename swiotlb_late_init_with_default_size
      ...
    3f306ea2
mem_encrypt_amd.c 13.8 KB