From: "Anson.Huang@freescale.com" <Anson.Huang@freescale.com>
To: Shawn Guo <shawn.guo@linaro.org>
Cc: "rui.zhang@intel.com" <rui.zhang@intel.com>,
"eduardo.valentin@ti.com" <eduardo.valentin@ti.com>,
"linux-pm@vger.kernel.org" <linux-pm@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] thermal: imx: correct suspend/resume flow
Date: Mon, 23 Dec 2013 14:33:43 +0000 [thread overview]
Message-ID: <C95204EE-D28A-4AB4-B60B-E7CAB8AC3B8E@freescale.com> (raw)
In-Reply-To: <20131223142931.GM26070@S2101-09.ap.freescale.net>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="gb2312", Size: 3369 bytes --]
Sent from Anson's iPhone
> ÔÚ 2013Äê12ÔÂ23ÈÕ£¬22:28£¬"Shawn Guo" <shawn.guo@linaro.org> дµÀ£º
>
>> On Mon, Dec 23, 2013 at 03:51:58PM -0500, Anson Huang wrote:
>> Current imx thermal sensor's suspend function will return fail if
>> thermal sensor is always enabled, but because alarm function is enabled,
>> thermal sensor will be always enabled as well, hence break system's suspend,
>> this patch will disable thermal sensor before suspend and re-enable it
>> after resume, it fixes the failure of suspend/resume caused by thermal driver.
>
> We should probably make it clear in the commit log that it's a
> regression caused by commit 37713a1 (thermal: imx: implement thermal
> alarm interrupt handling).
agreed, will improve the commit log in V2.
>
>>
>> Signed-off-by: Anson Huang <b20788@freescale.com>
>> ---
>> drivers/thermal/imx_thermal.c | 31 +++++++++++++++++--------------
>> 1 file changed, 17 insertions(+), 14 deletions(-)
>>
>> diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
>> index cbb16f3..9a9a6c2 100644
>> --- a/drivers/thermal/imx_thermal.c
>> +++ b/drivers/thermal/imx_thermal.c
>> @@ -510,27 +510,30 @@ static int imx_thermal_suspend(struct device *dev)
>> {
>> struct imx_thermal_data *data = dev_get_drvdata(dev);
>> struct regmap *map = data->tempmon;
>> - u32 val;
>>
>> - regmap_read(map, TEMPSENSE0, &val);
>> - if ((val & TEMPSENSE0_POWER_DOWN) == 0) {
>> - /*
>> - * If a measurement is taking place, wait for a long enough
>> - * time for it to finish, and then check again. If it still
>> - * does not finish, something must go wrong.
>> - */
>> - udelay(50);
>> - regmap_read(map, TEMPSENSE0, &val);
>> - if ((val & TEMPSENSE0_POWER_DOWN) == 0)
>> - return -ETIMEDOUT;
>> - }
>> + /*
>> + * Need to disable thermal sensor, otherwise, when thermal core
>> + * try to get temperature before thermal sensor resume, a wrong
>> + * temperature will be read as the thermal sensor is powered
>> + * down.
>> + */
>> + regmap_write(map, TEMPSENSE0 + REG_CLR, TEMPSENSE0_MEASURE_TEMP);
>> + regmap_write(map, TEMPSENSE0 + REG_SET, TEMPSENSE0_POWER_DOWN);
>> + data->mode = THERMAL_DEVICE_DISABLED;
>
> Is it really necessary to update data->mode through suspend/resume
> cycle?
Yes, as the thermal core may try to get temperature before imx thermal sensor resume, if not setting its mode to disabled, thermal core will get a wrong temp and caused system power off by mistake, as the get_temp function will decide whether to power up thermal core according to its mode.
>
> Shawn
>
>>
>> return 0;
>> }
>>
>> static int imx_thermal_resume(struct device *dev)
>> {
>> - /* Nothing to do for now */
>> + struct imx_thermal_data *data = dev_get_drvdata(dev);
>> + struct regmap *map = data->tempmon;
>> +
>> + /* Enabled thermal sensor after resume */
>> + regmap_write(map, TEMPSENSE0 + REG_CLR, TEMPSENSE0_POWER_DOWN);
>> + regmap_write(map, TEMPSENSE0 + REG_SET, TEMPSENSE0_MEASURE_TEMP);
>> + data->mode = THERMAL_DEVICE_ENABLED;
>> +
>> return 0;
>> }
>> #endif
>> --
>> 1.7.9.5
>
ÿôèº{.nÇ+·®+%Ëÿ±éݶ\x17¥wÿº{.nÇ+·¥{±þG«éÿ{ayº\x1dÊÚë,j\a¢f£¢·hïêÿêçz_è®\x03(éÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?¨èÚ&£ø§~á¶iOæ¬z·vØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?I¥
prev parent reply other threads:[~2013-12-23 14:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-23 20:51 Anson Huang
2013-12-23 14:29 ` Shawn Guo
2013-12-23 14:33 ` Anson.Huang [this message]
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=C95204EE-D28A-4AB4-B60B-E7CAB8AC3B8E@freescale.com \
--to=anson.huang@freescale.com \
--cc=eduardo.valentin@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.com \
--cc=shawn.guo@linaro.org \
/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
all inboxes | Powered by JetHome®