From patchwork Tue Mar 29 01:38:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 64550 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1742114lbc; Mon, 28 Mar 2016 18:38:36 -0700 (PDT) X-Received: by 10.66.220.101 with SMTP id pv5mr47493257pac.139.1459215515939; Mon, 28 Mar 2016 18:38:35 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d6si2275031pfj.56.2016.03.28.18.38.34; Mon, 28 Mar 2016 18:38:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752559AbcC2Bid (ORCPT + 29 others); Mon, 28 Mar 2016 21:38:33 -0400 Received: from conuserg010.nifty.com ([202.248.44.36]:40149 "EHLO conuserg010-v.nifty.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750894AbcC2Bia (ORCPT ); Mon, 28 Mar 2016 21:38:30 -0400 Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg010-v.nifty.com with ESMTP id u2T1baSf005655; Tue, 29 Mar 2016 10:37:37 +0900 X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: arm@kernel.org Cc: Masahiro Yamada , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] ARM: uniphier: fix up cache ops broadcast of ACTLR Date: Tue, 29 Mar 2016 10:38:23 +0900 Message-Id: <1459215505-18035-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459215505-18035-1-git-send-email-yamada.masahiro@socionext.com> References: <1459215505-18035-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Boot ROM of the UniPhier ARMv7 SoCs sets ACTLR (Auxiliary Control Register) to different values for different secure states: [1] Set ACTLR to 0x41 for Non-secure boot [2] Set ACTLR to 0x40 for Secure boot [1] is okay, but [2] is a problem. Because of commit 1b3a02eb4523 ("ARMv7: Check whether the SMP/nAMP mode was already enabled"), if bit 6 (SMP bit) is already set, the kernel skips the ACTLR setting. In that case, bit 0 (FW bit) is never set, so cache ops is not broadcasted, causing a cache coherency problem. To solve the problem, this commit sets the bit 0 of ACTLR if the bit 4 has already been set. This change is harmless for [1] because the Boot ROM has already set NSACR (Non-secure Access Control Register) bit 18 (NS_SMP bit) before switching to Non-secure state in order to allow write access to the ACTLR. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/platsmp.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) -- 1.9.1 Tested-by: Masahiro Yamada diff --git a/arch/arm/mach-uniphier/platsmp.c b/arch/arm/mach-uniphier/platsmp.c index db04142..285b684 100644 --- a/arch/arm/mach-uniphier/platsmp.c +++ b/arch/arm/mach-uniphier/platsmp.c @@ -170,6 +170,18 @@ static int __init uniphier_smp_enable_scu(void) return 0; } +static void __init uniphier_smp_fixup_cache_broadcast(void) +{ + u32 tmp; + + asm volatile( + "mrc p15, 0, %0, c1, c0, 1\n" + "tst %0, #(1 << 6)\n" + "orrne %0, #(1 << 0)\n" + "mcr p15, 0, %0, c1, c0, 1\n" + : "=r" (tmp) : : "memory", "cc"); +} + static void __init uniphier_smp_prepare_cpus(unsigned int max_cpus) { static cpumask_t only_cpu_0 = { CPU_BITS_CPU0 }; @@ -183,6 +195,8 @@ static void __init uniphier_smp_prepare_cpus(unsigned int max_cpus) if (ret) goto err; + uniphier_smp_fixup_cache_broadcast(); + return; err: pr_warn("disabling SMP\n"); @@ -209,9 +223,15 @@ static int __init uniphier_smp_boot_secondary(unsigned int cpu, return 0; } +static void __init uniphier_smp_secondary_init(unsigned int cpu) +{ + uniphier_smp_fixup_cache_broadcast(); +} + static const struct smp_operations uniphier_smp_ops __initconst = { .smp_prepare_cpus = uniphier_smp_prepare_cpus, .smp_boot_secondary = uniphier_smp_boot_secondary, + .smp_secondary_init = uniphier_smp_secondary_init, }; CPU_METHOD_OF_DECLARE(uniphier_smp, "socionext,uniphier-smp", &uniphier_smp_ops);