diff for duplicates of <87vcj7f2dr.fsf@ti.com> diff --git a/a/1.txt b/N1/1.txt index 0565c95..3ee28a4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,9 +13,9 @@ >>> occur from IDLE state. When we transition OPP in a functioning >>> system, the call sequence for an OPP transition is as follows: >>> omap_sr_disable ->>> -> sr class 3 disable ->>> -> vp disable ->>> -> sr disable +>>> ? ? ? -> sr class 3 disable +>>> ? ? ? ? ? ?-> vp disable +>>> ? ? ? ? ? ?-> sr disable >>> forceupdate to voltage/frequency scale depending on which OPP >>> we are transitioning to. >>> @@ -28,7 +28,7 @@ >>> >>> Instead, to be on a safer side, we ensure that the valid states >>> of the VP state machine is diligently followed by software. This ->>> can be done by waiting for VP to be in idle prior to disabling +>>> can be done by waiting for VP to be in idle ?prior to disabling >>> VP. Existing prints have been updated to ensure context is >>> available on error messages. >>> @@ -40,27 +40,27 @@ >>> Cc: Tony Lindgren <tony@atomide.com> >>> Cc: Kevin Hilman <khilman@ti.com> >>> ->>> [nm@ti.com: port from android] +>>> [nm at ti.com: port from android] >> >> and you also convert to use new _vp_wait_for_idle() >> >>> Signed-off-by: Nishanth Menon <nm@ti.com> >>> Signed-off-by: Wenbiao Wang <wwang@ti.com> >>> --- ->>> arch/arm/mach-omap2/vp.c | 4 ++++ ->>> arch/arm/mach-omap2/vp.h | 5 +++-- ->>> 2 files changed, 7 insertions(+), 2 deletions(-) +>>> ?arch/arm/mach-omap2/vp.c | ? ?4 ++++ +>>> ?arch/arm/mach-omap2/vp.h | ? ?5 +++-- +>>> ?2 files changed, 7 insertions(+), 2 deletions(-) >>> >>> diff --git a/arch/arm/mach-omap2/vp.c b/arch/arm/mach-omap2/vp.c >>> index 2a8a085..9a72deb 100644 >>> --- a/arch/arm/mach-omap2/vp.c >>> +++ b/arch/arm/mach-omap2/vp.c >>> @@ -308,6 +308,10 @@ void omap_vp_disable(struct voltagedomain *voltdm) ->>> return; ->>> } +>>> ? ? ? ? ? ? ? return; +>>> ? ? ? } >>> ->>> + if (_vp_wait_for_idle(voltdm, vp)) { ->>> + pr_warn_ratelimited("%s: vdd_%s timedout!Ignore and try\n", +>>> + ? ? if (_vp_wait_for_idle(voltdm, vp)) { +>>> + ? ? ? ? ? ? pr_warn_ratelimited("%s: vdd_%s timedout!Ignore and try\n", >> >> s/timedout/timed out/ >> no space after '!', @@ -88,7 +88,3 @@ in the kernel logs will still make me ask "try what?" IMO, it should say omap_vp_disable: WARNING: vdd_mpu timed out, ignoring. Kevin --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index f1d39d9..b9b07c6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,15 +2,10 @@ "ref\01338514899-3560-5-git-send-email-nm@ti.com\0" "ref\087sjeesq11.fsf@ti.com\0" "ref\0CAOMWX4fyJNtjm+kGgY=5yWaMeSAEYMTxuzyyrQibcH3=3wfMoA@mail.gmail.com\0" - "From\0Kevin Hilman <khilman@ti.com>\0" - "Subject\0Re: [PATCH V2 4/4] ARM: OMAP3+: PM: VP: ensure VP is idle before disable\0" + "From\0khilman@ti.com (Kevin Hilman)\0" + "Subject\0[PATCH V2 4/4] ARM: OMAP3+: PM: VP: ensure VP is idle before disable\0" "Date\0Mon, 04 Jun 2012 09:49:52 -0700\0" - "To\0Menon" - " Nishanth <nm@ti.com>\0" - "Cc\0linux-omap@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - Wenbiao Wang <wwang@ti.com> - " Tony Lindgren <tony@atomide.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "\"Menon, Nishanth\" <nm@ti.com> writes:\n" @@ -28,9 +23,9 @@ ">>> occur from IDLE state. When we transition OPP in a functioning\n" ">>> system, the call sequence for an OPP transition is as follows:\n" ">>> omap_sr_disable\n" - ">>> \302\240 \302\240 \302\240 -> sr class 3 disable\n" - ">>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240-> vp disable\n" - ">>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240-> sr disable\n" + ">>> ? ? ? -> sr class 3 disable\n" + ">>> ? ? ? ? ? ?-> vp disable\n" + ">>> ? ? ? ? ? ?-> sr disable\n" ">>> forceupdate to voltage/frequency scale depending on which OPP\n" ">>> we are transitioning to.\n" ">>>\n" @@ -43,7 +38,7 @@ ">>>\n" ">>> Instead, to be on a safer side, we ensure that the valid states\n" ">>> of the VP state machine is diligently followed by software. This\n" - ">>> can be done by waiting for VP to be in idle \302\240prior to disabling\n" + ">>> can be done by waiting for VP to be in idle ?prior to disabling\n" ">>> VP. Existing prints have been updated to ensure context is\n" ">>> available on error messages.\n" ">>>\n" @@ -55,27 +50,27 @@ ">>> Cc: Tony Lindgren <tony@atomide.com>\n" ">>> Cc: Kevin Hilman <khilman@ti.com>\n" ">>>\n" - ">>> [nm@ti.com: port from android]\n" + ">>> [nm at ti.com: port from android]\n" ">>\n" ">> and you also convert to use new _vp_wait_for_idle()\n" ">>\n" ">>> Signed-off-by: Nishanth Menon <nm@ti.com>\n" ">>> Signed-off-by: Wenbiao Wang <wwang@ti.com>\n" ">>> ---\n" - ">>> \302\240arch/arm/mach-omap2/vp.c | \302\240 \302\2404 ++++\n" - ">>> \302\240arch/arm/mach-omap2/vp.h | \302\240 \302\2405 +++--\n" - ">>> \302\2402 files changed, 7 insertions(+), 2 deletions(-)\n" + ">>> ?arch/arm/mach-omap2/vp.c | ? ?4 ++++\n" + ">>> ?arch/arm/mach-omap2/vp.h | ? ?5 +++--\n" + ">>> ?2 files changed, 7 insertions(+), 2 deletions(-)\n" ">>>\n" ">>> diff --git a/arch/arm/mach-omap2/vp.c b/arch/arm/mach-omap2/vp.c\n" ">>> index 2a8a085..9a72deb 100644\n" ">>> --- a/arch/arm/mach-omap2/vp.c\n" ">>> +++ b/arch/arm/mach-omap2/vp.c\n" ">>> @@ -308,6 +308,10 @@ void omap_vp_disable(struct voltagedomain *voltdm)\n" - ">>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 return;\n" - ">>> \302\240 \302\240 \302\240 }\n" + ">>> ? ? ? ? ? ? ? return;\n" + ">>> ? ? ? }\n" ">>>\n" - ">>> + \302\240 \302\240 if (_vp_wait_for_idle(voltdm, vp)) {\n" - ">>> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 pr_warn_ratelimited(\"%s: vdd_%s timedout!Ignore and try\\n\",\n" + ">>> + ? ? if (_vp_wait_for_idle(voltdm, vp)) {\n" + ">>> + ? ? ? ? ? ? pr_warn_ratelimited(\"%s: vdd_%s timedout!Ignore and try\\n\",\n" ">>\n" ">> s/timedout/timed out/\n" ">> no space after '!',\n" @@ -102,10 +97,6 @@ "\n" " omap_vp_disable: WARNING: vdd_mpu timed out, ignoring.\n" "\n" - "Kevin\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-omap\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + Kevin -3a615890322d5b1c4651b4732af8313b48c5eefc4e0d7e94a0410fec9b7f3df8 +4cca7cbd62dc37dabca2d5d24632d006015748a90ce5939db9b3658c7ae76cb3
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.