mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 12:50:22 +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>
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From d078eac368946990c27b86198d2a37416ea02002 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 02/10] swiotlb-xen: remove start_dma_addr
|
|
|
|
It is not strictly needed. Call virt_to_phys on xen_io_tlb_start
|
|
instead. It will be useful not to have a start_dma_addr around with the
|
|
next patches.
|
|
|
|
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
|
|
---
|
|
drivers/xen/swiotlb-xen.c | 5 +----
|
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
|
|
index a42129cba36e..b5e0492b07b9 100644
|
|
--- a/drivers/xen/swiotlb-xen.c
|
|
+++ b/drivers/xen/swiotlb-xen.c
|
|
@@ -52,8 +52,6 @@ static unsigned long xen_io_tlb_nslabs;
|
|
* Quick lookup value of the bus address of the IOTLB.
|
|
*/
|
|
|
|
-static u64 start_dma_addr;
|
|
-
|
|
/*
|
|
* 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
|
|
@@ -241,7 +239,6 @@ int __ref xen_swiotlb_init(int verbose, bool early)
|
|
m_ret = XEN_SWIOTLB_EFIXUP;
|
|
goto error;
|
|
}
|
|
- start_dma_addr = xen_virt_to_bus(xen_io_tlb_start);
|
|
if (early) {
|
|
if (swiotlb_init_with_tbl(xen_io_tlb_start, xen_io_tlb_nslabs,
|
|
verbose))
|
|
@@ -389,7 +386,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
|
|
*/
|
|
trace_swiotlb_bounced(dev, dev_addr, size, swiotlb_force);
|
|
|
|
- map = swiotlb_tbl_map_single(dev, start_dma_addr, phys,
|
|
+ map = swiotlb_tbl_map_single(dev, virt_to_phys(xen_io_tlb_start), phys,
|
|
size, size, dir, attrs);
|
|
if (map == (phys_addr_t)DMA_MAPPING_ERROR)
|
|
return DMA_MAPPING_ERROR;
|
|
--
|
|
2.15.4
|
|
|