From mboxrd@z Thu Jan 1 00:00:00 1970 From: tony@atomide.com (Tony Lindgren) Date: Mon, 5 Jan 2015 08:25:09 -0800 Subject: [PATCH v11 5/9] ARM: l2c: Get outer cache .write_sec callback from mach_desc only if not NULL In-Reply-To: <1420460348-20302-6-git-send-email-m.szyprowski@samsung.com> References: <1420460348-20302-1-git-send-email-m.szyprowski@samsung.com> <1420460348-20302-6-git-send-email-m.szyprowski@samsung.com> Message-ID: <20150105162508.GE4081@atomide.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org * Marek Szyprowski [150105 04:22]: > From: Tomasz Figa > > 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 > Signed-off-by: Marek Szyprowski Acked-by: Tony Lindgren > --- > arch/arm/kernel/irq.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c > index ad857bada96c..350f188c92d2 100644 > --- a/arch/arm/kernel/irq.c > +++ b/arch/arm/kernel/irq.c > @@ -109,7 +109,8 @@ 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)) { > - outer_cache.write_sec = machine_desc->l2c_write_sec; > + 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); > if (ret) > -- > 1.9.2 >