|
@@ -399,7 +399,9 @@ dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
|
|
|
* buffering it.
|
|
|
*/
|
|
|
if (dma_capable(dev, dev_addr, size) &&
|
|
|
- !range_straddles_page_boundary(phys, size) && !swiotlb_force) {
|
|
|
+ !range_straddles_page_boundary(phys, size) &&
|
|
|
+ !xen_arch_need_swiotlb(dev, PFN_DOWN(phys), PFN_DOWN(dev_addr)) &&
|
|
|
+ !swiotlb_force) {
|
|
|
/* we are not interested in the dma_addr returned by
|
|
|
* xen_dma_map_page, only in the potential cache flushes executed
|
|
|
* by the function. */
|
|
@@ -557,6 +559,7 @@ xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl,
|
|
|
dma_addr_t dev_addr = xen_phys_to_bus(paddr);
|
|
|
|
|
|
if (swiotlb_force ||
|
|
|
+ xen_arch_need_swiotlb(hwdev, PFN_DOWN(paddr), PFN_DOWN(dev_addr)) ||
|
|
|
!dma_capable(hwdev, dev_addr, sg->length) ||
|
|
|
range_straddles_page_boundary(paddr, sg->length)) {
|
|
|
phys_addr_t map = swiotlb_tbl_map_single(hwdev,
|