These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / xen / swiotlb-xen.c

diff --git a/kernel/drivers/xen/swiotlb-xen.c b/kernel/drivers/xen/swiotlb-xen.c
index 4c54932..7399782 100644 (file)
--- a/kernel/drivers/xen/swiotlb-xen.c
+++ b/kernel/drivers/xen/swiotlb-xen.c
@@ -76,27 +76,27 @@ static unsigned long xen_io_tlb_nslabs;
 static u64 start_dma_addr;
 
 /*
- * Both of these functions should avoid PFN_PHYS because phys_addr_t
+ * Both of these functions should avoid XEN_PFN_PHYS because phys_addr_t
  * can be 32bit when dma_addr_t is 64bit leading to a loss in
  * information if the shift is done before casting to 64bit.
  */
 static inline dma_addr_t xen_phys_to_bus(phys_addr_t paddr)
 {
-       unsigned long mfn = pfn_to_mfn(PFN_DOWN(paddr));
-       dma_addr_t dma = (dma_addr_t)mfn << PAGE_SHIFT;
+       unsigned long bfn = pfn_to_bfn(XEN_PFN_DOWN(paddr));
+       dma_addr_t dma = (dma_addr_t)bfn << XEN_PAGE_SHIFT;
 
-       dma |= paddr & ~PAGE_MASK;
+       dma |= paddr & ~XEN_PAGE_MASK;
 
        return dma;
 }
 
 static inline phys_addr_t xen_bus_to_phys(dma_addr_t baddr)
 {
-       unsigned long pfn = mfn_to_pfn(PFN_DOWN(baddr));
-       dma_addr_t dma = (dma_addr_t)pfn << PAGE_SHIFT;
+       unsigned long xen_pfn = bfn_to_pfn(XEN_PFN_DOWN(baddr));
+       dma_addr_t dma = (dma_addr_t)xen_pfn << XEN_PAGE_SHIFT;
        phys_addr_t paddr = dma;
 
-       paddr |= baddr & ~PAGE_MASK;
+       paddr |= baddr & ~XEN_PAGE_MASK;
 
        return paddr;
 }
@@ -106,19 +106,19 @@ static inline dma_addr_t xen_virt_to_bus(void *address)
        return xen_phys_to_bus(virt_to_phys(address));
 }
 
-static int check_pages_physically_contiguous(unsigned long pfn,
+static int check_pages_physically_contiguous(unsigned long xen_pfn,
                                             unsigned int offset,
                                             size_t length)
 {
-       unsigned long next_mfn;
+       unsigned long next_bfn;
        int i;
        int nr_pages;
 
-       next_mfn = pfn_to_mfn(pfn);
-       nr_pages = (offset + length + PAGE_SIZE-1) >> PAGE_SHIFT;
+       next_bfn = pfn_to_bfn(xen_pfn);
+       nr_pages = (offset + length + XEN_PAGE_SIZE-1) >> XEN_PAGE_SHIFT;
 
        for (i = 1; i < nr_pages; i++) {
-               if (pfn_to_mfn(++pfn) != ++next_mfn)
+               if (pfn_to_bfn(++xen_pfn) != ++next_bfn)
                        return 0;
        }
        return 1;
@@ -126,28 +126,27 @@ static int check_pages_physically_contiguous(unsigned long pfn,
 
 static inline int range_straddles_page_boundary(phys_addr_t p, size_t size)
 {
-       unsigned long pfn = PFN_DOWN(p);
-       unsigned int offset = p & ~PAGE_MASK;
+       unsigned long xen_pfn = XEN_PFN_DOWN(p);
+       unsigned int offset = p & ~XEN_PAGE_MASK;
 
-       if (offset + size <= PAGE_SIZE)
+       if (offset + size <= XEN_PAGE_SIZE)
                return 0;
-       if (check_pages_physically_contiguous(pfn, offset, size))
+       if (check_pages_physically_contiguous(xen_pfn, offset, size))
                return 0;
        return 1;
 }
 
 static int is_xen_swiotlb_buffer(dma_addr_t dma_addr)
 {
-       unsigned long mfn = PFN_DOWN(dma_addr);
-       unsigned long pfn = mfn_to_local_pfn(mfn);
-       phys_addr_t paddr;
+       unsigned long bfn = XEN_PFN_DOWN(dma_addr);
+       unsigned long xen_pfn = bfn_to_local_pfn(bfn);
+       phys_addr_t paddr = XEN_PFN_PHYS(xen_pfn);
 
        /* If the address is outside our domain, it CAN
         * have the same virtual address as another address
         * in our domain. Therefore _only_ check address within our domain.
         */
-       if (pfn_valid(pfn)) {
-               paddr = PFN_PHYS(pfn);
+       if (pfn_valid(PFN_DOWN(paddr))) {
                return paddr >= virt_to_phys(xen_io_tlb_start) &&
                       paddr < virt_to_phys(xen_io_tlb_end);
        }
@@ -311,9 +310,6 @@ xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
        */
        flags &= ~(__GFP_DMA | __GFP_HIGHMEM);
 
-       if (dma_alloc_from_coherent(hwdev, size, dma_handle, &ret))
-               return ret;
-
        /* On ARM this function returns an ioremap'ped virtual address for
         * which virt_to_phys doesn't return the corresponding physical
         * address. In fact on ARM virt_to_phys only works for kernel direct
@@ -356,9 +352,6 @@ xen_swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
        phys_addr_t phys;
        u64 dma_mask = DMA_BIT_MASK(32);
 
-       if (dma_release_from_coherent(hwdev, order, vaddr))
-               return;
-
        if (hwdev && hwdev->coherent_dma_mask)
                dma_mask = hwdev->coherent_dma_mask;
 
@@ -398,7 +391,7 @@ dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
         */
        if (dma_capable(dev, dev_addr, size) &&
            !range_straddles_page_boundary(phys, size) &&
-               !xen_arch_need_swiotlb(dev, PFN_DOWN(phys), PFN_DOWN(dev_addr)) &&
+               !xen_arch_need_swiotlb(dev, phys, 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
@@ -557,7 +550,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)) ||
+                   xen_arch_need_swiotlb(hwdev, paddr, 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,