diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-11-27 17:29:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-11-27 17:29:15 -0800 |
| commit | aa7243aaf1947a0cb54c44337795d6759493fe02 (patch) | |
| tree | 3f42844d1ca426768197c0523d6320c41ff58747 /kernel | |
| parent | 3fa77874b4a7ae96d4ad40623d449cef6265ae4a (diff) | |
| parent | d0d08f4bd7f667dc7a65cd7133c0a94a6f02aca3 (diff) | |
Merge tag 'dma-mapping-6.18-2025-11-27' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux
Pull dma-mapping fixes from Marek Szyprowski:
"Two last minute fixes for the recently modified DMA API infrastructure:
- proper handling of DMA_ATTR_MMIO in dma_iova_unlink() function (me)
- regression fix for the code refactoring related to P2PDMA (Pranjal
Shrivastava)"
* tag 'dma-mapping-6.18-2025-11-27' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux:
dma-direct: Fix missing sg_dma_len assignment in P2PDMA bus mappings
iommu/dma: add missing support for DMA_ATTR_MMIO for dma_iova_unlink()
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/dma/direct.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 1f9ee9759426..f973e7e73c90 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -481,6 +481,7 @@ int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents, case PCI_P2PDMA_MAP_BUS_ADDR: sg->dma_address = pci_p2pdma_bus_addr_map(&p2pdma_state, sg_phys(sg)); + sg_dma_len(sg) = sg->length; sg_dma_mark_bus_address(sg); continue; default: |