swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single

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@lst.de>
Acked-by: Jianxiong Gao <jxgao@google.com>
Tested-by: Jianxiong Gao <jxgao@google.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

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