swiotlb: Support aligned swiotlb buffers

[mirror_ubuntu-jammy-kernel.git] / kernel / dma / swiotlb.c

diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index 912397dbc2a858b2c891fbb655a75405eca7d47b..2ee5419649ed73847651f31fa4ce399d50bafcd5 100644 (file)
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -459,7 +459,7 @@ static unsigned int wrap_index(struct io_tlb_mem *mem, unsigned int index)
  * allocate a buffer from that IO TLB pool.
  */
 static int swiotlb_find_slots(struct device *dev, phys_addr_t orig_addr,
-                             size_t alloc_size)
+                             size_t alloc_size, unsigned int alloc_align_mask)
 {
        struct io_tlb_mem *mem = dev->dma_io_tlb_mem;
        unsigned long boundary_mask = dma_get_seg_boundary(dev);
@@ -483,6 +483,7 @@ static int swiotlb_find_slots(struct device *dev, phys_addr_t orig_addr,
        stride = (iotlb_align_mask >> IO_TLB_SHIFT) + 1;
        if (alloc_size >= PAGE_SIZE)
                stride = max(stride, stride << (PAGE_SHIFT - IO_TLB_SHIFT));
+       stride = max(stride, (alloc_align_mask >> IO_TLB_SHIFT) + 1);
 
        spin_lock_irqsave(&mem->lock, flags);
        if (unlikely(nslots > mem->nslabs - mem->used))
@@ -541,7 +542,8 @@ found:
 
 phys_addr_t swiotlb_tbl_map_single(struct device *dev, phys_addr_t orig_addr,
                size_t mapping_size, size_t alloc_size,
-               enum dma_data_direction dir, unsigned long attrs)
+               unsigned int alloc_align_mask, enum dma_data_direction dir,
+               unsigned long attrs)
 {
        struct io_tlb_mem *mem = dev->dma_io_tlb_mem;
        unsigned int offset = swiotlb_align_offset(dev, orig_addr);
@@ -561,7 +563,8 @@ phys_addr_t swiotlb_tbl_map_single(struct device *dev, phys_addr_t orig_addr,
                return (phys_addr_t)DMA_MAPPING_ERROR;
        }
 
-       index = swiotlb_find_slots(dev, orig_addr, alloc_size + offset);
+       index = swiotlb_find_slots(dev, orig_addr,
+                                  alloc_size + offset, alloc_align_mask);
        if (index == -1) {
                if (!(attrs & DMA_ATTR_NO_WARN))
                        dev_warn_ratelimited(dev,
@@ -680,7 +683,7 @@ dma_addr_t swiotlb_map(struct device *dev, phys_addr_t paddr, size_t size,
        trace_swiotlb_bounced(dev, phys_to_dma(dev, paddr), size,
                              swiotlb_force);
 
-       swiotlb_addr = swiotlb_tbl_map_single(dev, paddr, size, size, dir,
+       swiotlb_addr = swiotlb_tbl_map_single(dev, paddr, size, size, 0, dir,
                        attrs);
        if (swiotlb_addr == (phys_addr_t)DMA_MAPPING_ERROR)
                return DMA_MAPPING_ERROR;
@@ -764,7 +767,7 @@ struct page *swiotlb_alloc(struct device *dev, size_t size)
        if (!mem)
                return NULL;
 
-       index = swiotlb_find_slots(dev, 0, size);
+       index = swiotlb_find_slots(dev, 0, size, 0);
        if (index == -1)
                return NULL;