Hey Linus,
Please git pull the following branch:
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git stable/for-linus-5.13
where Christoph Hellwig has taken a cleaver and trimmed off the not-needed code
and nicely folded duplicate code in the generic framework.
This lays the groundwork for more work to add extra DMA-backend-ish in the
future. Along with that some bug-fixes to make this a nice working package.
Please pull!
arch/arm/mm/init.c | 6 +-
arch/arm/xen/mm.c | 2 +-
arch/powerpc/platforms/pseries/svm.c | 6 +-
arch/x86/xen/pci-swiotlb-xen.c | 4 +-
drivers/gpu/drm/i915/gem/i915_gem_internal.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +-
drivers/iommu/dma-iommu.c | 23 +-
drivers/pci/xen-pcifront.c | 2 +-
drivers/xen/swiotlb-xen.c | 182 +++++-----
include/linux/swiotlb.h | 68 +++-
include/xen/swiotlb-xen.h | 3 +-
kernel/dma/direct.c | 8 +-
kernel/dma/direct.h | 6 +-
kernel/dma/swiotlb.c | 520 ++++++++++-----------------
14 files changed, 356 insertions(+), 478 deletions(-)
Christoph Hellwig (14):
powerpc/svm: stop using io_tlb_start
swiotlb: remove the alloc_size parameter to swiotlb_tbl_unmap_single
swiotlb: move orig addr and size validation into swiotlb_bounce
swiotlb: split swiotlb_tbl_sync_single
xen-swiotlb: use is_swiotlb_buffer in is_xen_swiotlb_buffer
xen-swiotlb: use io_tlb_end in xen_swiotlb_dma_supported
xen-swiotlb: remove xen_set_nslabs
xen-swiotlb: remove xen_io_tlb_start and xen_io_tlb_nslabs
swiotlb: lift the double initialization protection from xen-swiotlb
xen-swiotlb: split xen_swiotlb_init
xen-swiotlb: remove the unused size argument from xen_swiotlb_fixup
swiotlb: dynamically allocate io_tlb_default_mem
swiotlb: remove swiotlb_nr_tbl
swiotlb: don't override user specified size in swiotlb_adjust_size
Claire Chang (2):
swiotlb: move global variables into a new io_tlb_mem structure
swiotlb: Fix the type of index
Florian Fainelli (2):
ARM: Qualify enabling of swiotlb_init()
swiotlb: Make SWIOTLB_NO_FORCE perform no allocation
The pull request you sent on Tue, 4 May 2021 11:00:51 -0400:
> git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git stable/for-linus-5.13
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/74d6790cdaaf3825afe53e668b32e662ad5e2e12
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html