1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
From ea000a969afa022776bdf8050aaa501b2679e028 Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
Date: Tue, 29 Jan 2019 16:24:41 +0000
Subject: [PATCH] staging: vc-sm-cma: Correct DMA configuration.
Now that VCHIQ is setting up the DMA configuration as our
parent device, don't try to configure it during probe.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
---
drivers/staging/vc04_services/vc-sm-cma/vc_sm.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
--- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
+++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
@@ -703,9 +703,6 @@ err_free_mem:
/* Driver loading. */
static int bcm2835_vc_sm_cma_probe(struct platform_device *pdev)
{
- struct device *dev = &pdev->dev;
- int err;
-
pr_info("%s: Videocore shared memory driver\n", __func__);
sm_state = kzalloc(sizeof(*sm_state), GFP_KERNEL);
@@ -714,13 +711,11 @@ static int bcm2835_vc_sm_cma_probe(struc
sm_state->pdev = pdev;
mutex_init(&sm_state->map_lock);
- dev->coherent_dma_mask = DMA_BIT_MASK(32);
- dev->dma_mask = &dev->coherent_dma_mask;
- err = of_dma_configure(dev, NULL, true);
- if (err) {
- dev_err(dev, "Unable to setup DMA: %d\n", err);
- return err;
- }
+ pdev->dev.dma_parms = devm_kzalloc(&pdev->dev,
+ sizeof(*pdev->dev.dma_parms),
+ GFP_KERNEL);
+ /* dma_set_max_seg_size checks if dma_parms is NULL. */
+ dma_set_max_seg_size(&pdev->dev, 0x3FFFFFFF);
vchiq_add_connected_callback(vc_sm_connected_init);
return 0;
|
