UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

xen-swiotlb: use io_tlb_end in xen_swiotlb_dma_supported 

Use the existing variable that holds the physical address for
xen_io_tlb_end to simplify xen_swiotlb_dma_supported a bit, and remove
the otherwise unused xen_io_tlb_end variable and the xen_virt_to_bus
helper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Christoph Hellwig 2021-03-01 08:44:28 +01:00 committed by Konrad Rzeszutek Wilk
parent 16bc75f3aa
commit 6223d1cef7
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@
* API. * API.
*/ */
static char *xen_io_tlb_start, *xen_io_tlb_end; static char *xen_io_tlb_start;
static unsigned long xen_io_tlb_nslabs; static unsigned long xen_io_tlb_nslabs;
/* /*
* Quick lookup value of the bus address of the IOTLB. * Quick lookup value of the bus address of the IOTLB.
@ -82,11 +82,6 @@ static inline phys_addr_t xen_dma_to_phys(struct device *dev,
return xen_bus_to_phys(dev, dma_to_phys(dev, dma_addr)); return xen_bus_to_phys(dev, dma_to_phys(dev, dma_addr));
} }
static inline dma_addr_t xen_virt_to_bus(struct device *dev, void *address)
{
return xen_phys_to_dma(dev, virt_to_phys(address));
}
static inline int range_straddles_page_boundary(phys_addr_t p, size_t size) static inline int range_straddles_page_boundary(phys_addr_t p, size_t size)
{ {
unsigned long next_bfn, xen_pfn = XEN_PFN_DOWN(p); unsigned long next_bfn, xen_pfn = XEN_PFN_DOWN(p);
@ -250,7 +245,6 @@ retry:
rc = swiotlb_late_init_with_tbl(xen_io_tlb_start, xen_io_tlb_nslabs); rc = swiotlb_late_init_with_tbl(xen_io_tlb_start, xen_io_tlb_nslabs);
end: end:
xen_io_tlb_end = xen_io_tlb_start + bytes;
if (!rc) if (!rc)
swiotlb_set_max_segment(PAGE_SIZE); swiotlb_set_max_segment(PAGE_SIZE);
@ -558,7 +552,7 @@ xen_swiotlb_sync_sg_for_device(struct device *dev, struct scatterlist *sgl,
static int static int
xen_swiotlb_dma_supported(struct device *hwdev, u64 mask) xen_swiotlb_dma_supported(struct device *hwdev, u64 mask)
{ {
return xen_virt_to_bus(hwdev, xen_io_tlb_end - 1) <= mask; return xen_phys_to_dma(hwdev, io_tlb_end - 1) <= mask;
} }
const struct dma_map_ops xen_swiotlb_dma_ops = { const struct dma_map_ops xen_swiotlb_dma_ops = {