From patchwork Wed Jun 25 13:37:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 4420751 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0A38ABEEAA for ; Wed, 25 Jun 2014 13:39:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1E8D92038F for ; Wed, 25 Jun 2014 13:39:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 384B520158 for ; Wed, 25 Jun 2014 13:39:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754202AbaFYNiV (ORCPT ); Wed, 25 Jun 2014 09:38:21 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:30113 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754582AbaFYNiT (ORCPT ); Wed, 25 Jun 2014 09:38:19 -0400 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N7Q000PE8JP9410@mailout1.w1.samsung.com>; Wed, 25 Jun 2014 14:38:13 +0100 (BST) X-AuditID: cbfec7f5-b7f626d000004b39-91-53aad0c818a1 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 60.80.19257.8C0DAA35; Wed, 25 Jun 2014 14:38:16 +0100 (BST) Received: from AMDC1227.digital.local ([106.116.147.199]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0N7Q00AH88JOVV90@eusync2.samsung.com>; Wed, 25 Jun 2014 14:38:16 +0100 (BST) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Kukjin Kim , Laura Abbott , Linus Walleij , Russell King - ARM Linux , Santosh Shilimkar , Tony Lindgren , Tomasz Figa , Daniel Drake , Marek Szyprowski , Tomasz Figa Subject: [PATCH v2 2/6] ARM: Get outer cache .write_sec callback from mach_desc only if not NULL Date: Wed, 25 Jun 2014 15:37:27 +0200 Message-id: <1403703451-12233-3-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.9.3 In-reply-to: <1403703451-12233-1-git-send-email-t.figa@samsung.com> References: <1403703451-12233-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrHLMWRmVeSWpSXmKPExsVy+t/xK7onLqwKNmjrMrd4NP8xs0Xvgqts Fts7Z7BbTPmznMli0+NrrBaXd81hs5i9pJ/FYsb5fUwWty/zWqw9cpfd4nXfGmaL9TNes1is 2vWH0WL/FS8HPo+W5h42j29fJ7F4XO7rZfJY9D3LY+esu+wed67tYfPYvKTeo2/LKkaP4ze2 M3l83iQXwBXFZZOSmpNZllqkb5fAlXG8bxp7QTdnxaKdJ9gaGC+ydzFyckgImEicO/uVCcIW k7hwbz1bFyMXh5DAUkaJj53fmCCcPiaJRXNvsYJUsQmoSXxueMQGYosIqEp8blvADlLELNDA InGl9TpYQlggSaLl4XKwFSxARY9mPwdq5uDgFXCS6F1qDbFNTqJ32xtmEJtTwFniwrw/YPOF gErmPTnCOIGRdwEjwypG0dTS5ILipPRcI73ixNzi0rx0veT83E2MkDD+uoNx6TGrQ4wCHIxK PLwBPKuChVgTy4orcw8xSnAwK4nwuu8HCvGmJFZWpRblxxeV5qQWH2Jk4uCUamDkmR2m+eje DwkXrZz8ay0B51rlN3ReL+3yCfXoXuqyqd0zYuGuicteeJm+XqQZtq7qhPWSrpsL/oYs+LdH rLco8FP7tYyIcyzl0pyJGXILBC6KHvjMrJDmefX6yyW6C5yTlF+4ffvAI2wu0LQx1Vbeh/Mg 08obUtWaG+dzy21e81HCeuZOX1YlluKMREMt5qLiRADkoZlPQQIAAA== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 2c42576..e7383b9 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c @@ -125,7 +125,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)