mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
abed1be72d
Kernel patches are in process of Linux review and submission, and are backported from the Linux Foundation's Eve Project kernel from 5.6 to 5.4 (some patches not needed for 5.4, hence gaps in the patch sequence number) https://github.com/lf-edge/eve/tree/master/pkg/new-kernel/patches-5.6.x A bbappend applies Xen overrides to the boot command line. Since linux-raspberrypi depends on linux-yocto, and linux-yocto_virtualization introduces a requirement for cfg/virtio.scc obtain it from the yocto kernel cache. Signed-off-by: Christopher Clark <christopher.w.clark@gmail.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
From f19187658bc7625f5e3ef89f56d599552b37a497 Mon Sep 17 00:00:00 2001
|
|
From: Stefano Stabellini <stefano.stabellini@xilinx.com>
|
|
Date: Wed, 20 May 2020 16:42:15 -0700
|
|
Subject: [PATCH 07/10] swiotlb-xen: add struct device* parameter to
|
|
is_xen_swiotlb_buffer
|
|
|
|
The parameter is unused in this patch.
|
|
No functional changes.
|
|
|
|
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
|
|
---
|
|
drivers/xen/swiotlb-xen.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
|
|
index ef58f05ae445..c50448fd9b75 100644
|
|
--- a/drivers/xen/swiotlb-xen.c
|
|
+++ b/drivers/xen/swiotlb-xen.c
|
|
@@ -97,7 +97,7 @@ static inline int range_straddles_page_boundary(phys_addr_t p, size_t size)
|
|
return 0;
|
|
}
|
|
|
|
-static int is_xen_swiotlb_buffer(dma_addr_t dma_addr)
|
|
+static int is_xen_swiotlb_buffer(struct device *dev, dma_addr_t dma_addr)
|
|
{
|
|
unsigned long bfn = XEN_PFN_DOWN(dma_addr);
|
|
unsigned long xen_pfn = bfn_to_local_pfn(bfn);
|
|
@@ -428,7 +428,7 @@ static void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,
|
|
xen_dma_sync_for_cpu(hwdev, dev_addr, paddr, size, dir);
|
|
|
|
/* NOTE: We use dev_addr here, not paddr! */
|
|
- if (is_xen_swiotlb_buffer(dev_addr))
|
|
+ if (is_xen_swiotlb_buffer(hwdev, dev_addr))
|
|
swiotlb_tbl_unmap_single(hwdev, paddr, size, size, dir, attrs);
|
|
}
|
|
|
|
@@ -441,7 +441,7 @@ xen_swiotlb_sync_single_for_cpu(struct device *dev, dma_addr_t dma_addr,
|
|
if (!dev_is_dma_coherent(dev))
|
|
xen_dma_sync_for_cpu(dev, dma_addr, paddr, size, dir);
|
|
|
|
- if (is_xen_swiotlb_buffer(dma_addr))
|
|
+ if (is_xen_swiotlb_buffer(dev, dma_addr))
|
|
swiotlb_tbl_sync_single(dev, paddr, size, dir, SYNC_FOR_CPU);
|
|
}
|
|
|
|
@@ -451,7 +451,7 @@ xen_swiotlb_sync_single_for_device(struct device *dev, dma_addr_t dma_addr,
|
|
{
|
|
phys_addr_t paddr = xen_bus_to_phys(dev, dma_addr);
|
|
|
|
- if (is_xen_swiotlb_buffer(dma_addr))
|
|
+ if (is_xen_swiotlb_buffer(dev, dma_addr))
|
|
swiotlb_tbl_sync_single(dev, paddr, size, dir, SYNC_FOR_DEVICE);
|
|
|
|
if (!dev_is_dma_coherent(dev))
|
|
--
|
|
2.15.4
|
|
|