aboutsummaryrefslogtreecommitdiffstats
path: root/dynamic-layers/raspberrypi/recipes-kernel/linux/files/0004-swiotlb-xen-add-struct-device-parameter-to-xen_bus_t.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/raspberrypi/recipes-kernel/linux/files/0004-swiotlb-xen-add-struct-device-parameter-to-xen_bus_t.patch')
-rw-r--r--dynamic-layers/raspberrypi/recipes-kernel/linux/files/0004-swiotlb-xen-add-struct-device-parameter-to-xen_bus_t.patch66
1 files changed, 0 insertions, 66 deletions
diff --git a/dynamic-layers/raspberrypi/recipes-kernel/linux/files/0004-swiotlb-xen-add-struct-device-parameter-to-xen_bus_t.patch b/dynamic-layers/raspberrypi/recipes-kernel/linux/files/0004-swiotlb-xen-add-struct-device-parameter-to-xen_bus_t.patch
deleted file mode 100644
index ccd03f1c..00000000
--- a/dynamic-layers/raspberrypi/recipes-kernel/linux/files/0004-swiotlb-xen-add-struct-device-parameter-to-xen_bus_t.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From ed2cec0f196028f4eaed0951f1f82efd9e6b1b67 Mon Sep 17 00:00:00 2001
-From: Stefano Stabellini <stefano.stabellini@xilinx.com>
-Date: Wed, 20 May 2020 16:42:12 -0700
-Subject: [PATCH 04/10] swiotlb-xen: add struct device* parameter to
- xen_bus_to_phys
-
-The parameter is unused in this patch.
-No functional changes.
-
-Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
----
- drivers/xen/swiotlb-xen.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
-index 958ee5517e0b..9b4306a56feb 100644
---- a/drivers/xen/swiotlb-xen.c
-+++ b/drivers/xen/swiotlb-xen.c
-@@ -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);
-@@ -420,7 +420,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
- 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);
-
-@@ -436,7 +436,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);
-@@ -449,7 +449,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);
---
-2.15.4
-