From patchwork Tue Feb 28 21:46:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 6980 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 0C65223E4A for ; Tue, 28 Feb 2012 21:46:19 +0000 (UTC) Received: from mail-gy0-f180.google.com (mail-gy0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id C9864A1802B for ; Tue, 28 Feb 2012 21:46:18 +0000 (UTC) Received: by ghbz12 with SMTP id z12so1847011ghb.11 for ; Tue, 28 Feb 2012 13:46:18 -0800 (PST) Received: from mr.google.com ([10.50.89.201]) by 10.50.89.201 with SMTP id bq9mr4442419igb.55.1330465578176 (num_hops = 1); Tue, 28 Feb 2012 13:46:18 -0800 (PST) Received: by 10.50.89.201 with SMTP id bq9mr3688346igb.55.1330465578134; Tue, 28 Feb 2012 13:46:18 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.11.10 with SMTP id r10csp17714ibr; Tue, 28 Feb 2012 13:46:17 -0800 (PST) Received: by 10.180.87.8 with SMTP id t8mr9180408wiz.15.1330465577034; Tue, 28 Feb 2012 13:46:17 -0800 (PST) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by mx.google.com with ESMTPS id cy9si14253877wib.43.2012.02.28.13.46.16 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 28 Feb 2012 13:46:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mail-wi0-f178.google.com designates 209.85.212.178 as permitted sender) client-ip=209.85.212.178; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of mail-wi0-f178.google.com designates 209.85.212.178 as permitted sender) smtp.mail= Received: by mail-wi0-f178.google.com with SMTP id hm14so5108357wib.37 for ; Tue, 28 Feb 2012 13:46:16 -0800 (PST) Received-SPF: pass (google.com: domain of designates 10.180.80.40 as permitted sender) client-ip=10.180.80.40; Received: from mr.google.com ([10.180.80.40]) by 10.180.80.40 with SMTP id o8mr42030006wix.10.1330465576659 (num_hops = 1); Tue, 28 Feb 2012 13:46:16 -0800 (PST) MIME-Version: 1.0 Received: by 10.180.80.40 with SMTP id o8mr33308793wix.10.1330465576601; Tue, 28 Feb 2012 13:46:16 -0800 (PST) Received: from localhost.localdomain (AToulouse-159-1-63-219.w92-134.abo.wanadoo.fr. [92.134.214.219]) by mx.google.com with ESMTPS id dw7sm31483074wib.4.2012.02.28.13.46.15 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 28 Feb 2012 13:46:16 -0800 (PST) From: daniel.lezcano@linaro.org To: sameo@linux.intel.com Cc: linus.walleij@stericsson.com, linux-arm-kernel@lists.infradead.org, rickard.andersson@stericsson.com, patches@linaro.org, linaro-dev@lists.linaro.org Subject: [PATCH 3/5] mfd : ux500 - copy the gic setting to the prcmu Date: Tue, 28 Feb 2012 22:46:07 +0100 Message-Id: <1330465569-567-3-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1330465569-567-1-git-send-email-daniel.lezcano@linaro.org> References: <1330465569-567-1-git-send-email-daniel.lezcano@linaro.org> X-Gm-Message-State: ALoCoQmzY0upPguuBHKnetSPWf8blA37C2TMFc/5Fw3Ai6SaOTqvid/T9h59+1luPPX086EQmSlm From: Daniel Lezcano In the case we go to the retention mode, we decoupled the gic in order to have the A9 core to reach a stable WFI state. But we want the prcmu to wake up the A9 when the gic has a pending irq which is done by copying the gic settings to the to the prcmu. Signed-off-by: Daniel Lezcano --- drivers/mfd/db8500-prcmu.c | 20 ++++++++++++++++++++ include/linux/mfd/db8500-prcmu.h | 1 + include/linux/mfd/dbx500-prcmu.h | 8 ++++++++ 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index 8346a0e..97341aa 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -883,6 +883,26 @@ bool db8500_prcmu_gic_pending_irq(void) return false; } +/* + * This function copies the gic SPI settings to the prcmu in order to + * monitor them and abort/finish the retention/off sequence or state. + */ +int db8500_prcmu_copy_gic_settings(void) +{ + u32 er; /* Enable register */ + void __iomem *dist_base = __io_address(U8500_GIC_DIST_BASE); + int i; + + /* We skip the STI and PPI */ + for (i = 0; i < PRCMU_GIC_NUMBER_REGS - 1; i++) { + er = readl_relaxed(dist_base + + GIC_DIST_ENABLE_SET + (i + 1) * 4); + writel(er, PRCM_ARMITMSK31TO0 + i * 4); + } + + return 0; +} + /* This function should only be called while mb0_transfer.lock is held. */ static void config_wakeups(void) { diff --git a/include/linux/mfd/db8500-prcmu.h b/include/linux/mfd/db8500-prcmu.h index 92dac13..a591585 100644 --- a/include/linux/mfd/db8500-prcmu.h +++ b/include/linux/mfd/db8500-prcmu.h @@ -582,6 +582,7 @@ int db8500_prcmu_set_power_state(u8 state, bool keep_ulp_clk, bool keep_ap_pll); u8 db8500_prcmu_get_power_state_result(void); int db8500_prcmu_gic_decouple(void); int db8500_prcmu_gic_recouple(void); +int db8500_prcmu_copy_gic_settings(void); bool db8500_prcmu_gic_pending_irq(void); void db8500_prcmu_enable_wakeups(u32 wakeups); int db8500_prcmu_set_epod(u16 epod_id, u8 epod_state); diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h index 1641874..f8429ca 100644 --- a/include/linux/mfd/dbx500-prcmu.h +++ b/include/linux/mfd/dbx500-prcmu.h @@ -305,6 +305,14 @@ static inline bool prcmu_gic_pending_irq(void) return db8500_prcmu_gic_pending_irq(); } +static inline int prcmu_copy_gic_settings(void) +{ + if (cpu_is_u5500()) + return -EINVAL; + else + return db8500_prcmu_copy_gic_settings(); +} + static inline int prcmu_set_epod(u16 epod_id, u8 epod_state) { if (cpu_is_u5500())