From: Stuart Yoder Date: Mon, 11 Apr 2016 16:49:13 +0000 (-0500) Subject: staging: fsl-mc: set up coherent dma ops for added devices X-Git-Tag: android-x86-7.1-r1~1436^2~100 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0f90f25b8f83f5185c0fea8fa02b6bb77917f916;p=android-x86%2Fkernel.git staging: fsl-mc: set up coherent dma ops for added devices Unless discovered devices have the no shareability flag set, set up coherent dma ops for them. Signed-off-by: Stuart Yoder Acked-by: German Rivera Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/fsl-mc/bus/mc-bus.c b/drivers/staging/fsl-mc/bus/mc-bus.c index 981e4c255ca2..8bf76d72e0f8 100644 --- a/drivers/staging/fsl-mc/bus/mc-bus.c +++ b/drivers/staging/fsl-mc/bus/mc-bus.c @@ -469,6 +469,10 @@ int fsl_mc_device_add(struct dprc_obj_desc *obj_desc, goto error_cleanup_dev; } + /* Objects are coherent, unless 'no shareability' flag set. */ + if (!(obj_desc->flags & DPRC_OBJ_FLAG_NO_MEM_SHAREABILITY)) + arch_setup_dma_ops(&mc_dev->dev, 0, 0, NULL, true); + /* * The device-specific probe callback will get invoked by device_add() */