1 files changed, 0 insertions, 78 deletions
diff --git a/dynamic-layers/raspberrypi/recipes-kernel/linux/files/0003-swiotlb-xen-add-struct-device-parameter-to-xen_phys_.patch b/dynamic-layers/raspberrypi/recipes-kernel/linux/files/0003-swiotlb-xen-add-struct-device-parameter-to-xen_phys_.patch
deleted file mode 100644
index d90701ba..00000000
--- a/dynamic-layers/raspberrypi/recipes-kernel/linux/files/0003-swiotlb-xen-add-struct-device-parameter-to-xen_phys_.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 5ef503632a8df9be70f3c1ff828780e4348a03dc Mon Sep 17 00:00:00 2001
-From: Stefano Stabellini <stefano.stabellini@xilinx.com>
-Date: Wed, 20 May 2020 16:42:11 -0700
-Subject: [PATCH 03/10] swiotlb-xen: add struct device* parameter to
- xen_phys_to_bus
-
-The parameter is unused in this patch.
-No functional changes.
-
-Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
----
- drivers/xen/swiotlb-xen.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
-index b5e0492b07b9..958ee5517e0b 100644
---- a/drivers/xen/swiotlb-xen.c
-+++ b/drivers/xen/swiotlb-xen.c
-@@ -57,7 +57,7 @@ static unsigned long xen_io_tlb_nslabs;
-  * 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)
-+static inline dma_addr_t xen_phys_to_bus(struct device *dev, phys_addr_t paddr)
- {
- 	unsigned long bfn = pfn_to_bfn(XEN_PFN_DOWN(paddr));
- 	dma_addr_t dma = (dma_addr_t)bfn << XEN_PAGE_SHIFT;
-@@ -78,9 +78,9 @@ static inline phys_addr_t xen_bus_to_phys(dma_addr_t baddr)
- 	return paddr;
- }
- 
--static inline dma_addr_t xen_virt_to_bus(void *address)
-+static inline dma_addr_t xen_virt_to_bus(struct device *dev, void *address)
- {
--	return xen_phys_to_bus(virt_to_phys(address));
-+	return xen_phys_to_bus(dev, virt_to_phys(address));
- }
- 
- static inline int range_straddles_page_boundary(phys_addr_t p, size_t size)
-@@ -309,7 +309,7 @@ xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
- 	 * Do not use virt_to_phys(ret) because on ARM it doesn't correspond
- 	 * to *dma_handle. */
- 	phys = *dma_handle;
--	dev_addr = xen_phys_to_bus(phys);
-+	dev_addr = xen_phys_to_bus(hwdev, phys);
- 	if (((dev_addr + size - 1 <= dma_mask)) &&
- 	    !range_straddles_page_boundary(phys, size))
- 		*dma_handle = dev_addr;
-@@ -367,7 +367,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
- 				unsigned long attrs)
- {
- 	phys_addr_t map, phys = page_to_phys(page) + offset;
--	dma_addr_t dev_addr = xen_phys_to_bus(phys);
-+	dma_addr_t dev_addr = xen_phys_to_bus(dev, phys);
- 
- 	BUG_ON(dir == DMA_NONE);
- 	/*
-@@ -392,7 +392,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
- 		return DMA_MAPPING_ERROR;
- 
- 	phys = map;
--	dev_addr = xen_phys_to_bus(map);
-+	dev_addr = xen_phys_to_bus(dev, map);
- 
- 	/*
- 	 * Ensure that the address returned is DMA'ble
-@@ -536,7 +536,7 @@ xen_swiotlb_sync_sg_for_device(struct device *dev, struct scatterlist *sgl,
- static int
- xen_swiotlb_dma_supported(struct device *hwdev, u64 mask)
- {
--	return xen_virt_to_bus(xen_io_tlb_end - 1) <= mask;
-+	return xen_virt_to_bus(hwdev, xen_io_tlb_end - 1) <= mask;
- }
- 
- const struct dma_map_ops xen_swiotlb_dma_ops = {
--- 
-2.15.4
-