layerscape: add patches-5.4

[openwrt/staging/wigyori.git] / target / linux / layerscape / patches-5.4 / 821-vfio-0010-vfio-fsl-mc-Map-the-VFIO-region-according-to-the-fla.patch

diff --git a/target/linux/layerscape/patches-5.4/821-vfio-0010-vfio-fsl-mc-Map-the-VFIO-region-according-to-the-fla.patch b/target/linux/layerscape/patches-5.4/821-vfio-0010-vfio-fsl-mc-Map-the-VFIO-region-according-to-the-fla.patch
new file mode 100644 (file)
index 0000000..1ddbd8e
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/821-vfio-0010-vfio-fsl-mc-Map-the-VFIO-region-according-to-the-fla.patch
@@ -0,0 +1,38 @@
+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,