|
@@ -403,7 +403,7 @@ dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
|
|
/* we are not interested in the dma_addr returned by
|
|
/* we are not interested in the dma_addr returned by
|
|
* xen_dma_map_page, only in the potential cache flushes executed
|
|
* xen_dma_map_page, only in the potential cache flushes executed
|
|
* by the function. */
|
|
* by the function. */
|
|
- xen_dma_map_page(dev, page, offset, size, dir, attrs);
|
|
|
|
|
|
+ xen_dma_map_page(dev, page, dev_addr, offset, size, dir, attrs);
|
|
return dev_addr;
|
|
return dev_addr;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -417,7 +417,7 @@ dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
|
|
return DMA_ERROR_CODE;
|
|
return DMA_ERROR_CODE;
|
|
|
|
|
|
xen_dma_map_page(dev, pfn_to_page(map >> PAGE_SHIFT),
|
|
xen_dma_map_page(dev, pfn_to_page(map >> PAGE_SHIFT),
|
|
- map & ~PAGE_MASK, size, dir, attrs);
|
|
|
|
|
|
+ dev_addr, map & ~PAGE_MASK, size, dir, attrs);
|
|
dev_addr = xen_phys_to_bus(map);
|
|
dev_addr = xen_phys_to_bus(map);
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -574,6 +574,7 @@ xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl,
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
xen_dma_map_page(hwdev, pfn_to_page(map >> PAGE_SHIFT),
|
|
xen_dma_map_page(hwdev, pfn_to_page(map >> PAGE_SHIFT),
|
|
|
|
+ dev_addr,
|
|
map & ~PAGE_MASK,
|
|
map & ~PAGE_MASK,
|
|
sg->length,
|
|
sg->length,
|
|
dir,
|
|
dir,
|
|
@@ -584,6 +585,7 @@ xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl,
|
|
* xen_dma_map_page, only in the potential cache flushes executed
|
|
* xen_dma_map_page, only in the potential cache flushes executed
|
|
* by the function. */
|
|
* by the function. */
|
|
xen_dma_map_page(hwdev, pfn_to_page(paddr >> PAGE_SHIFT),
|
|
xen_dma_map_page(hwdev, pfn_to_page(paddr >> PAGE_SHIFT),
|
|
|
|
+ dev_addr,
|
|
paddr & ~PAGE_MASK,
|
|
paddr & ~PAGE_MASK,
|
|
sg->length,
|
|
sg->length,
|
|
dir,
|
|
dir,
|