* [GIT PULL] ARM: OMAP2+: clean up and standardize WFI handling for 3.9
@ 2013-02-08 17:27 Paul Walmsley
2013-02-10 17:08 ` Tony Lindgren
0 siblings, 1 reply; 5+ messages in thread
From: Paul Walmsley @ 2013-02-08 17:27 UTC (permalink / raw)
To: linux-arm-kernel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
The following changes since commit 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7:
Linux 3.8-rc6 (2013-02-01 12:08:14 +1100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git tags/omap-devel-b-for-3.9
for you to fetch changes up to 814a18a5d026464f56b3616704b985f9942b29a6:
ARM: OMAP AM3517/05: hwmod data: block WFI when EMAC active (2013-02-06 13:48:56 -0700)
- ----------------------------------------------------------------
On OMAP2+ devices, standardize and clean up WFI entry and WFI blocking.
Basic test logs are available here:
http://www.pwsan.com/omap/testlogs/wfi_devel_a_3.9/20130208085027/
- ----------------------------------------------------------------
vmlinux object size
(delta in bytes from test_v3.8-rc6 (88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7)):
text data bss total kernel
+64 0 0 +64 am33xx_only
-64 0 0 -64 n800_multi_omap2xxx
-64 0 0 -64 n800_only_a
0 0 0 0 omap1_defconfig
0 0 0 0 omap1_defconfig_1510innovator_only
0 0 0 0 omap1_defconfig_5912osk_only
-40 +8 0 -32 omap2plus_defconfig
-64 0 0 -64 omap2plus_defconfig_2430sdp_only
-40 +8 0 -32 omap2plus_defconfig_cpupm
-104 +8 0 -96 omap2plus_defconfig_no_pm
-40 +8 0 -32 omap2plus_defconfig_omap2_4_only
+64 0 0 +64 omap2plus_defconfig_omap3_4_only
-116 +8 +44 -64 rmk_omap3430_ldp_allnoconfig
+64 0 0 +64 rmk_omap3430_ldp_oldconfig
-116 +8 +44 -64 rmk_omap4430_sdp_allnoconfig
+64 0 0 +64 rmk_omap4430_sdp_oldconfig
Paul Walmsley (4):
ARM: OMAP2xxx: PM: enter WFI via inline asm if CORE stays active
ARM: OMAP2+: hwmod: add support for blocking WFI when a device is active
ARM: OMAP2420: hwmod data/PM: use hwmod to block WFI when I2C active
ARM: OMAP AM3517/05: hwmod data: block WFI when EMAC active
arch/arm/mach-omap2/omap_hwmod.c | 8 ++++++++
arch/arm/mach-omap2/omap_hwmod.h | 9 +++++++++
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 7 ++++++-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 7 ++++++-
arch/arm/mach-omap2/pm24xx.c | 23 +++++------------------
arch/arm/mach-omap2/sleep24xx.S | 19 -------------------
6 files changed, 34 insertions(+), 39 deletions(-)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAEBAgAGBQJRFTVMAAoJEMePsQ0LvSpLIFgP/0jbDcII8oox7kf2QrNrgtZq
2OXWuO6r8QNzIV0/YsZXhGWtpqOPjt64nkirgo0uo5jYnbKjSeels5o1rlz1wlSe
o+GVZ6K+F1bHqEK8F1dLLrss1WbtnewTrDG8Fmm0KcXk6TJENZIuk55A0gn2fLN1
iIpKoD4sw2l45fWaZokn7Ka6wPmKXvxWX+u1Rsyj5k9jCNoTUQxGg8LOPnhaw1s+
LG9u9RulRm5WRPIKL69/5/H+fCxUgStvaIbX/+WYyVb39noqzgd0OGysE1US2KGS
XMD7EFz3W1fQPpShrZym8wnG1O4ZSbNo93GGa70Y5xolFmrAu9uG5yjx8XSFQEOC
zyWRbWNeePj5HmttrsizPEt+Lqi3jZo+0gF/6cLgfCET2nq0NuQxJTmdhT/rhWLv
+idhr2f34XdokTVU4zpjT+tnUdnAFPIQPrcMmwPF2+fs92KdO1RoSq+sHkEaFvwN
Wo8TPXxhRK4QRT8sSMBNg1HLiLFKz5nHDfzWokH5OEfByoEzSwYa79N1ORfSo84+
grg+PewKe/wuQtRAR6mwe2xvaGVmtJKdflSasc2D1FXKiPtdajT8p5MqxM3nZ1o5
8EzXiEF5iIYAW+RQhGBFt10ruHZWMWMpqjBk6CjU+O6G12qE3aF5qiexawQkU0Ew
rp2PD3gzB1QITrtsBhxV
=ejwV
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL] ARM: OMAP2+: clean up and standardize WFI handling for 3.9
2013-02-08 17:27 [GIT PULL] ARM: OMAP2+: clean up and standardize WFI handling for 3.9 Paul Walmsley
@ 2013-02-10 17:08 ` Tony Lindgren
2013-02-10 17:28 ` Paul Walmsley
0 siblings, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2013-02-10 17:08 UTC (permalink / raw)
To: linux-arm-kernel
* Paul Walmsley <paul@pwsan.com> [130208 09:31]:
> Hi,
>
> The following changes since commit 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7:
>
> Linux 3.8-rc6 (2013-02-01 12:08:14 +1100)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git tags/omap-devel-b-for-3.9
>
> for you to fetch changes up to 814a18a5d026464f56b3616704b985f9942b29a6:
>
> ARM: OMAP AM3517/05: hwmod data: block WFI when EMAC active (2013-02-06 13:48:56 -0700)
>
> ----------------------------------------------------------------
> On OMAP2+ devices, standardize and clean up WFI entry and WFI blocking.
>
> Basic test logs are available here:
>
> http://www.pwsan.com/omap/testlogs/wfi_devel_a_3.9/20130208085027/
Thanks pulled into omap-for-v3.9/pm-wfi. While merging this into
omap-for-v3.9/tmp-merge, got the following merge conlict. Maybe
take a look if it's correct merge?
Regards,
Tony
commit 61e16f1257d2175c01c19250acfd3ad2c2af0d4b
Merge: 195f894 3fae0d6
Author: Tony Lindgren <tony@atomide.com>
Date: Sat Feb 9 20:25:38 2013 -0800
Merge branch 'omap-for-v3.9/pm-wfi' into omap-for-v3.9/tmp-merge
Conflicts:
arch/arm/mach-omap2/pm24xx.c
diff --cc arch/arm/mach-omap2/pm24xx.c
index b2a4df6,bc44bcd..f3444c4
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@@ -172,16 -174,18 +173,15 @@@ static void omap2_enter_mpu_retention(v
omap2_prm_write_mod_reg(0xffffffff, WKUP_MOD, PM_WKST);
/* Try to enter MPU retention */
- omap2_prm_write_mod_reg((0x01 << OMAP_POWERSTATE_SHIFT) |
- OMAP_LOGICRETSTATE_MASK,
- MPU_MOD, OMAP2_PM_PWSTCTRL);
+ pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_RET);
+
} else {
/* Block MPU retention */
-
- omap2_prm_write_mod_reg(OMAP_LOGICRETSTATE_MASK, MPU_MOD,
- OMAP2_PM_PWSTCTRL);
+ pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
}
- omap2_sram_idle();
-
- pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
+ /* WFI */
+ asm("mcr p15, 0, %0, c7, c0, 4" : : "r" (zero) : "memory", "cc");
}
static int omap2_can_sleep(void)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL] ARM: OMAP2+: clean up and standardize WFI handling for 3.9
2013-02-10 17:08 ` Tony Lindgren
@ 2013-02-10 17:28 ` Paul Walmsley
2013-02-11 17:37 ` Tony Lindgren
0 siblings, 1 reply; 5+ messages in thread
From: Paul Walmsley @ 2013-02-10 17:28 UTC (permalink / raw)
To: linux-arm-kernel
Hi Tony
On Sun, 10 Feb 2013, Tony Lindgren wrote:
> * Paul Walmsley <paul@pwsan.com> [130208 09:31]:
> >
> > ----------------------------------------------------------------
> > On OMAP2+ devices, standardize and clean up WFI entry and WFI blocking.
> >
> > Basic test logs are available here:
> >
> > http://www.pwsan.com/omap/testlogs/wfi_devel_a_3.9/20130208085027/
>
> Thanks pulled into omap-for-v3.9/pm-wfi. While merging this into
> omap-for-v3.9/tmp-merge, got the following merge conlict. Maybe
> take a look if it's correct merge?
...
> }
>
> - omap2_sram_idle();
> -
> - pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
> + /* WFI */
> + asm("mcr p15, 0, %0, c7, c0, 4" : : "r" (zero) : "memory", "cc");
> }
The inline asm is intended to replace the omap2_sram_idle() call. I'd
suggest:
}
/* WFI */
asm("mcr p15, 0, %0, c7, c0, 4" : : "r" (zero) : "memory", "cc");
pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
}
as the end product.
- Paul
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL] ARM: OMAP2+: clean up and standardize WFI handling for 3.9
2013-02-10 17:28 ` Paul Walmsley
@ 2013-02-11 17:37 ` Tony Lindgren
2013-02-11 17:45 ` Paul Walmsley
0 siblings, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2013-02-11 17:37 UTC (permalink / raw)
To: linux-arm-kernel
* Paul Walmsley <paul@pwsan.com> [130210 09:31]:
> Hi Tony
>
> On Sun, 10 Feb 2013, Tony Lindgren wrote:
>
> > * Paul Walmsley <paul@pwsan.com> [130208 09:31]:
> > >
> > > ----------------------------------------------------------------
> > > On OMAP2+ devices, standardize and clean up WFI entry and WFI blocking.
> > >
> > > Basic test logs are available here:
> > >
> > > http://www.pwsan.com/omap/testlogs/wfi_devel_a_3.9/20130208085027/
> >
> > Thanks pulled into omap-for-v3.9/pm-wfi. While merging this into
> > omap-for-v3.9/tmp-merge, got the following merge conlict. Maybe
> > take a look if it's correct merge?
>
> ...
>
> > }
> >
> > - omap2_sram_idle();
> > -
> > - pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
> > + /* WFI */
> > + asm("mcr p15, 0, %0, c7, c0, 4" : : "r" (zero) : "memory", "cc");
> > }
>
> The inline asm is intended to replace the omap2_sram_idle() call. I'd
> suggest:
>
> }
>
> /* WFI */
> asm("mcr p15, 0, %0, c7, c0, 4" : : "r" (zero) : "memory", "cc");
>
> pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
> }
>
> as the end product.
OK thanks.
This branch should probably have been based on your earlier PM branch
based on v3.8-rc5 that was already merged as omap-for-v3.9/pm-signed into
arm-soc for-next.
Now merging this branch based on v3.8-rc6 requires me to create a merge
base by merging the earlier branch with v3.8-rc6 and then resolving
the self-inflicted merge conflict in order for me to generate a pull request
without a non-trivial merge conflict. Just a bunch of extra hassle to
deal with with additional risk of merging things wrong. Anyways merging
into omap-for-v3.9/pm-wfi-take2.
Regards,
Tony
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL] ARM: OMAP2+: clean up and standardize WFI handling for 3.9
2013-02-11 17:37 ` Tony Lindgren
@ 2013-02-11 17:45 ` Paul Walmsley
0 siblings, 0 replies; 5+ messages in thread
From: Paul Walmsley @ 2013-02-11 17:45 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 11 Feb 2013, Tony Lindgren wrote:
> This branch should probably have been based on your earlier PM branch
> based on v3.8-rc5 that was already merged as omap-for-v3.9/pm-signed into
> arm-soc for-next.
>
> Now merging this branch based on v3.8-rc6 requires me to create a merge
> base by merging the earlier branch with v3.8-rc6 and then resolving
> the self-inflicted merge conflict in order for me to generate a pull request
> without a non-trivial merge conflict. Just a bunch of extra hassle to
> deal with with additional risk of merging things wrong. Anyways merging
> into omap-for-v3.9/pm-wfi-take2.
Sorry about that. Will try to find better merge bases for future
branches.
- Paul
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-02-11 17:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-08 17:27 [GIT PULL] ARM: OMAP2+: clean up and standardize WFI handling for 3.9 Paul Walmsley
2013-02-10 17:08 ` Tony Lindgren
2013-02-10 17:28 ` Paul Walmsley
2013-02-11 17:37 ` Tony Lindgren
2013-02-11 17:45 ` Paul Walmsley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).