swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single
commit: 16fc3cef33a04632ab6b31758abdd77563a20759
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.
BUG=b/205968222
TEST=presubmit
RELEASE_NOTE=None
SOURCE=UPSTREAM(85a5a6875ca93dc4efbf20df942ba41d27a917e3)
cos-patch: lts-refresh
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>
Signed-off-by: Jianxiong Gao <jxgao@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: I17159477562291fed4a28756ef8f508c1e1803fa
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index e1eed05..0ec2f238 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -648,7 +648,6 @@
if (orig_addr == INVALID_PHYS_ADDR)
return;
- orig_addr += (unsigned long)tlb_addr & (IO_TLB_SIZE - 1);
switch (target) {
case SYNC_FOR_CPU:
