swiotlb-xen: add struct device * parameter to xen_bus_to_phys (d900781a) · Commits · 戴 / test

drivers/xen/swiotlb-xen.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ static inline dma_addr_t xen_phys_to_bus(struct device *dev, phys_addr_t paddr)
		return dma;
		}

		static inline phys_addr_t xen_bus_to_phys(dma_addr_t baddr)
		static inline phys_addr_t xen_bus_to_phys(struct device *dev, dma_addr_t baddr)
		{
		unsigned long xen_pfn = bfn_to_pfn(XEN_PFN_DOWN(baddr));
		dma_addr_t dma = (dma_addr_t)xen_pfn << XEN_PAGE_SHIFT;
		@@ -339,7 +339,7 @@ xen_swiotlb_free_coherent(struct device hwdev, size_t size, void vaddr,

		/* do not use virt_to_phys because on ARM it doesn't return you the
		* physical address */
		phys = xen_bus_to_phys(dev_addr);
		phys = xen_bus_to_phys(hwdev, dev_addr);

		/* Convert the size to actually allocated. */
		size = 1UL << (order + XEN_PAGE_SHIFT);
		@@ -423,7 +423,7 @@ done:
		static void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,
		size_t size, enum dma_data_direction dir, unsigned long attrs)
		{
		phys_addr_t paddr = xen_bus_to_phys(dev_addr);
		phys_addr_t paddr = xen_bus_to_phys(hwdev, dev_addr);

		BUG_ON(dir == DMA_NONE);

		@@ -439,7 +439,7 @@ static void
		xen_swiotlb_sync_single_for_cpu(struct device *dev, dma_addr_t dma_addr,
		size_t size, enum dma_data_direction dir)
		{
		phys_addr_t paddr = xen_bus_to_phys(dma_addr);
		phys_addr_t paddr = xen_bus_to_phys(dev, dma_addr);

		if (!dev_is_dma_coherent(dev))
		xen_dma_sync_for_cpu(dma_addr, paddr, size, dir);
		@@ -452,7 +452,7 @@ static void
		xen_swiotlb_sync_single_for_device(struct device *dev, dma_addr_t dma_addr,
		size_t size, enum dma_data_direction dir)
		{
		phys_addr_t paddr = xen_bus_to_phys(dma_addr);
		phys_addr_t paddr = xen_bus_to_phys(dev, dma_addr);

		if (is_xen_swiotlb_buffer(dma_addr))
		swiotlb_tbl_sync_single(dev, paddr, size, dir, SYNC_FOR_DEVICE);

Admin message