Hey Linus,
Please git pull the following branch:
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git stable/for-linus-5.12
which has two memory encryption related patches (SWIOTLB is enabled by
default for AMD-SEV):
1) Adding support for alignment so that NVME can properly work,
2) Keep track of requested DMA buffers length, as underlaying hardware devices
can trip SWIOTLB to bounce too much and crash the kernel.
And a tiny fix to use proper APIs in drivers.
Please note you will see the tree a bit fresh - that is due to me squashing
in a fix earlier this week, which caused a conflict later, and me fixing up
the conflict caused the authorship to shift to me which I just fixed up now.
Argh!
drivers/mmc/host/sdhci.c | 9 +-
drivers/nvme/host/pci.c | 1 +
include/linux/device.h | 1 +
include/linux/dma-mapping.h | 16 +++
include/linux/swiotlb.h | 1 +
kernel/dma/swiotlb.c | 310 +++++++++++++++++++++++++++-----------------
6 files changed, 215 insertions(+), 123 deletions(-)
Christoph Hellwig (8):
sdhci: stop poking into swiotlb internals
swiotlb: add a IO_TLB_SIZE define
swiotlb: factor out an io_tlb_offset helper
swiotlb: factor out a nr_slots helper
swiotlb: clean up swiotlb_tbl_unmap_single
swiotlb: refactor swiotlb_tbl_map_single
swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single
swiotlb: respect min_align_mask
Jianxiong Gao (2):
driver core: add a min_align_mask field to struct device_dma_parameters
nvme-pci: set min_align_mask
Martin Radev (1):
swiotlb: Validate bounce size in the sync/unmap path
The pull request you sent on Fri, 26 Feb 2021 11:00:08 -0500:
> git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git stable/for-linus-5.12
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/ef9856a734af9bc71e5a8554374380e200fe7fc4
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html