[PATCH 08/13] swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single

Khalid Elmously khalid.elmously at canonical.com
Wed Oct 13 06:50:02 UTC 2021

From: Christoph Hellwig <hch at lst.de>

BugLink: https://bugs.launchpad.net/bugs/1943902

swiotlb_tbl_map_single currently nevers sets a tlb_addr that is not
aligned to the tlb bucket size.  But we're going to add such a case
soon, for which this adjustment would be bogus.

Signed-off-by: Christoph Hellwig <hch at lst.de>
Acked-by: Jianxiong Gao <jxgao at google.com>
Tested-by: Jianxiong Gao <jxgao at google.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>
(cherry picked from commit 16fc3cef33a04632ab6b31758abdd77563a20759)
Signed-off-by: Khalid Elmously <khalid.elmously at canonical.com>
 kernel/dma/swiotlb.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index 3ab8a701083cc..b5a0bc7d71f2f 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -645,7 +645,6 @@ void swiotlb_tbl_sync_single(struct device *hwdev, phys_addr_t tlb_addr,
 	if (orig_addr == INVALID_PHYS_ADDR)
-	orig_addr += (unsigned long)tlb_addr & (IO_TLB_SIZE - 1);
 	switch (target) {
 	case SYNC_FOR_CPU:

More information about the kernel-team mailing list