lkml.org 
[lkml]   [2015]   [Dec]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/8 v4] thermal: rcar: retern error rcar_thermal_get_temp() if no ctemp update
    Date
    From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

    Current rcar_thermal_get_temp() returns latest temperature, but it might
    not be updated if some HW issue happened. This means user might get
    wrong temperature. This patch solved this issue.

    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    ---
    v3 -> v4

    - "happend" -> "happened"

    drivers/thermal/rcar_thermal.c | 14 ++++++++++++--
    1 file changed, 12 insertions(+), 2 deletions(-)

    diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
    index 67b5216..40c3ba5 100644
    --- a/drivers/thermal/rcar_thermal.c
    +++ b/drivers/thermal/rcar_thermal.c
    @@ -199,9 +199,9 @@ static int rcar_thermal_update_temp(struct rcar_thermal_priv *priv)

    dev_dbg(dev, "thermal%d %d -> %d\n", priv->id, priv->ctemp, ctemp);

    - priv->ctemp = ctemp;
    ret = 0;
    err_out_unlock:
    + priv->ctemp = ctemp;
    mutex_unlock(&priv->lock);
    return ret;
    }
    @@ -209,6 +209,7 @@ err_out_unlock:
    static int rcar_thermal_get_temp(struct thermal_zone_device *zone, int *temp)
    {
    struct rcar_thermal_priv *priv = rcar_zone_to_priv(zone);
    + int tmp;

    if (!rcar_has_irq_support(priv) || rcar_force_update_temp(priv)) {
    int ret = rcar_thermal_update_temp(priv);
    @@ -218,9 +219,18 @@ static int rcar_thermal_get_temp(struct thermal_zone_device *zone, int *temp)
    }

    mutex_lock(&priv->lock);
    - *temp = MCELSIUS((priv->ctemp * 5) - 65);
    + tmp = MCELSIUS((priv->ctemp * 5) - 65);
    mutex_unlock(&priv->lock);

    + if ((tmp < MCELSIUS(-45)) || (tmp > MCELSIUS(125))) {
    + struct device *dev = rcar_priv_to_dev(priv);
    +
    + dev_err(dev, "it couldn't measure temperature correctly\n");
    + return -EIO;
    + }
    +
    + *temp = tmp;
    +
    return 0;
    }

    --
    1.9.1


    \
     
     \ /
      Last update: 2015-12-08 06:41    [W:2.475 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site