From: Santosh Shilimkar <santosh.shilimkar@ti.com>
To: Nishanth Menon <nm@ti.com>
Cc: linux-omap@vger.kernel.org, khilman@deeprootsystems.com,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 05/15] ARM: OMAP5: PM: Enables ES2 PM mode by default
Date: Sat, 2 Mar 2013 11:17:31 +0530 [thread overview]
Message-ID: <51319273.5090703@ti.com> (raw)
In-Reply-To: <20130301193745.GA22626@kahuna>
On Saturday 02 March 2013 01:07 AM, Nishanth Menon wrote:
> On 17:40-20130301, Santosh Shilimkar wrote:
>> Enables MPUSS ES2 power management mode using ES2_PM_MODE in
>> AMBA_IF_MODE register.
>>
>> 0x0: ES1 behavior, CPU cores would enter and exit OFF mode together. Broken
>> 0x1: ES2 behavior, CPU cores are allowed to enter/exit OFF mode independently.
>>
>> This is one time settings thanks to always ON domain.
>>
>> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
>> ---
>> arch/arm/mach-omap2/omap-secure.h | 2 ++
>> arch/arm/mach-omap2/omap-wakeupgen.c | 14 ++++++++++++++
>> arch/arm/mach-omap2/omap-wakeupgen.h | 1 +
>> 3 files changed, 17 insertions(+)
>>
>> diff --git a/arch/arm/mach-omap2/omap-secure.h b/arch/arm/mach-omap2/omap-secure.h
>> index 0e72917..82b3c4c 100644
>> --- a/arch/arm/mach-omap2/omap-secure.h
>> +++ b/arch/arm/mach-omap2/omap-secure.h
>> @@ -42,6 +42,8 @@
>> #define OMAP4_MON_L2X0_AUXCTRL_INDEX 0x109
>> #define OMAP4_MON_L2X0_PREFETCH_INDEX 0x113
>>
>> +#define OMAP5_MON_AMBA_IF_INDEX 0x108
>> +
>> /* Secure PPA(Primary Protected Application) APIs */
>> #define OMAP4_PPA_L2_POR_INDEX 0x23
>> #define OMAP4_PPA_CPU_ACTRL_SMP_INDEX 0x25
>> diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
>> index 5d3b4f4..a7350dd 100644
>> --- a/arch/arm/mach-omap2/omap-wakeupgen.c
>> +++ b/arch/arm/mach-omap2/omap-wakeupgen.c
>> @@ -403,6 +403,7 @@ int __init omap_wakeupgen_init(void)
>> {
>> int i;
>> unsigned int boot_cpu = smp_processor_id();
>> + u32 val;
>>
>> /* Not supported on OMAP4 ES1.0 silicon */
>> if (omap_rev() == OMAP4430_REV_ES1_0) {
>> @@ -444,6 +445,19 @@ int __init omap_wakeupgen_init(void)
>> for (i = 0; i < max_irqs; i++)
>> irq_target_cpu[i] = boot_cpu;
>>
>> + /*
>> + * Enables OMAP5 ES2 PM Mode using ES2_PM_MODE in AMBA_IF_MODE
>> + * 0x0: ES1 behavior, CPU cores would enter and exit OFF mode together.
>> + * 0x1: ES2 behavior, CPU cores are allowed to enter/exit OFF mode
>> + * independently.
>> + * This needs to be set one time thanks to always ON domain.
>> + */
>> + if (soc_is_omap54xx()) {
>> + val = __raw_readl(wakeupgen_base + OMAP_AMBA_IF_MODE);
>> + val |= BIT(5);
> BIT(5) is ES2_PM_MODE for es2.0 only - we dont have a OMAP5 revision check atm.
> maybe
>> + omap_smc1(OMAP5_MON_AMBA_IF_INDEX, val);
>> + }
>> +
>> irq_hotplug_init();
>> irq_pm_init();
>>
>> diff --git a/arch/arm/mach-omap2/omap-wakeupgen.h b/arch/arm/mach-omap2/omap-wakeupgen.h
>> index b0fd16f..b3c8ecc 100644
>> --- a/arch/arm/mach-omap2/omap-wakeupgen.h
>> +++ b/arch/arm/mach-omap2/omap-wakeupgen.h
>> @@ -27,6 +27,7 @@
>> #define OMAP_WKG_ENB_E_1 0x420
>> #define OMAP_AUX_CORE_BOOT_0 0x800
>> #define OMAP_AUX_CORE_BOOT_1 0x804
>> +#define OMAP_AMBA_IF_MODE 0x80c
>> #define OMAP_PTMSYNCREQ_MASK 0xc00
>> #define OMAP_PTMSYNCREQ_EN 0xc04
>> #define OMAP_TIMESTAMPCYCLELO 0xc08
>
> Curious, I see OMAP5_AMBA_IF_MODE_OFFSET in
> arch/arm/mach-omap2/omap4-sar-layout.h
> if we dont save new modified contents there, Wont restore logic just
> reset it back to 0?
>
It is already restored in the wakeup-gen restore code.
Regards
Santosh
next prev parent reply other threads:[~2013-03-02 5:46 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-01 12:10 [PATCH 00/15] ARM: OMAP5: PM: Add MPUSS suspend and CPUidle support Santosh Shilimkar
2013-03-01 12:10 ` [PATCH 01/15] ARM: OMAP4+: PM: Consolidate MPU subsystem PM code for re-use Santosh Shilimkar
2013-03-01 13:50 ` Nishanth Menon
2013-03-01 12:10 ` [PATCH 02/15] ARM: OMAP5: PM: Update CPU context register offset Santosh Shilimkar
2013-03-01 17:34 ` Nishanth Menon
2013-03-01 12:10 ` [PATCH 03/15] ARM: OMAP4+: PM: Consolidate and use OMAP4 PM code for OMAP5 Santosh Shilimkar
2013-03-01 17:43 ` Nishanth Menon
2013-03-02 5:43 ` Santosh Shilimkar
2013-03-04 18:21 ` Nishanth Menon
2013-03-01 12:10 ` [PATCH 04/15] ARM: OMAP5: PM: Set MPUSS-EMIF clock-domain static dependency Santosh Shilimkar
2013-03-01 12:10 ` [PATCH 05/15] ARM: OMAP5: PM: Enables ES2 PM mode by default Santosh Shilimkar
2013-03-01 19:37 ` Nishanth Menon
2013-03-02 5:47 ` Santosh Shilimkar [this message]
2013-03-04 18:29 ` Nishanth Menon
2013-03-10 18:07 ` Santosh Shilimkar
2013-03-01 12:10 ` [PATCH 06/15] ARM: OMAP5: PM: Enable Mercury retention mode on CPUx powerdomains Santosh Shilimkar
2013-03-01 19:42 ` Nishanth Menon
2013-03-02 5:52 ` Santosh Shilimkar
2013-03-04 18:33 ` Nishanth Menon
2013-03-01 12:10 ` [PATCH 07/15] ARM: OMAP5: Add init_late() hook to enable pm initialization Santosh Shilimkar
2013-03-01 20:12 ` Nishanth Menon
2013-03-02 6:00 ` Santosh Shilimkar
2013-03-04 18:35 ` Nishanth Menon
2013-03-01 12:10 ` [PATCH 08/15] ARM: OMAP5: PM: Add CPU power off mode support Santosh Shilimkar
2013-03-01 21:36 ` Nishanth Menon
2013-03-02 6:14 ` Santosh Shilimkar
2013-03-04 18:38 ` Nishanth Menon
2013-03-01 12:10 ` [PATCH 09/15] ARM: OMAP4+: PM: Restore CPU power state to ON with clockdomain force wakeup method Santosh Shilimkar
2013-03-01 21:53 ` Nishanth Menon
2013-03-02 6:16 ` Santosh Shilimkar
2013-03-01 12:10 ` [PATCH 10/15] ARM: OMAP5: PM: Add MPU Open Switch Retention support Santosh Shilimkar
2013-03-01 22:05 ` Nishanth Menon
2013-03-01 12:11 ` [PATCH 11/15] ARM: OMAP5: PM: Add L2 memory power down support Santosh Shilimkar
2013-03-01 23:43 ` Nishanth Menon
2013-03-02 6:24 ` Santosh Shilimkar
2013-03-04 18:41 ` Nishanth Menon
2013-03-01 12:11 ` [PATCH 12/15] ARM: OMAP4+: CPUidle: Cleanup idle driver for OMAP5 support Santosh Shilimkar
2013-03-01 23:56 ` Nishanth Menon
2013-03-02 6:25 ` Santosh Shilimkar
2013-03-01 12:11 ` [PATCH 13/15] ARM: OMAP4+: CPUidle: Deprecate use of omap4_mpuss_read_prev_context_state() Santosh Shilimkar
2013-03-02 0:03 ` Nishanth Menon
2013-03-01 12:11 ` [PATCH 14/15] ARM: OMAP4+: CPUidle: Add OMAP5 idle driver support Santosh Shilimkar
2013-03-02 0:25 ` Nishanth Menon
2013-03-02 6:47 ` Santosh Shilimkar
2013-03-04 18:48 ` Nishanth Menon
2013-03-01 12:11 ` [PATCH 15/15] ARM: OMAP5: PM: handle device instance for for coldreset Santosh Shilimkar
2013-03-01 13:04 ` Nishanth Menon
2013-03-01 13:09 ` Santosh Shilimkar
2013-03-01 13:13 ` Nishanth Menon
2013-03-01 13:16 ` Santosh Shilimkar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51319273.5090703@ti.com \
--to=santosh.shilimkar@ti.com \
--cc=khilman@deeprootsystems.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=nm@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox