From patchwork Thu May 30 08:52:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2634131 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 86A94DF2A1 for ; Thu, 30 May 2013 08:47:57 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UhyUu-0004Rm-4f; Thu, 30 May 2013 08:46:14 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UhyUL-0001eJ-V1; Thu, 30 May 2013 08:45:37 +0000 Received: from mail-pb0-x233.google.com ([2607:f8b0:400e:c01::233]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UhyU9-0001bB-6J for linux-arm-kernel@lists.infradead.org; Thu, 30 May 2013 08:45:26 +0000 Received: by mail-pb0-f51.google.com with SMTP id jt11so10657611pbb.38 for ; Thu, 30 May 2013 01:45:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=56XAkTnu/5K58ozTx17mGbIURzJEIlpRNODNtJPo9Lg=; b=bcB5WHetVLkUhINOxPzL3CSscS15aUGHT418mQ4gk417yEfaqniUdQwusaQMTawUkD MJVTdt7ylwHF1qjsMjASAU08wfzM7FmbSn0InnE0vMOpM1dPkd1d2hm7POfaEkSHNQNN vfQaSXBWqwSYRSe1bim2XLQWf38ZYHjKhSPdaj5b8DwqzOOuxVhbmshvLMtmy34aB1kA IMQrZUlGgX/p5EoLXfiEiR8xQKbKXqS7mjIUx44gxtLDhajqHwujb2crAqVECPlfGrZH jliE3aq9Neq0Mj10RPf5tq7L3rY5m6Q8RLEk93OdMk+9PhhSku828A6fGmgX0rLnrYFE A7Cg== X-Received: by 10.66.240.41 with SMTP id vx9mr7355071pac.93.1369903500566; Thu, 30 May 2013 01:45:00 -0700 (PDT) Received: from [127.0.0.1] (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id vb8sm41043210pbc.11.2013.05.30.01.44.57 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 30 May 2013 01:44:59 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Thu, 30 May 2013 17:52:20 +0900 Message-Id: <20130530085220.24374.94574.sendpatchset@w520> In-Reply-To: <20130530085152.24374.64208.sendpatchset@w520> References: <20130530085152.24374.64208.sendpatchset@w520> Subject: [PATCH 03/05] ARM: shmobile: r8a73a4 CA15 setup WFE as NOP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130530_044525_360985_14218747 X-CRM114-Status: GOOD ( 10.11 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (magnus.damm[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: arnd@arndb.de, Magnus Damm , horms@verge.net.au, ulrich.hecht@gmail.com, olof@lixom.net, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Magnus Damm Configure CA15 included in r8a73a4 to treat WFE as NOP. This works around hardware issue found in APE6, needed for CA7 cluster to work together with CA15 cluster. Not-yet-Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/smp-r8a73a4.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) --- 0006/arch/arm/mach-shmobile/smp-r8a73a4.c +++ work/arch/arm/mach-shmobile/smp-r8a73a4.c 2013-05-22 14:16:59.000000000 +0900 @@ -45,6 +45,20 @@ #define CCI_SNOOP 0x0000 #define CCI_STATUS 0x000c +static inline void r8a73a4_execute_wfe_as_nop(void) +{ + unsigned int v; + + /* set bit 7 in ACTLR */ + asm volatile( + " mrc p15, 0, %0, c1, c0, 1\n" + " orr %0, %0, #0x40\n" + " mcr p15, 0, %0, c1, c0, 1\n" + : "=&r" (v) + : + : "cc"); +} + static void __init r8a73a4_smp_prepare_cpus(unsigned int max_cpus) { u32 bar; @@ -71,6 +85,8 @@ static void __init r8a73a4_smp_prepare_c while (__raw_readl(p + CCI_STATUS)) /* wait for pending bit low */; iounmap(p); + + r8a73a4_execute_wfe_as_nop(); } static int __cpuinit r8a73a4_boot_secondary(unsigned int cpu, struct task_struct *idle) @@ -85,6 +101,13 @@ static int __cpuinit r8a73a4_boot_second return 0; } +static void __cpuinit r8a73a4_secondary_init(unsigned int cpu) +{ + /* CA15 need SW workaround */ + if (cpu_logical_map(cpu) < 4) + r8a73a4_execute_wfe_as_nop(); +} + #ifdef CONFIG_HOTPLUG_CPU static int r8a73a4_cpu_kill(unsigned int cpu) { @@ -169,6 +192,7 @@ static int r8a73a4_cpu_disable(unsigned struct smp_operations r8a73a4_smp_ops __initdata = { .smp_prepare_cpus = r8a73a4_smp_prepare_cpus, .smp_boot_secondary = r8a73a4_boot_secondary, + .smp_secondary_init = r8a73a4_secondary_init, #ifdef CONFIG_HOTPLUG_CPU .cpu_kill = r8a73a4_cpu_kill, .cpu_die = r8a73a4_cpu_die,