summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorJianxiong Gao <jxgao@google.com>2021-04-29 17:33:13 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-07 11:04:32 +0200
commit85a5a6875ca93dc4efbf20df942ba41d27a917e3 (patch)
treef6e5b187d17aef7ed0e1784c41f7371c5862ad28 /kernel
parent25ed8827cfbf017ffcd195258643c54b55db08c5 (diff)
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. 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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/dma/swiotlb.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index 243750453b3d..b8f82f96c4c2 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -644,7 +644,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: