summaryrefslogtreecommitdiff
path: root/drivers/vfio
diff options
context:
space:
mode:
authorDiana Craciun <diana.craciun@nxp.com>2019-11-18 16:32:08 +0200
committerDiana Craciun <diana.craciun@nxp.com>2019-11-26 11:42:23 +0200
commit9e93d71a3e111349a6fb0f63beb3e9027ed818b7 (patch)
tree196afa8fa3095a8d157a582f0428438b2c4de00c /drivers/vfio
parent6f5a90ce3530e2cd2bfefe36c3de7885aa49563e (diff)
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>
Diffstat (limited to 'drivers/vfio')
-rw-r--r--drivers/vfio/fsl-mc/vfio_fsl_mc.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/vfio/fsl-mc/vfio_fsl_mc.c b/drivers/vfio/fsl-mc/vfio_fsl_mc.c
index 402644a90e47..f432bd13f349 100644
--- 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(struct vfio_fsl_mc_device *vdev)
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 vfio_fsl_mc_region region,
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,