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>

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 70807577641d93048a7efd2ad14755a4a3c3fa65..9f9a7d6991e40b6f642fbfb2dd49984dc068ad73 100644 (file)
--- 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;