Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1129cde5 authored by J. German Rivera's avatar J. German Rivera Committed by Greg Kroah-Hartman
Browse files

staging: fsl-mc: Changed DPRC built-in portal's mc_io to be atomic 



The DPRC built-in portal's mc_io is used to send commands to the MC
to program MSIs for MC objects. This is done by the
fsl_mc_msi_write_msg() callback, which is invoked by the generic MSI
layer with interrupts disabled. As a result, the mc_io used in
fsl_mc_msi_write_msg needs to be an atomic mc_io.

Signed-off-by: default avatarJ. German Rivera <German.Rivera@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 89f067df

drivers/staging/fsl-mc/bus/dprc-driver.c

+3 −1
Original line number Diff line number Diff line
@@ -396,7 +396,9 @@ static int dprc_probe(struct fsl_mc_device *mc_dev) 
		error = fsl_create_mc_io(&mc_dev->dev,

					 mc_dev->regions[0].start,

					 region_size,

					 NULL, 0, &mc_dev->mc_io);

					 NULL,

					 FSL_MC_IO_ATOMIC_CONTEXT_PORTAL,

					 &mc_dev->mc_io);

		if (error < 0)

			return error;

	}

drivers/staging/fsl-mc/bus/mc-bus.c

+2 −1
Original line number Diff line number Diff line
@@ -702,7 +702,8 @@ static int fsl_mc_bus_probe(struct platform_device *pdev) 
	mc_portal_phys_addr = res.start;

	mc_portal_size = resource_size(&res);

	error = fsl_create_mc_io(&pdev->dev, mc_portal_phys_addr,

				 mc_portal_size, NULL, 0, &mc_io);

				 mc_portal_size, NULL,

				 FSL_MC_IO_ATOMIC_CONTEXT_PORTAL, &mc_io);

	if (error < 0)

		return error;