Commit 35138d52 authored Apr 21, 2014 by Alex Elder Committed by Matt Porter Apr 25, 2014

ARM: bcm: don't special-case CPU 0 in bcm_kona_smc()



There's logic in bcm_kona_smc() to ensure __bcm_kona_smc() gets
called on CPU 0; if already executing on CPU 0, that function is
called directly.  The direct call is not protected from interrupts,
however, which is not safe.

Note that smp_call_function_single() is designed to handle the case
where the target cpu is the current one.  It also gets a reference
to the CPU and disables IRQs across the call.

So we can simplify things and at the same time be protected against
interrupts by calling smp_call_function_single() unconditionally.

Signed-off-by: Alex Elder <elder@linaro.org>
Reviewed-by: Tim Kryger <tim.kryger@linaro.org>
Reviewed-by: Markus Mayer <markus.mayer@linaro.org>
Reviewed-by: Matt Porter <mporter@linaro.org>
Signed-off-by: Matt Porter <mporter@linaro.org>

parent 6c90f108

arch/arm/mach-bcm/bcm_kona_smc.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -114,12 +114,7 @@ unsigned bcm_kona_smc(unsigned service_id, unsigned arg0, unsigned arg1,
		* Due to a limitation of the secure monitor, we must use the SMP
		* infrastructure to forward all secure monitor calls to Core 0.
		*/
		if (get_cpu() != 0)
		smp_call_function_single(0, __bcm_kona_smc, (void *)&data, 1);
		else
		__bcm_kona_smc(&data);

		put_cpu();
		smp_call_function_single(0, __bcm_kona_smc, &data, 1);

		return data.result;
		}