Commit 0c4c2edc authored Jan 08, 2015 by Tomasz Figa Committed by Russell King Jan 16, 2015

ARM: 8261/1: l2c: Get outer cache .write_sec callback from mach_desc only if not NULL



Certain platforms (i.e. Exynos) might need to set .write_sec callback
from firmware initialization which is happenning in .init_early callback
of machine descriptor. However current code will overwrite the pointer
with whatever is present in machine descriptor, even though it can be
already set earlier. This patch fixes this by making the assignment
conditional, depending on whether current .write_sec callback is NULL.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Nishanth Menon <nm@ti.com>
Acked-by: Nishanth Menon <nm@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent c6d1a2d0

arch/arm/kernel/irq.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -109,6 +109,7 @@ void __init init_IRQ(void)

		if (IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_CACHE_L2X0) &&
		(machine_desc->l2c_aux_mask \|\| machine_desc->l2c_aux_val)) {
		if (!outer_cache.write_sec)
		outer_cache.write_sec = machine_desc->l2c_write_sec;
		ret = l2x0_of_init(machine_desc->l2c_aux_val,
		machine_desc->l2c_aux_mask);

Admin message