diff for duplicates of <8739g0b8sa.fsf@ti.com> diff --git a/a/1.txt b/N1/1.txt index 63e55af..b3ffbbd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -86,73 +86,3 @@ Kevin [1] ->From 5b5a73101fcfa042d53828c017ee3149eae44b50 Mon Sep 17 00:00:00 2001 -From: Kevin Hilman <khilman@ti.com> -Date: Tue, 13 Sep 2011 11:18:44 -0700 -Subject: [PATCH] OMAP3: PM: fix UART handling when using no_console_suspend - -During the idle/suspend path, we expect the console lock to be held so -that no console output is done during/after the UARTs are idled. - -However, when using the no_console_suspend argument on the -command-line, the console driver does not take the console lock. This -allows the possibility of console activity after UARTs have been -disabled. - -To fix, update the current is_suspending() to also check the -console_suspend_enabled flag. - -NOTE: this is short-term workaround until the OMAP serial driver - is fully converted to use runtime PM. - -Signed-off-by: Kevin Hilman <khilman@ti.com> ---- - arch/arm/mach-omap2/pm34xx.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c -index 7255d9b..c8cbd00 100644 ---- a/arch/arm/mach-omap2/pm34xx.c -+++ b/arch/arm/mach-omap2/pm34xx.c -@@ -55,7 +55,7 @@ - static suspend_state_t suspend_state = PM_SUSPEND_ON; - static inline bool is_suspending(void) - { -- return (suspend_state != PM_SUSPEND_ON); -+ return (suspend_state != PM_SUSPEND_ON) && console_suspend_enabled; - } - #else - static inline bool is_suspending(void) --- -1.7.6 - - - -[2] -commit e83df17f178360a8e7874441bca04a710c869e42 -Author: Kevin Hilman <khilman@deeprootsystems.com> -Date: Wed Dec 8 22:40:40 2010 +0000 - - OMAP2+: PM/serial: fix console semaphore acquire during suspend - - commit 0d8e2d0dad98a693bad88aea6876ac8b94ad95c6 (OMAP2+: PM/serial: - hold console semaphore while OMAP UARTs are disabled) added use of the - console semaphore to protect UARTs from being accessed after disabled - during idle, but this causes problems in suspend. - - During suspend, the console semaphore is acquired by the console - suspend method (console_suspend()) so the try_acquire_console_sem() - will always fail and suspend will be aborted. - - To fix, introduce a check so the console semaphore is only attempted - during idle, and not during suspend. Also use the same check so that - the console semaphore is not prematurely released during resume. - - Thanks to Paul Walmsley for suggesting adding the same check during - resume. - - Cc: Paul Walmsley <paul@pwsan.com> - Tested-by: Jean Pihet <j-pihet@ti.com> - Tested-by: Paul Walmsley <paul@pwsan.com> - Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> - Signed-off-by: Tony Lindgren <tony@atomide.com> diff --git a/a/content_digest b/N1/content_digest index 765bcea..87d0875 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,18 +2,10 @@ "ref\01313754927-11992-2-git-send-email-abhilash.kv@ti.com\0" "ref\087fwkild5k.fsf@ti.com\0" "ref\0FCCFB4CDC6E5564B9182F639FC356087037B3D8823@dbde02.ent.ti.com\0" - "From\0Kevin Hilman <khilman@ti.com>\0" - "Subject\0Re: [PATCH 1/4] AM3517 : support for suspend/resume\0" + "From\0khilman@ti.com (Kevin Hilman)\0" + "Subject\0[PATCH 1/4] AM3517 : support for suspend/resume\0" "Date\0Tue, 13 Sep 2011 11:24:05 -0700\0" - "To\0Koyamangalath" - " Abhilash <abhilash.kv@ti.com>\0" - "Cc\0linux-omap@vger.kernel.org <linux-omap@vger.kernel.org>" - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - tony@atomide.com <tony@atomide.com> - linux@arm.linux.org.uk <linux@arm.linux.org.uk> - Lohithakshan - " Ranjith <ranjithl@ti.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Abhilash,\n" @@ -103,76 +95,6 @@ "Kevin\n" "\n" "\n" - "[1]\n" - ">From 5b5a73101fcfa042d53828c017ee3149eae44b50 Mon Sep 17 00:00:00 2001\n" - "From: Kevin Hilman <khilman@ti.com>\n" - "Date: Tue, 13 Sep 2011 11:18:44 -0700\n" - "Subject: [PATCH] OMAP3: PM: fix UART handling when using no_console_suspend\n" - "\n" - "During the idle/suspend path, we expect the console lock to be held so\n" - "that no console output is done during/after the UARTs are idled.\n" - "\n" - "However, when using the no_console_suspend argument on the\n" - "command-line, the console driver does not take the console lock. This\n" - "allows the possibility of console activity after UARTs have been\n" - "disabled.\n" - "\n" - "To fix, update the current is_suspending() to also check the\n" - "console_suspend_enabled flag.\n" - "\n" - "NOTE: this is short-term workaround until the OMAP serial driver\n" - " is fully converted to use runtime PM.\n" - "\n" - "Signed-off-by: Kevin Hilman <khilman@ti.com>\n" - "---\n" - " arch/arm/mach-omap2/pm34xx.c | 2 +-\n" - " 1 files changed, 1 insertions(+), 1 deletions(-)\n" - "\n" - "diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c\n" - "index 7255d9b..c8cbd00 100644\n" - "--- a/arch/arm/mach-omap2/pm34xx.c\n" - "+++ b/arch/arm/mach-omap2/pm34xx.c\n" - "@@ -55,7 +55,7 @@\n" - " static suspend_state_t suspend_state = PM_SUSPEND_ON;\n" - " static inline bool is_suspending(void)\n" - " {\n" - "-\treturn (suspend_state != PM_SUSPEND_ON);\n" - "+\treturn (suspend_state != PM_SUSPEND_ON) && console_suspend_enabled;\n" - " }\n" - " #else\n" - " static inline bool is_suspending(void)\n" - "-- \n" - "1.7.6\n" - "\n" - "\n" - "\n" - "[2]\n" - "commit e83df17f178360a8e7874441bca04a710c869e42\n" - "Author: Kevin Hilman <khilman@deeprootsystems.com>\n" - "Date: Wed Dec 8 22:40:40 2010 +0000\n" - "\n" - " OMAP2+: PM/serial: fix console semaphore acquire during suspend\n" - " \n" - " commit 0d8e2d0dad98a693bad88aea6876ac8b94ad95c6 (OMAP2+: PM/serial:\n" - " hold console semaphore while OMAP UARTs are disabled) added use of the\n" - " console semaphore to protect UARTs from being accessed after disabled\n" - " during idle, but this causes problems in suspend.\n" - " \n" - " During suspend, the console semaphore is acquired by the console\n" - " suspend method (console_suspend()) so the try_acquire_console_sem()\n" - " will always fail and suspend will be aborted.\n" - " \n" - " To fix, introduce a check so the console semaphore is only attempted\n" - " during idle, and not during suspend. Also use the same check so that\n" - " the console semaphore is not prematurely released during resume.\n" - " \n" - " Thanks to Paul Walmsley for suggesting adding the same check during\n" - " resume.\n" - " \n" - " Cc: Paul Walmsley <paul@pwsan.com>\n" - " Tested-by: Jean Pihet <j-pihet@ti.com>\n" - " Tested-by: Paul Walmsley <paul@pwsan.com>\n" - " Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>\n" - Signed-off-by: Tony Lindgren <tony@atomide.com> + [1] -24eddf03da53df4186e7f6e72ad6e6fdce768be1ec5d3f828a25bb7442e696b4 +11bc1a834442908071c3613789a16dc4c74a195b0784e82f140956b67bc7be5e
diff --git a/a/content_digest b/N2/content_digest index 765bcea..d03fe99 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,14 +5,14 @@ "From\0Kevin Hilman <khilman@ti.com>\0" "Subject\0Re: [PATCH 1/4] AM3517 : support for suspend/resume\0" "Date\0Tue, 13 Sep 2011 11:24:05 -0700\0" - "To\0Koyamangalath" + "To\0Koyamangalath\\" " Abhilash <abhilash.kv@ti.com>\0" - "Cc\0linux-omap@vger.kernel.org <linux-omap@vger.kernel.org>" - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - tony@atomide.com <tony@atomide.com> - linux@arm.linux.org.uk <linux@arm.linux.org.uk> - Lohithakshan + "Cc\0linux-omap\\@vger.kernel.org <linux-omap@vger.kernel.org>" + " linux-arm-kernel\\@lists.infradead.org <linux-arm-kernel@lists.infradead.org>" + " linux-kernel\\@vger.kernel.org <linux-kernel@vger.kernel.org>" + " tony\\@atomide.com <tony@atomide.com>" + " linux\\@arm.linux.org.uk <linux@arm.linux.org.uk>" + " Lohithakshan\\" " Ranjith <ranjithl@ti.com>\0" "\00:1\0" "b\0" @@ -175,4 +175,4 @@ " Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>\n" Signed-off-by: Tony Lindgren <tony@atomide.com> -24eddf03da53df4186e7f6e72ad6e6fdce768be1ec5d3f828a25bb7442e696b4 +0b11224c8322dc828717fd49fec98d2d4a59aaf0f77933a6db976a5edfa71d17
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.