summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vc04_services
diff options
context:
space:
mode:
authorMichael Zoran <mzoran@crowfest.net>2016-10-31 14:02:03 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-07 11:02:45 +0100
commitc01cc53d4eb81a626ca289d784143f22c2fe63ab (patch)
tree2e6c7cf2154aebe21520ef86edf2e447c2ecac6f /drivers/staging/vc04_services
parentdc5424ae0be4409019bafc303720d8a33f5b23fe (diff)
downloadop-kernel-dev-c01cc53d4eb81a626ca289d784143f22c2fe63ab.zip
op-kernel-dev-c01cc53d4eb81a626ca289d784143f22c2fe63ab.tar.gz
staging: vc04_services: setup DMA and coherent mask
VCHI messages between the CPU and firmware use 32-bit bus addresses. Explicitly set the DMA mask and coherent on all platforms. Signed-off-by: Michael Zoran <mzoran@crowfest.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vc04_services')
-rw-r--r--drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
index 7080757..9f9a7d6 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
@@ -97,6 +97,15 @@ int vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state)
int slot_mem_size, frag_mem_size;
int err, irq, i;
+ /*
+ * VCHI messages between the CPU and firmware use
+ * 32-bit bus addresses.
+ */
+ err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
+
+ if (err < 0)
+ return err;
+
(void)of_property_read_u32(dev->of_node, "cache-line-size",
&g_cache_line_size);
g_fragments_size = 2 * g_cache_line_size;
OpenPOWER on IntegriCloud