On 04/24/2014 11:48 AM, Amit Kachhap wrote:
> On 4/14/14, Tushar Behera <tushar.behera@xxxxxxxxxx> wrote:
>> Currently the threshold limits are updated in 2 stages, once for all
>> software trigger levels and again for hardware trip point.
> I guess the first stage is bootloader as could not find this in this file.
> Anyways the changes looks fine to me.
>
> Acked-by: Amit Daniel Kachhap <amit.daniel@xxxxxxxxxxx>
>
Can this the patch be merged now?
>>
>> While updating the software trigger levels, it overwrites the threshold
>> limit for hardware trip point thereby forcing the Exynos core to issue
>> an emergency shutdown.
>>
>> Updating only the required fields in threshold register fixes this issue.
>>
>> Signed-off-by: Tushar Behera <tushar.behera@xxxxxxxxxx>
>> ---
>> Based on v3.15-rc1.
>>
>> drivers/thermal/samsung/exynos_tmu.c | 4 ++++
>> 1 file changed, 4 insertions(+)
>>
>> diff --git a/drivers/thermal/samsung/exynos_tmu.c
>> b/drivers/thermal/samsung/exynos_tmu.c
>> index 0d96a51..ffccc89 100644
>> --- a/drivers/thermal/samsung/exynos_tmu.c
>> +++ b/drivers/thermal/samsung/exynos_tmu.c
>> @@ -225,6 +225,8 @@ skip_calib_data:
>> trigger_levs++;
>> }
>>
>> + rising_threshold = readl(data->base + reg->threshold_th0);
>> +
>> if (data->soc == SOC_ARCH_EXYNOS4210) {
>> /* Write temperature code for threshold */
>> threshold_code = temp_to_code(data, pdata->threshold);
>> @@ -249,6 +251,7 @@ skip_calib_data:
>> ret = threshold_code;
>> goto out;
>> }
>> + rising_threshold &= ~(0xff << 8 * i);
>> rising_threshold |= threshold_code << 8 * i;
>> if (pdata->threshold_falling) {
>> threshold_code = temp_to_code(data,
>> @@ -281,6 +284,7 @@ skip_calib_data:
>> }
>> if (i == EXYNOS_MAX_TRIGGER_PER_REG - 1) {
>> /* 1-4 level to be assigned in th0 reg */
>> + rising_threshold &= ~(0xff << 8 * i);
>> rising_threshold |= threshold_code << 8 * i;
>> writel(rising_threshold,
>> data->base + reg->threshold_th0);
>> --
>> 1.7.9.5
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc"
>> in
>> the body of a message to majordomo@xxxxxxxxxxxxxxx
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
--
Tushar Behera
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
