github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "Revert "swiotlb: clean up swiotlb_tbl_unmap_single""

Browse Source 
This reverts commit 28a2f5f10f.

Bring back the commit in 5.10.35 that broke the kabi.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibebda0f5aeecc6ba2fe45902870b783e3e9cbb0f
This commit is contained in:
Greg Kroah-Hartman 2021-05-10 14:20:57 +02:00 committed by Todd Kjos
parent 2893baee79
commit 8ebef45db5
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
kernel/dma/swiotlb.c
View File

@ -610,28 +610,29 @@ void swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr,
* with slots below and above the pool being returned. * with slots below and above the pool being returned.
*/ */
spin_lock_irqsave(&io_tlb_lock, flags); spin_lock_irqsave(&io_tlb_lock, flags);
{ if (index + nslots < ALIGN(index + 1, IO_TLB_SEGSIZE))
count = ((index + nslots) < ALIGN(index + 1, IO_TLB_SEGSIZE) ? count = io_tlb_list[index + nslots];
io_tlb_list[index + nslots] : 0); else
count = 0;
/* /*
* Step 1: return the slots to the free list, merging the * Step 1: return the slots to the free list, merging the slots with
* slots with superceeding slots * superceeding slots
*/ */
for (i = index + nslots - 1; i >= index; i--) { for (i = index + nslots - 1; i >= index; i--) {
io_tlb_list[i] = ++count; io_tlb_list[i] = ++count;
io_tlb_orig_addr[i] = INVALID_PHYS_ADDR; io_tlb_orig_addr[i] = INVALID_PHYS_ADDR;
} }
/* /*
* Step 2: merge the returned slots with the preceding slots, * Step 2: merge the returned slots with the preceding slots, if
* if available (non zero) * available (non zero)
*/ */
for (i = index - 1; for (i = index - 1;
io_tlb_offset(i) != IO_TLB_SEGSIZE - 1 && io_tlb_offset(i) != IO_TLB_SEGSIZE - 1 && io_tlb_list[i];
io_tlb_list[i]; i--) i--)
io_tlb_list[i] = ++count; io_tlb_list[i] = ++count;
io_tlb_used -= nslots; io_tlb_used -= nslots;
}
spin_unlock_irqrestore(&io_tlb_lock, flags); spin_unlock_irqrestore(&io_tlb_lock, flags);
} }