From patchwork Mon Nov 17 11:48:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 40912 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B27B124035 for ; Mon, 17 Nov 2014 11:50:57 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id y19sf1002289wgg.3 for ; Mon, 17 Nov 2014 03:50:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=18ma2mEM6H3GJTNqWVSHXhH1T6fhKUuQ2sMKiQrdcLg=; b=T9Ue9E0wdNkl6/JxVyDtSy5IwWEOFzr6qQrdIzt0IcwPJB5Pg6erDp8AmUy2SFtNlW 73DXgpTfBeG7JXfGnBTQkYdrQSVf7BRI1yVR35nIwqPvNuFjgQ8L8kJGz/v7EavI/9tZ gGfAUtZhMV4TnrobTtiX2CDfpkWh7rEu5bBgqSaLjMeQz4fp/rz+Ltp2YGQjVbi3jfTP vDCFouwdfZFn8Ffj/6/nnbiq/4u7KsQXh9opzDiQg8N9c9lwCv5MYAb8JPdVhplRfOjD 06Z2WsCYPvL4/BqPtjS4c8bpWqG1wYNJVykJLVn1EcfAo+8LKPPTeNurSmN7xbnWV8Eg NObg== X-Gm-Message-State: ALoCoQlJte8lWfGnYPWFAoF1uKepxyZZbd5lWCEGoANgNPNnbras8u744ZfOplLEh7HFGWwEhVrf X-Received: by 10.181.12.37 with SMTP id en5mr4064691wid.6.1416225056752; Mon, 17 Nov 2014 03:50:56 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.3.170 with SMTP id d10ls78828lad.37.gmail; Mon, 17 Nov 2014 03:50:56 -0800 (PST) X-Received: by 10.112.164.69 with SMTP id yo5mr15715618lbb.16.1416225056074; Mon, 17 Nov 2014 03:50:56 -0800 (PST) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id b6si51375419lae.131.2014.11.17.03.50.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Nov 2014 03:50:55 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by mail-la0-f53.google.com with SMTP id pn19so1189573lab.40 for ; Mon, 17 Nov 2014 03:50:55 -0800 (PST) X-Received: by 10.152.6.228 with SMTP id e4mr9824519laa.71.1416225055756; Mon, 17 Nov 2014 03:50:55 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp1140070lbc; Mon, 17 Nov 2014 03:50:54 -0800 (PST) X-Received: by 10.70.53.102 with SMTP id a6mr19361902pdp.70.1416225054154; Mon, 17 Nov 2014 03:50:54 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id aj3si34842429pbd.198.2014.11.17.03.50.53 for ; Mon, 17 Nov 2014 03:50:54 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752667AbaKQLuL (ORCPT + 26 others); Mon, 17 Nov 2014 06:50:11 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:45475 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752027AbaKQLsm (ORCPT ); Mon, 17 Nov 2014 06:48:42 -0500 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NF600FAGM9TJP90@mailout3.w1.samsung.com>; Mon, 17 Nov 2014 11:51:29 +0000 (GMT) X-AuditID: cbfec7f5-b7f956d000005ed7-2a-5469e095d128 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 8C.BE.24279.590E9645; Mon, 17 Nov 2014 11:48:37 +0000 (GMT) Received: from amdc1339.digital.local ([106.116.147.30]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01 (7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0NF60089VM4TUL60@eusync2.samsung.com>; Mon, 17 Nov 2014 11:48:37 +0000 (GMT) From: Marek Szyprowski To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Marek Szyprowski , Tomasz Figa , Kyungmin Park , linux-samsung-soc@vger.kernel.org, Arnd Bergmann , Olof Johansson , Russell King - ARM Linux , Kukjin Kim , lauraa@codeaurora.org, linux-omap@vger.kernel.org, linus.walleij@linaro.org, tony@atomide.com, drake@endlessm.com, loeliger@gmail.com, Mark Rutland Subject: [PATCH v9 3/7] ARM: l2c: Get outer cache .write_sec callback from mach_desc only if not NULL Date: Mon, 17 Nov 2014 12:48:25 +0100 Message-id: <1416224909-4290-4-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.2 In-reply-to: <1416224909-4290-1-git-send-email-m.szyprowski@samsung.com> References: <1416224909-4290-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrOLMWRmVeSWpSXmKPExsVy+t/xK7pTH2SGGCyYKmrxd9IxdotH8x8z W/QuuMpmcbbpDbvF9s4Z7BZT/ixnstj0+BqrxeVdc9gsZi/pZ7GYcX4fk8Xty7wW57ZvYbFY e+Quu8XS6xeZLE5d/8xmsWrXH0aL/Ve8HAQ91sxbw+jR0tzD5vH71yRGj29fJ7F4XO7rZfJY 9D3LY+esu+wed67tYfPYvKTe48qJJlaPvi2rGD0+b5IL4InisklJzcksSy3St0vgyrj/5RZb wW/OigVf/zE1MG7l6GLk5JAQMJF4OvkOE4QtJnHh3nq2LkYuDiGBpYwSj9eeZYJw+pgkNh/c wgJSxSZgKNH1tosNxBYRcJP4t+4QWAezwGdmiUuP1rCCJIQF0iUmfHgMZrMIqEpc2LQcrIFX wF1i4pJuFoh1chL/X64AW80p4CHx7fsBoBoOoG3uEq2POCcw8i5gZFjFKJpamlxQnJSea6RX nJhbXJqXrpecn7uJERL4X3cwLj1mdYhRgINRiYf3QFFmiBBrYllxZe4hRgkOZiUR3piLQCHe lMTKqtSi/Pii0pzU4kOMTBycUg2MM8Ji81Sn1H+XmH+lu1qy+4j6ywfFjPMPNYjO5WVmXVq/ NmalbEc1i1+5zYQTNuvvnDPzZXk0o/ZS+AoexX2Gn3wasxo3lphfZZTbbLDHoVbEifku7/WW J1cajobOldWoufhzFv9b7/rT5/IvibLw7b4o/vjavttmrPFeC+9pK7+23hfsxB2pxFKckWio xVxUnAgA/gWnJVoCAAA= Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: m.szyprowski@samsung.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- 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 7c81ec428b9b..5acb8aef6f2d 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c @@ -108,7 +108,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)