lkml.org 
[lkml]   [2011]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[048/107] hwmon: (w83627ehf) Properly report thermal diode sensors
    2.6.32-longterm review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Jean Delvare <khali@linux-fr.org>

    commit bf164c58e58328c40ebc597a8ac00cc6840f9703 upstream.

    The w83627ehf driver is improperly reporting thermal diode sensors as
    type 2, instead of 3. This caused "sensors" and possibly other
    monitoring tools to report these sensors as "transistor" instead of
    "thermal diode".

    Furthermore, diode subtype selection (CPU vs. external) is only
    supported by the original W83627EHF/EHG. All later models only support
    CPU diode type, and some (NCT6776F) don't even have the register in
    question so we should avoid reading from it.

    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/hwmon/w83627ehf.c | 15 +++++++++++----
    1 file changed, 11 insertions(+), 4 deletions(-)

    --- a/drivers/hwmon/w83627ehf.c
    +++ b/drivers/hwmon/w83627ehf.c
    @@ -1239,7 +1239,8 @@ static void w83627ehf_device_remove_file
    }

    /* Get the monitoring functions started */
    -static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data)
    +static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data,
    + enum kinds kind)
    {
    int i;
    u8 tmp, diode;
    @@ -1268,10 +1269,16 @@ static inline void __devinit w83627ehf_i
    w83627ehf_write_value(data, W83627EHF_REG_VBAT, tmp | 0x01);

    /* Get thermal sensor types */
    - diode = w83627ehf_read_value(data, W83627EHF_REG_DIODE);
    + switch (kind) {
    + case w83627ehf:
    + diode = w83627ehf_read_value(data, W83627EHF_REG_DIODE);
    + break;
    + default:
    + diode = 0x70;
    + }
    for (i = 0; i < 3; i++) {
    if ((tmp & (0x02 << i)))
    - data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 2;
    + data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 3;
    else
    data->temp_type[i] = 4; /* thermistor */
    }
    @@ -1319,7 +1326,7 @@ static int __devinit w83627ehf_probe(str
    }

    /* Initialize the chip */
    - w83627ehf_init_device(data);
    + w83627ehf_init_device(data, sio_data->kind);

    data->vrm = vid_which_vrm();
    superio_enter(sio_data->sioreg);



    \
     
     \ /
      Last update: 2011-11-03 02:39    [W:0.029 / U:92.948 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site