hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

swiotlb: remove the tbl_dma_addr argument to swiotlb_tbl_map_single 

The tbl_dma_addr argument is used to check the DMA boundary for the
allocations, and thus needs to be a dma_addr_t.  swiotlb-xen instead
passed a physical address, which could lead to incorrect results for
strange offsets.  Fix this by removing the parameter entirely and hard
code the DMA address for io_tlb_start instead.

Fixes: 91ffe4ad53 ("swiotlb-xen: introduce phys_to_dma/dma_to_phys translations")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Christoph Hellwig 2020-10-23 08:33:09 +02:00 committed by Konrad Rzeszutek Wilk
parent e9696d259d
commit fc0021aa34
4 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/iommu/intel/iommu.c
View File

@ -3815,9 +3815,8 @@ bounce_map_single(struct device *dev, phys_addr_t paddr, size_t size,
* page aligned, we don't need to use a bounce page. * page aligned, we don't need to use a bounce page.
*/ */
if (!IS_ALIGNED(paddr | size, VTD_PAGE_SIZE)) { if (!IS_ALIGNED(paddr | size, VTD_PAGE_SIZE)) {
tlb_addr = swiotlb_tbl_map_single(dev, tlb_addr = swiotlb_tbl_map_single(dev, paddr, size,
phys_to_dma_unencrypted(dev, io_tlb_start), aligned_size, dir, attrs);
paddr, size, aligned_size, dir, attrs);
if (tlb_addr == DMA_MAPPING_ERROR) { if (tlb_addr == DMA_MAPPING_ERROR) {
goto swiotlb_error; goto swiotlb_error;
} else { } else {

3
drivers/xen/swiotlb-xen.c
View File

@ -395,8 +395,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
*/ */
trace_swiotlb_bounced(dev, dev_addr, size, swiotlb_force); trace_swiotlb_bounced(dev, dev_addr, size, swiotlb_force);
map = swiotlb_tbl_map_single(dev, virt_to_phys(xen_io_tlb_start), map = swiotlb_tbl_map_single(dev, phys, size, size, dir, attrs);
phys, size, size, dir, attrs);
if (map == (phys_addr_t)DMA_MAPPING_ERROR) if (map == (phys_addr_t)DMA_MAPPING_ERROR)
return DMA_MAPPING_ERROR; return DMA_MAPPING_ERROR;

10
include/linux/swiotlb.h
View File

@ -45,13 +45,9 @@ enum dma_sync_target {
SYNC_FOR_DEVICE = 1, SYNC_FOR_DEVICE = 1,
}; };
extern phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, phys_addr_t phys,
dma_addr_t tbl_dma_addr, size_t mapping_size, size_t alloc_size,
phys_addr_t phys, enum dma_data_direction dir, unsigned long attrs);
size_t mapping_size,
size_t alloc_size,
enum dma_data_direction dir,
unsigned long attrs);
extern void swiotlb_tbl_unmap_single(struct device *hwdev, extern void swiotlb_tbl_unmap_single(struct device *hwdev,
phys_addr_t tlb_addr, phys_addr_t tlb_addr,

16
kernel/dma/swiotlb.c
View File

@ -445,14 +445,11 @@ static void swiotlb_bounce(phys_addr_t orig_addr, phys_addr_t tlb_addr,
} }
} }
phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, phys_addr_t orig_addr,
dma_addr_t tbl_dma_addr, size_t mapping_size, size_t alloc_size,
phys_addr_t orig_addr, enum dma_data_direction dir, unsigned long attrs)
size_t mapping_size,
size_t alloc_size,
enum dma_data_direction dir,
unsigned long attrs)
{ {
dma_addr_t tbl_dma_addr = phys_to_dma_unencrypted(hwdev, io_tlb_start);
unsigned long flags; unsigned long flags;
phys_addr_t tlb_addr; phys_addr_t tlb_addr;
unsigned int nslots, stride, index, wrap; unsigned int nslots, stride, index, wrap;
@ -671,9 +668,8 @@ dma_addr_t swiotlb_map(struct device *dev, phys_addr_t paddr, size_t size,
trace_swiotlb_bounced(dev, phys_to_dma(dev, paddr), size, trace_swiotlb_bounced(dev, phys_to_dma(dev, paddr), size,
swiotlb_force); swiotlb_force);
swiotlb_addr = swiotlb_tbl_map_single(dev, swiotlb_addr = swiotlb_tbl_map_single(dev, paddr, size, size, dir,
phys_to_dma_unencrypted(dev, io_tlb_start), attrs);
paddr, size, size, dir, attrs);
if (swiotlb_addr == (phys_addr_t)DMA_MAPPING_ERROR) if (swiotlb_addr == (phys_addr_t)DMA_MAPPING_ERROR)
return DMA_MAPPING_ERROR; return DMA_MAPPING_ERROR;