From patchwork Wed Oct 29 09:22:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 39730 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 03E8524046 for ; Wed, 29 Oct 2014 09:25:00 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id n3sf1669833wiv.5 for ; Wed, 29 Oct 2014 02:25:00 -0700 (PDT) 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=0rk9dGGNUUWucgBs6n/Wxh1+WB++c0j35bfI6JSaI9M=; b=NVP5pz8BS3sYZItJKQrjpEDx10pLXDP3r5DWAXySoMj2C2xEQNnx8r4GZqi2hiNYeH H6hzjYj33WpCPaxlS8dcUOImxUc4ljWkQtJtwyBTjcKE4Jm6v8twzl5J4rpaQiEw2R2B N/XIsyXrV9+LyKZ1mmVFw7h9LQteX5LeZQ04Z5rX9L4AufUUFEscNGAzXYGk97wAeqWz O6gvD/pIbCqZlxWe4YBqdC9T+VkGzghqKt/DzeLlSjJf9EZkSdy74fd0ikkseFRunlwO FiubwDKD0mfkL+0KQSno5FH38hppF6Bk/C7WBTtRb0c7a7La41pxgMNQuXeoEzDWSUu9 eUOg== X-Gm-Message-State: ALoCoQma+9Dl76gLeZNOxHM4uV8tOBrJdTxpHkaeem/rjIq7v5mundMjfeODarI3e1uiQ7m2dFTE X-Received: by 10.112.170.167 with SMTP id an7mr1596272lbc.4.1414574700164; Wed, 29 Oct 2014 02:25:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.74 with SMTP id k10ls171277laf.6.gmail; Wed, 29 Oct 2014 02:24:59 -0700 (PDT) X-Received: by 10.112.85.106 with SMTP id g10mr9911509lbz.38.1414574699845; Wed, 29 Oct 2014 02:24:59 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id h3si6301987lbc.88.2014.10.29.02.24.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Oct 2014 02:24:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by mail-la0-f44.google.com with SMTP id gf13so2176816lab.3 for ; Wed, 29 Oct 2014 02:24:59 -0700 (PDT) X-Received: by 10.112.12.35 with SMTP id v3mr9949297lbb.80.1414574699724; Wed, 29 Oct 2014 02:24:59 -0700 (PDT) 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.84.229 with SMTP id c5csp624904lbz; Wed, 29 Oct 2014 02:24:58 -0700 (PDT) X-Received: by 10.70.136.136 with SMTP id qa8mr2046574pdb.54.1414574697674; Wed, 29 Oct 2014 02:24:57 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qh8si3466427pac.238.2014.10.29.02.24.57 for ; Wed, 29 Oct 2014 02:24:57 -0700 (PDT) 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 S932136AbaJ2JYx (ORCPT + 26 others); Wed, 29 Oct 2014 05:24:53 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:26453 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756372AbaJ2JXR (ORCPT ); Wed, 29 Oct 2014 05:23:17 -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 <0NE700A708VCB560@mailout2.w1.samsung.com>; Wed, 29 Oct 2014 09:26:00 +0000 (GMT) X-AuditID: cbfec7f4-b7f6c6d00000120b-e8-5450b20092b3 Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id DA.04.04619.002B0545; Wed, 29 Oct 2014 09:23:12 +0000 (GMT) Received: from amdc1339.digital.local ([106.116.147.30]) by eusync1.samsung.com (Oracle Communications Messaging Server 7u4-23.01 (7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0NE700DWE8QECT50@eusync1.samsung.com>; Wed, 29 Oct 2014 09:23:12 +0000 (GMT) From: Marek Szyprowski To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski , Tomasz Figa , Kyungmin Park , 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 v7 6/8] ARM: EXYNOS: Add .write_sec outer cache callback for L2C-310 Date: Wed, 29 Oct 2014 10:22:59 +0100 Message-id: <1414574581-2320-7-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.2 In-reply-to: <1414574581-2320-1-git-send-email-m.szyprowski@samsung.com> References: <1414574581-2320-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMLMWRmVeSWpSXmKPExsVy+t/xy7oMmwJCDLYcEbd4NP8xs0Xvgqts Fmeb3rBbbO+cwW4x5c9yJotNj6+xWlzeNYfNYvaSfhaLGef3MVncvsxrcW77FhaLtUfuslss vX6RyWLVrj+MFvuveDnwe6yZt4bRo6W5h83j29dJLB6X+3qZPBZ9z/LYOesuu8eda3vYPDYv qffo27KK0ePzJrkArigum5TUnMyy1CJ9uwSujOZ3k5gKtopVXLr6gqWBcZtQFyMHh4SAiUTD xqouRk4gU0ziwr31bF2MXBxCAksZJbZevs8C4fQxSSz8eJAVpIpNwFCi620XG4gtIpAt8ePb ZLAiZoE+Zonz03uYQRLCAmESm9b3gTWwCKhKfO/Zyw5i8wq4S+z//5cFYp2cxP+XK5hAbE4B D4nVF5aADRUCqtl4uJttAiPvAkaGVYyiqaXJBcVJ6bmGesWJucWleel6yfm5mxghAf1lB+Pi Y1aHGAU4GJV4eDV2+4cIsSaWFVfmHmKU4GBWEuHdYR4QIsSbklhZlVqUH19UmpNafIiRiYNT qoFRYNKzh04PJ374cKf9io+j5O3JU9jT/BSeswo5nPhgeXZq8M9Sd8E658piBakPMpt6MmLE FVZu1lDkXyrfwP7tdmpiIeu5301cVV5yk/X/FqeenGSzwvUJw5+ZrH94/nf1NDHVzNPe2SK5 8EqQts6GU17rLDWanggVhPoz+NbusGGd2efbWKDEUpyRaKjFXFScCABWqQopRgIAAA== 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.44 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 Exynos4 SoCs equipped with an L2C-310 cache controller and running under secure firmware require certain registers of aforementioned IP to be accessed only from secure mode. This means that SMC calls are required for certain register writes. To handle this, an implementation of .write_sec and .configure callbacks is provided by this patch. Signed-off-by: Tomasz Figa [added comment and reworked unconditional call to SMC_CMD_L2X0INVALL] Signed-off-by: Marek Szyprowski --- arch/arm/mach-exynos/firmware.c | 50 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c index f5e626d55951..e6a052c593f2 100644 --- a/arch/arm/mach-exynos/firmware.c +++ b/arch/arm/mach-exynos/firmware.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -120,6 +121,43 @@ static const struct firmware_ops exynos_firmware_ops = { .resume = exynos_resume, }; +static void exynos_l2_write_sec(unsigned long val, unsigned reg) +{ + static int l2cache_enabled; + + switch (reg) { + case L2X0_CTRL: + if (val & L2X0_CTRL_EN) { + /* + * Before the cache can be enabled, due to firmware + * design, SMC_CMD_L2X0INVALL must be called. + */ + if (!l2cache_enabled) { + exynos_smc(SMC_CMD_L2X0INVALL, 0, 0, 0); + l2cache_enabled = 1; + } + } else { + l2cache_enabled = 0; + } + exynos_smc(SMC_CMD_L2X0CTRL, val, 0, 0); + break; + + case L2X0_DEBUG_CTRL: + exynos_smc(SMC_CMD_L2X0DEBUG, val, 0, 0); + break; + + default: + WARN_ONCE(1, "%s: ignoring write to reg 0x%x\n", __func__, reg); + } +} + +static void exynos_l2_configure(const struct l2x0_regs *regs) +{ + exynos_smc(SMC_CMD_L2X0SETUP1, regs->tag_latency, regs->data_latency, + regs->prefetch_ctrl); + exynos_smc(SMC_CMD_L2X0SETUP2, regs->pwr_ctrl, regs->aux_ctrl, 0); +} + void __init exynos_firmware_init(void) { struct device_node *nd; @@ -139,4 +177,16 @@ void __init exynos_firmware_init(void) pr_info("Running under secure firmware.\n"); register_firmware_ops(&exynos_firmware_ops); + + /* + * Exynos 4 SoCs (based on Cortex A9 and equipped with L2C-310), + * running under secure firmware, require certain registers of L2 + * cache controller to be written in secure mode. Here .write_sec + * callback is provided to perform necessary SMC calls. + */ + if (IS_ENABLED(CONFIG_CACHE_L2X0) + && read_cpuid_part() == ARM_CPU_PART_CORTEX_A9) { + outer_cache.write_sec = exynos_l2_write_sec; + outer_cache.configure = exynos_l2_configure; + } }