mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-19 22:18:16 +02:00
cddd459140
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From 41a18521d40ed19c2e22d8e41cc427d18f082b71 Mon Sep 17 00:00:00 2001
|
|
From: Diana Craciun <diana.craciun@nxp.com>
|
|
Date: Mon, 18 Nov 2019 16:32:08 +0200
|
|
Subject: [PATCH] vfio/fsl-mc: Map the VFIO region according to the flags
|
|
received from mc firmware
|
|
|
|
There are some VFIO regions which are cacheable (QMAN CENA region).
|
|
These regions should be mapped cacheable.
|
|
|
|
Signed-off-by: Diana Craciun <diana.craciun@nxp.com>
|
|
---
|
|
drivers/vfio/fsl-mc/vfio_fsl_mc.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/vfio/fsl-mc/vfio_fsl_mc.c
|
|
+++ b/drivers/vfio/fsl-mc/vfio_fsl_mc.c
|
|
@@ -106,6 +106,7 @@ static int vfio_fsl_mc_regions_init(stru
|
|
vdev->regions[i].flags |= VFIO_REGION_INFO_FLAG_READ;
|
|
if (!(mc_dev->regions[i].flags & IORESOURCE_READONLY))
|
|
vdev->regions[i].flags |= VFIO_REGION_INFO_FLAG_WRITE;
|
|
+ vdev->regions[i].type = mc_dev->regions[i].flags & IORESOURCE_BITS;
|
|
}
|
|
|
|
vdev->num_regions = mc_dev->obj_desc.region_count;
|
|
@@ -451,7 +452,12 @@ static int vfio_fsl_mc_mmap_mmio(struct
|
|
if (region.size < PAGE_SIZE || base + size > region.size)
|
|
return -EINVAL;
|
|
|
|
- vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
|
|
+ if (region.type & DPRC_REGION_CACHEABLE) {
|
|
+ if (!(region.type & DPRC_REGION_SHAREABLE))
|
|
+ vma->vm_page_prot = pgprot_cached_ns(vma->vm_page_prot);
|
|
+ } else
|
|
+ vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
|
|
+
|
|
vma->vm_pgoff = (region.addr >> PAGE_SHIFT) + pgoff;
|
|
|
|
return remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
|