Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V4.9/rcar 3.5.3 #8

Closed
wants to merge 23 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
57b9ce0
clk:shmobile: Hide clock for SCIF2
Jun 9, 2016
53279df
swiotlb-xen: implement xen_swiotlb_dma_mmap callback
Jan 10, 2017
49ea50a
swiotlb-xen: implement xen_swiotlb_get_sgtable callback
Jan 10, 2017
8028b7b
salvator_x_dom0_defconfig: Introduce Salvator-X dom0 defconfig
otyshchenko1 May 16, 2017
31ae966
salvator_x_dom0_defconfig: Enable some Xen specific configs
otyshchenko1 May 17, 2017
6b37383
r8a7795-salvator-x-dom0.dtb: Introduce Salvator-X dom0 device-tree
otyshchenko1 May 16, 2017
b8447d2
r8a7795-salvator-x-dom0.dtb: Adjust device tree for Xen usage
otyshchenko1 May 17, 2017
f9c8c0a
r8a7795-salvator-x-dom0.dtb: Use NFS boot
otyshchenko1 May 17, 2017
be1898f
r8a7795-salvator-x-dom0.dtb: Enable IPMMUs and tie master devices to …
otyshchenko1 May 19, 2017
58c29b9
r8a7795-salvator-x-domu.dtb: Introduce Salvator-X domu device-tree
otyshchenko1 May 19, 2017
5a1a1c1
drm: rcar-du: hack: Enable gsx clock too
otyshchenko1 Mar 30, 2017
7531293
r8a7795-salvator-x-dom0.dtb: PM hints for gsx passthrough to work
otyshchenko1 May 22, 2017
32f2f27
r8a7795-salvator-x-dom0.dtb: Passthrough gsx
otyshchenko1 May 19, 2017
347d3e4
xen/kbdif: update protocol description
Apr 10, 2017
c746457
xen/kbdif: add multi-touch support
Apr 10, 2017
3c7f6a9
xen/displif: add ABI for para-virtual display
Apr 10, 2017
7844b7e
xen: introduce xenbus_read_unsigned()
jgross1 Oct 31, 2016
2722dc6
xen: make use of xenbus_read_unsigned() in xen-kbdfront
jgross1 Oct 31, 2016
dca55f4
xen/drm: add para-virtual DRM front-end driver
Dec 23, 2016
1427671
xen,input: add xen-kbdfront module parameter for setting resolution
jgross1 Apr 11, 2017
09cdbb3
xen/input: use string constants from PV protocol
Apr 10, 2017
3109aa6
xen/input: add multi-touch support
Apr 11, 2017
fbfee37
salvator_x_domu_defconfig: Introduce Salvator-X domu defconfig
otyshchenko1 May 22, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions arch/arm/xen/mm.c
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,29 @@ bool xen_arch_need_swiotlb(struct device *dev,
!is_device_dma_coherent(dev));
}

/*
* Create userspace mapping for the DMA-coherent memory.
*/
static int xen_swiotlb_dma_mmap(struct device *dev, struct vm_area_struct *vma,
void *cpu_addr, dma_addr_t dma_addr, size_t size,
unsigned long attrs)
{
if (__generic_dma_ops(dev)->mmap)
return __generic_dma_ops(dev)->mmap(dev, vma, cpu_addr, dma_addr, size, attrs);

return dma_common_mmap(dev, vma, cpu_addr, dma_addr, size);
}

static int xen_swiotlb_get_sgtable(struct device *dev, struct sg_table *sgt,
void *cpu_addr, dma_addr_t handle, size_t size,
unsigned long attrs)
{
if (__generic_dma_ops(dev)->get_sgtable)
return __generic_dma_ops(dev)->get_sgtable(dev, sgt, cpu_addr, handle,
size, attrs);
return dma_common_get_sgtable(dev, sgt, cpu_addr, handle, size);
}

int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order,
unsigned int address_bits,
dma_addr_t *dma_handle)
Expand Down Expand Up @@ -199,6 +222,8 @@ static struct dma_map_ops xen_swiotlb_dma_ops = {
.unmap_page = xen_swiotlb_unmap_page,
.dma_supported = xen_swiotlb_dma_supported,
.set_dma_mask = xen_swiotlb_set_dma_mask,
.mmap = xen_swiotlb_dma_mmap,
.get_sgtable = xen_swiotlb_get_sgtable,
};

int __init xen_mm_init(void)
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/renesas/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb r8a7795-h3ulcb.dtb
dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb r8a7795-salvator-x-dom0.dtb r8a7795-salvator-x-domu.dtb r8a7795-h3ulcb.dtb
dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-xs.dtb
dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb
dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb
Expand Down
Loading