From patchwork Wed Jun 11 15:30:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 4336771 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 923599F314 for ; Wed, 11 Jun 2014 15:31:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C984520136 for ; Wed, 11 Jun 2014 15:31:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E3F592022A for ; Wed, 11 Jun 2014 15:31:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755542AbaFKPag (ORCPT ); Wed, 11 Jun 2014 11:30:36 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:43315 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753048AbaFKPaf (ORCPT ); Wed, 11 Jun 2014 11:30:35 -0400 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N700021ZGEIV840@mailout2.w1.samsung.com>; Wed, 11 Jun 2014 16:30:18 +0100 (BST) X-AuditID: cbfec7f4-b7fac6d000006cfe-60-53987618bce6 Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 41.C0.27902.81678935; Wed, 11 Jun 2014 16:30:32 +0100 (BST) Received: from AMDC1227.digital.local ([106.116.147.199]) by eusync1.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0N7000CN5GES3Z00@eusync1.samsung.com>; Wed, 11 Jun 2014 16:30:32 +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 , Robin Holt , Russell King , Santosh Shilimkar , Tony Lindgren , Tomasz Figa , Tomasz Figa Subject: [PATCH 3/5] ARM: mm: cache-l2x0: Use l2c_write_sec() for LATENCY_CTRL registers Date: Wed, 11 Jun 2014 17:30:10 +0200 Message-id: <1402500612-4778-4-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.9.3 In-reply-to: <1402500612-4778-1-git-send-email-t.figa@samsung.com> References: <1402500612-4778-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrJLMWRmVeSWpSXmKPExsVy+t/xy7oSZTOCDTY3yFj0T+tgtehdcJXN YnvnDHaLKX+WM1lsenyN1eLyrjlsFrOX9LNYzDi/j8ni9mVei9d9a5gt1s94zWKxatcfRov9 V7wceD1amnvYPL59ncTicbmvl8lj56y77B53ru1h89i8pN6jb8sqRo+7118yeRy/sZ3J4/Mm uQCuKC6blNSczLLUIn27BK6M6XN3sxZs4q5o/byUvYFxK2cXIyeHhICJRFPHaxYIW0ziwr31 bCC2kMBSRolFezW7GLmA7D4middXn4Al2ATUJD43PAKzRQRUJT63LWAHKWIW2MsscWbGDcYu Rg4OYYEoiV/PxEBqWIBq7s/ZCraAV8BRYu7GT2wQy+Qkere9YQaxOQWcJJ5e7mWEWOwosWr9 ReYJjLwLGBlWMYqmliYXFCel5xrqFSfmFpfmpesl5+duYoQE75cdjIuPWR1iFOBgVOLh5dCZ FizEmlhWXJl7iFGCg1lJhLegcEawEG9KYmVValF+fFFpTmrxIUYmDk6pBkaBbl7b2WmGm6LO rZ5b8f1n8Qm+1a2SyeqvnrjsaWpmlbMy+aNy+bHqXGNPF8VTEx8Jqv9bq3J1W5Fw2/bjM3/n 1bxKdEix1u23WH9j11b75j8h3zf8nv8xeK7xhMZLEgetLFcGdv+zCIow7VkQebdhd+ZrId7C l4ttry28dNTjxJbwe+bTt4kqsRRnJBpqMRcVJwIARjgdDjwCAAA= 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=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 According to the documentation, TAG_LATENCY_CTRL and DATA_LATENCY_CTRL registers of L2C-310 can be written only in secure mode, so l2c_write_sec() should be used to change them, instead of plain writel_relaxed(). Signed-off-by: Tomasz Figa --- arch/arm/mm/cache-l2x0.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index 1695eab..0180eb7 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -1024,20 +1024,20 @@ static void __init l2c310_of_parse(const struct device_node *np, of_property_read_u32_array(np, "arm,tag-latency", tag, ARRAY_SIZE(tag)); if (tag[0] && tag[1] && tag[2]) - writel_relaxed( + l2c_write_sec( L310_LATENCY_CTRL_RD(tag[0] - 1) | L310_LATENCY_CTRL_WR(tag[1] - 1) | L310_LATENCY_CTRL_SETUP(tag[2] - 1), - l2x0_base + L310_TAG_LATENCY_CTRL); + l2x0_base, L310_TAG_LATENCY_CTRL); of_property_read_u32_array(np, "arm,data-latency", data, ARRAY_SIZE(data)); if (data[0] && data[1] && data[2]) - writel_relaxed( + l2c_write_sec( L310_LATENCY_CTRL_RD(data[0] - 1) | L310_LATENCY_CTRL_WR(data[1] - 1) | L310_LATENCY_CTRL_SETUP(data[2] - 1), - l2x0_base + L310_DATA_LATENCY_CTRL); + l2x0_base, L310_DATA_LATENCY_CTRL); of_property_read_u32_array(np, "arm,filter-ranges", filter, ARRAY_SIZE(filter));