target/linux/layerscape/patches-4.4/7148-staging-fsl-mc-Changed-DPRC-built-in-portal-s-mc_io-.patch

   1 From 0f2a65dea2024b7898e3c0b42e0a7864d6538567 Mon Sep 17 00:00:00 2001
   2 From: "J. German Rivera" <German.Rivera@freescale.com>
   3 Date: Wed, 6 Jan 2016 16:03:24 -0600
   4 Subject: [PATCH 148/226] staging: fsl-mc: Changed DPRC built-in portal's
   5  mc_io to be atomic
   6
   7 The DPRC built-in portal's mc_io is used to send commands to the MC
   8 to program MSIs for MC objects. This is done by the
   9 fsl_mc_msi_write_msg() callback, which is invoked by the generic MSI
  10 layer with interrupts disabled. As a result, the mc_io used in
  11 fsl_mc_msi_write_msg needs to be an atomic mc_io.
  12
  13 Signed-off-by: J. German Rivera <German.Rivera@freescale.com>
  14 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  15 ---
  16  drivers/staging/fsl-mc/bus/dprc-driver.c |    4 +++-
  17  drivers/staging/fsl-mc/bus/mc-bus.c      |    3 ++-
  18  2 files changed, 5 insertions(+), 2 deletions(-)
  19
  20 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c
  21 +++ b/drivers/staging/fsl-mc/bus/dprc-driver.c
  22 @@ -396,7 +396,9 @@ static int dprc_probe(struct fsl_mc_devi
  23                 error = fsl_create_mc_io(&mc_dev->dev,
  24                                          mc_dev->regions[0].start,
  25                                          region_size,
  26 -                                        NULL, 0, &mc_dev->mc_io);
  27 +                                        NULL,
  28 +                                        FSL_MC_IO_ATOMIC_CONTEXT_PORTAL,
  29 +                                        &mc_dev->mc_io);
  30                 if (error < 0)
  31                         return error;
  32         }
  33 --- a/drivers/staging/fsl-mc/bus/mc-bus.c
  34 +++ b/drivers/staging/fsl-mc/bus/mc-bus.c
  35 @@ -702,7 +702,8 @@ static int fsl_mc_bus_probe(struct platf
  36         mc_portal_phys_addr = res.start;
  37         mc_portal_size = resource_size(&res);
  38         error = fsl_create_mc_io(&pdev->dev, mc_portal_phys_addr,
  39 -                                mc_portal_size, NULL, 0, &mc_io);
  40 +                                mc_portal_size, NULL,
  41 +                                FSL_MC_IO_ATOMIC_CONTEXT_PORTAL, &mc_io);
  42         if (error < 0)
  43                 return error;
  44