target/linux/bcm27xx/patches-4.19/950-0297-staging-vc-sm-cma-Correct-DMA-configuration.patch

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