From patchwork Wed Aug 20 20:41:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 4753731 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9075AC0338 for ; Wed, 20 Aug 2014 20:45:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B64CF20172 for ; Wed, 20 Aug 2014 20:45:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4B0A2015A for ; Wed, 20 Aug 2014 20:45:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752816AbaHTUme (ORCPT ); Wed, 20 Aug 2014 16:42:34 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:56388 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752736AbaHTUmc (ORCPT ); Wed, 20 Aug 2014 16:42:32 -0400 Received: by mail-pd0-f182.google.com with SMTP id fp1so12619760pdb.27 for ; Wed, 20 Aug 2014 13:42:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Uf6aVOTEOfDx1SN8/WpJ268r2Q9vtVCKs0zgx47O7EE=; b=iCcnFy9HQvN4pDBHexj4plGiaGVKyk796qRysh7EFCBpKl/tc65ONmNgkGOPRfFfNO 7hIC9cHyTw7OyFlLK5KBo3hg2ubGyrolwtIfVjhZnV2KVFh+clnf7SdCPejDGQJTNRjt qTg05low64RQrrs4a6dtx76Ma2kqOFLtRHmQ21yX4renoPx80rOIWdSn2DEr4wD7zGny aPVpCudaTl1aX+QPX+GQn6h8D1AACwwD+ZUgMEs5BLjLVbyASnb06g8b0ePOKQIi/yey jENM4Y55p0YmnaKXqYoX0h7ajx59o69clFNMsTejeDn+lZsjPqf+39zn3UkrYbvkxtlL wGeg== X-Received: by 10.70.134.205 with SMTP id pm13mr34226392pdb.80.1408567351626; Wed, 20 Aug 2014 13:42:31 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id io7sm23253540pbd.11.2014.08.20.13.42.29 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 20 Aug 2014 13:42:30 -0700 (PDT) From: Soren Brinkmann To: Michal Simek , Russell King , "Rafael J. Wysocki" , Daniel Lezcano , Rob Herring , Mark Rutland Cc: =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-pm@vger.kernel.org, Pawel Moll , Ian Campbell , Kumar Gala Subject: [PATCH 1/9] ARM: zynq: PM: Enable A9 internal clock gating feature Date: Wed, 20 Aug 2014 13:41:47 -0700 Message-Id: <1408567315-28479-2-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 2.0.1.1.gfbfc394 In-Reply-To: <1408567315-28479-1-git-send-email-soren.brinkmann@xilinx.com> References: <1408567315-28479-1-git-send-email-soren.brinkmann@xilinx.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Signed-off-by: Soren Brinkmann --- arch/arm/mach-zynq/common.c | 6 ++++++ arch/arm/mach-zynq/common.h | 11 +++++++++++ arch/arm/mach-zynq/platsmp.c | 9 +++++++++ 3 files changed, 26 insertions(+) diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 31a6fa40ba37..3cb7c198615a 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -98,6 +98,11 @@ static int __init zynq_get_revision(void) return revision; } +static void __init zynq_init_late(void) +{ + zynq_core_pm_init(); +} + /** * zynq_init_machine - System specific initialization, intended to be * called from board specific initialization. @@ -204,6 +209,7 @@ DT_MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform") .map_io = zynq_map_io, .init_irq = zynq_irq_init, .init_machine = zynq_init_machine, + .init_late = zynq_init_late, .init_time = zynq_timer_init, .dt_compat = zynq_dt_match, .reserve = zynq_memory_init, diff --git a/arch/arm/mach-zynq/common.h b/arch/arm/mach-zynq/common.h index f652f0a884a6..596ef0b5067c 100644 --- a/arch/arm/mach-zynq/common.h +++ b/arch/arm/mach-zynq/common.h @@ -40,4 +40,15 @@ extern void __iomem *zynq_scu_base; /* Hotplug */ extern void zynq_platform_cpu_die(unsigned int cpu); +static inline void zynq_core_pm_init(void) +{ + /* A9 clock gating */ + asm volatile ("mrc p15, 0, r12, c15, c0, 0\n" + "orr r12, r12, #1\n" + "mcr p15, 0, r12, c15, c0, 0\n" + : /* no outputs */ + : /* no inputs */ + : "r12"); +} + #endif diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c index abc82ef085c1..616b99e07c60 100644 --- a/arch/arm/mach-zynq/platsmp.c +++ b/arch/arm/mach-zynq/platsmp.c @@ -112,6 +112,14 @@ static void __init zynq_smp_prepare_cpus(unsigned int max_cpus) scu_enable(zynq_scu_base); } +/* + * This function is in the hotplug path. Don't move it into the init section!! + */ +static void zynq_secondary_init(unsigned int cpu) +{ + zynq_core_pm_init(); +} + #ifdef CONFIG_HOTPLUG_CPU static int zynq_cpu_kill(unsigned cpu) { @@ -124,6 +132,7 @@ struct smp_operations zynq_smp_ops __initdata = { .smp_init_cpus = zynq_smp_init_cpus, .smp_prepare_cpus = zynq_smp_prepare_cpus, .smp_boot_secondary = zynq_boot_secondary, + .smp_secondary_init = zynq_secondary_init, #ifdef CONFIG_HOTPLUG_CPU .cpu_die = zynq_platform_cpu_die, .cpu_kill = zynq_cpu_kill,