diff for duplicates of <20100820065649.GH25742@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 9f29dfd..0fed668 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -43,3 +43,10 @@ request for these fixes sent to Linus over the weekend. Regards, Tony +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: omap3-pm-ensure-io-wakeups-are-properly-disabled.patch +Type: text/x-diff +Size: 1872 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100820/16fe0adb/attachment.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 5c4c853..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: inline; filename="omap3-pm-ensure-io-wakeups-are-properly-disabled.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 24282c5..0000000 --- a/a/2.txt +++ /dev/null @@ -1,45 +0,0 @@ -From: Kevin Hilman <khilman@ti.com> -Date: Mon, 16 Aug 2010 09:21:19 +0300 -Subject: [PATCH] OMAP3: PM: ensure IO wakeups are properly disabled - -Commit 5a5f561 (convert OMAP3 PRCM macros to the _SHIFT/_MASK suffixes) -mistakenly removed the check for PER when disabling the IO chain. - -During idle, if the PER powerdomain transitions into a lower state -and CORE does not, the IO pad wakeups are not being disabled in -the idle path after they are enabled. This can happen with the -lower C-states when using CPUidle for example. - -This patch ensures that the check for disabling IO wakeups also checks -for PER transitions, matching the check done to enable IO wakeups. - -Found when debugging PM/CPUidle related problems reported by Ameya -Palande <ameya.palande@nokia.com>. Problems were triggered -particularily on boards with UART2 consoles (n900, Overo) since UART2 -is in the PER powerdomain. - -Tested on l-o master (omap3_defonfig + CONFIG_CPU_IDLE=y) as well -as with current PM branch. Boards tested: n900, Overo, omap3evm. - -Cc: Paul Walmsley <paul@pwsan.com> -Cc: Ameya Palande <ameya.palande@nokia.com> -Tested-by: Jarkko Nikula <jhnikula@gmail.com> -Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> -[tony@atomide.com: updated description to clarify the transistion] -Signed-off-by: Tony Lindgren <tony@atomide.com> - -diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c -index fb4994a..7b03426 100644 ---- a/arch/arm/mach-omap2/pm34xx.c -+++ b/arch/arm/mach-omap2/pm34xx.c -@@ -480,7 +480,9 @@ void omap_sram_idle(void) - } - - /* Disable IO-PAD and IO-CHAIN wakeup */ -- if (omap3_has_io_wakeup() && core_next_state < PWRDM_POWER_ON) { -+ if (omap3_has_io_wakeup() && -+ (per_next_state < PWRDM_POWER_ON || -+ core_next_state < PWRDM_POWER_ON)) { - prm_clear_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD, PM_WKEN); - omap3_disable_io_chain(); - } diff --git a/a/content_digest b/N1/content_digest index 298a412..d89b3ad 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,17 +5,11 @@ "ref\04C65238D.9080105@ru.mvista.com\0" "ref\087sk2ao4fr.fsf@deeprootsystems.com\0" "ref\04C6D7936.3090201@ru.mvista.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 3/6] OMAP3: PM: ensure IO wakeups are properly disabled\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 3/6] OMAP3: PM: ensure IO wakeups are properly disabled\0" "Date\0Fri, 20 Aug 2010 09:56:50 +0300\0" - "To\0Sergei Shtylyov <sshtylyov@mvista.com>\0" - "Cc\0Kevin Hilman <khilman@deeprootsystems.com>" - linux-arm-kernel@lists.infradead.org - Jarkko Nikula <jhnikula@gmail.com> - Paul Walmsley <paul@pwsan.com> - linux-omap@vger.kernel.org - " Ameya Palande <ameya.palande@nokia.com>\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "* Sergei Shtylyov <sshtylyov@mvista.com> [100819 21:27]:\n" "> Hello.\n" @@ -61,54 +55,13 @@ "\n" "Regards,\n" "\n" - Tony - "\01:2\0" - "fn\0omap3-pm-ensure-io-wakeups-are-properly-disabled.patch\0" - "b\0" - "From: Kevin Hilman <khilman@ti.com>\n" - "Date: Mon, 16 Aug 2010 09:21:19 +0300\n" - "Subject: [PATCH] OMAP3: PM: ensure IO wakeups are properly disabled\n" - "\n" - "Commit 5a5f561 (convert OMAP3 PRCM macros to the _SHIFT/_MASK suffixes)\n" - "mistakenly removed the check for PER when disabling the IO chain.\n" - "\n" - "During idle, if the PER powerdomain transitions into a lower state\n" - "and CORE does not, the IO pad wakeups are not being disabled in\n" - "the idle path after they are enabled. This can happen with the\n" - "lower C-states when using CPUidle for example.\n" - "\n" - "This patch ensures that the check for disabling IO wakeups also checks\n" - "for PER transitions, matching the check done to enable IO wakeups.\n" - "\n" - "Found when debugging PM/CPUidle related problems reported by Ameya\n" - "Palande <ameya.palande@nokia.com>. Problems were triggered\n" - "particularily on boards with UART2 consoles (n900, Overo) since UART2\n" - "is in the PER powerdomain.\n" - "\n" - "Tested on l-o master (omap3_defonfig + CONFIG_CPU_IDLE=y) as well\n" - "as with current PM branch. Boards tested: n900, Overo, omap3evm.\n" - "\n" - "Cc: Paul Walmsley <paul@pwsan.com>\n" - "Cc: Ameya Palande <ameya.palande@nokia.com>\n" - "Tested-by: Jarkko Nikula <jhnikula@gmail.com>\n" - "Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>\n" - "[tony@atomide.com: updated description to clarify the transistion]\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c\n" - "index fb4994a..7b03426 100644\n" - "--- a/arch/arm/mach-omap2/pm34xx.c\n" - "+++ b/arch/arm/mach-omap2/pm34xx.c\n" - "@@ -480,7 +480,9 @@ void omap_sram_idle(void)\n" - " \t}\n" - " \n" - " \t/* Disable IO-PAD and IO-CHAIN wakeup */\n" - "-\tif (omap3_has_io_wakeup() && core_next_state < PWRDM_POWER_ON) {\n" - "+\tif (omap3_has_io_wakeup() &&\n" - "+\t (per_next_state < PWRDM_POWER_ON ||\n" - "+\t core_next_state < PWRDM_POWER_ON)) {\n" - " \t\tprm_clear_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD, PM_WKEN);\n" - " \t\tomap3_disable_io_chain();\n" - " \t}" + "Tony\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: omap3-pm-ensure-io-wakeups-are-properly-disabled.patch\n" + "Type: text/x-diff\n" + "Size: 1872 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100820/16fe0adb/attachment.bin> -14ce7c40390fff1ab9ec38c6d2151cf04070fa15da3e37c486b79ee87e7d9816 +a149e88f860edddac28aee9c0904ed50e381f6167896f72713a44503b455ab80
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.