From patchwork Fri Sep 14 16:32:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10601081 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3216C14BD for ; Fri, 14 Sep 2018 16:33:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CDF32BB80 for ; Fri, 14 Sep 2018 16:33:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0ECF92BBA5; Fri, 14 Sep 2018 16:33:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_SBL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 841362BB80 for ; Fri, 14 Sep 2018 16:33:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727996AbeINVsQ (ORCPT ); Fri, 14 Sep 2018 17:48:16 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:41548 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726845AbeINVsQ (ORCPT ); Fri, 14 Sep 2018 17:48:16 -0400 Received: by mail-pg1-f194.google.com with SMTP id s15-v6so4641943pgv.8 for ; Fri, 14 Sep 2018 09:33:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=kAkCl5aGLLOd3DSWJmUR9S2BwBXFLYnbXbMfAZgZ5nw=; b=BdVJyJ1mDh+7YJkUZDQetrK7nmo5NrNYsKCsbLIBx2M9yFCC1FU4ju3ZKS/C3g//VO x7xOMHngq6lffS+577KRC7C528egXYA3vjOsyPKf6sFczSjoOoto1WiYW6dPLtJ2uuoE h0uYFaQ0cQJuSAj+e3bi+aV1QEXj6R0XS1uOIVaar/xr/yVY7ExI9uxE7Ov161p2S9lP w1GZreUESQ5HhNbhDgswIdD5jD9HFXaXaxGLQMpZjgOSnHpW9k6ENcBg2AGiQEA75tYD +sEzdDl/0vKht97dhdr67cQlpXuAal5Zeia5o5KgQcLwMNioVXPuMN2OTn8Em29h3hKt 1CMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=kAkCl5aGLLOd3DSWJmUR9S2BwBXFLYnbXbMfAZgZ5nw=; b=M1Aed3fX2FLGZsejt/gRY9KPn0MbafuEJ+635H12iRm09ASU2HHY5NmhCdt76tCy8x 9QONmqH3QbKQrIaTI2HzRDZOyoF8thz1zG6rD4MhOjJ8k8AiHJqy6g9Q4eCs+F0rjtWo cxvE6wjez92zhFveRXml5mJeFblRHDahT6BlGP7ik2pyBuxoxQXdcA8myTi8x/k6pary 8GqK+GyiAlASIvNe0WN3lZlggmDqPKcviV/42f9dZICDC5pyLLNFqXHksvDVSqTMyYt1 2LzRPFYk6jiIl3o8BM5hHyGnHlmmOLoSfEXWXqFcsrmJ2cMhQix719HFmntT7hQxYtfn yejQ== X-Gm-Message-State: APzg51DsJkWJNjkfuQV1t7u52bL/xc6XemGgUGqtnLUSJIsXI89aIYJi Us1+r8GeKIjwz3U6gzqMIJ9XH71r X-Google-Smtp-Source: ANB0VdaHPUIka1ynLmyt9RmcGLQ5Ug4KTAamrEokigVCI9gJd3OwifN+aE8mRt4ZjkVkOSAjktIIbQ== X-Received: by 2002:a62:1d54:: with SMTP id d81-v6mr13430674pfd.139.1536942780687; Fri, 14 Sep 2018 09:33:00 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by smtp.gmail.com with ESMTPSA id k23-v6sm8300683pgl.42.2018.09.14.09.32.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Sep 2018 09:32:59 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck , Robert Kern Subject: [PATCH 2/2] hwmon: (nct6775) Fix RPM output for fan7 on NCT6796D Date: Fri, 14 Sep 2018 09:32:54 -0700 Message-Id: <1536942774-23738-2-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536942774-23738-1-git-send-email-linux@roeck-us.net> References: <1536942774-23738-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP fan7 on NCT6796D does not have a fan count register; it only has an RPM register. Switch to using RPM registers to read the fan speed for all chips supporting it to solve the problem for good. Reported-by: Robert Kern Cc: Robert Kern Fixes: 81820059a428 ("hwmon: (nct6775) Add support for NCT6796D") Signed-off-by: Guenter Roeck --- drivers/hwmon/nct6775.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index 1e6f0e6ba740..c686a67ae133 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -501,8 +501,8 @@ static const s8 NCT6779_BEEP_BITS[] = { 16, 17, -1, -1, -1, -1, /* temp1..temp6 */ 30, 31 }; /* intrusion0, intrusion1 */ -static const u16 NCT6779_REG_FAN[] = { - 0x4b0, 0x4b2, 0x4b4, 0x4b6, 0x4b8, 0x4ba, 0x660 }; +static const u16 NCT6779_REG_FAN_RPM[] = { + 0x4c0, 0x4c2, 0x4c4, 0x4c6, 0x4c8, 0x4ca }; static const u16 NCT6779_REG_FAN_PULSES[NUM_FAN] = { 0x644, 0x645, 0x646, 0x647, 0x648, 0x649 }; @@ -677,6 +677,9 @@ static const char *const nct6793_temp_label[] = { #define NCT6793_TEMP_MASK 0xbfff037e +static const u16 NCT6795_REG_FAN_RPM[] = { + 0x656, 0x658, 0x65a, 0x65c, 0x65e, 0x654, 0x660 }; + static const char *const nct6795_temp_label[] = { "", "SYSTIN", @@ -984,6 +987,7 @@ struct nct6775_data { const u16 *REG_TARGET; const u16 *REG_FAN; + const u16 *REG_FAN_RPM; const u16 *REG_FAN_MODE; const u16 *REG_FAN_MIN; const u16 *REG_FAN_PULSES; @@ -1277,11 +1281,12 @@ static bool is_word_sized(struct nct6775_data *data, u16 reg) case nct6795: case nct6796: return reg == 0x150 || reg == 0x153 || reg == 0x155 || - ((reg & 0xfff0) == 0x4b0 && (reg & 0x000f) < 0x0b) || + (reg & 0xfff0) == 0x4c0 || reg == 0x402 || reg == 0x63a || reg == 0x63c || reg == 0x63e || reg == 0x640 || reg == 0x642 || reg == 0x64a || - reg == 0x64c || reg == 0x660 || + reg == 0x64c || + (reg & 0xfff0) == 0x650 || reg == 0x660 || reg == 0x73 || reg == 0x75 || reg == 0x77 || reg == 0x79 || reg == 0x7b || reg == 0x7d; } @@ -1676,10 +1681,6 @@ static struct nct6775_data *nct6775_update_device(struct device *dev) if (!(data->has_fan & BIT(i))) continue; - reg = nct6775_read_value(data, data->REG_FAN[i]); - data->rpm[i] = data->fan_from_reg(reg, - data->fan_div[i]); - if (data->has_fan_min & BIT(i)) data->fan_min[i] = nct6775_read_value(data, data->REG_FAN_MIN[i]); @@ -1691,7 +1692,16 @@ static struct nct6775_data *nct6775_update_device(struct device *dev) >> data->FAN_PULSE_SHIFT[i]) & 0x03; } - nct6775_select_fan_div(dev, data, i, reg); + if (data->REG_FAN) { + reg = nct6775_read_value(data, + data->REG_FAN[i]); + data->rpm[i] = data->fan_from_reg(reg, + data->fan_div[i]); + nct6775_select_fan_div(dev, data, i, reg); + } else { + data->rpm[i] = nct6775_read_value(data, + data->REG_FAN_RPM[i]); + } } nct6775_update_pwm(dev); @@ -3875,7 +3885,7 @@ static int nct6775_probe(struct platform_device *pdev) data->REG_IN_MINMAX[0] = NCT6775_REG_IN_MIN; data->REG_IN_MINMAX[1] = NCT6775_REG_IN_MAX; data->REG_TARGET = NCT6775_REG_TARGET; - data->REG_FAN = NCT6779_REG_FAN; + data->REG_FAN_RPM = NCT6779_REG_FAN_RPM; data->REG_FAN_MODE = NCT6775_REG_FAN_MODE; data->REG_FAN_MIN = NCT6776_REG_FAN_MIN; data->REG_FAN_PULSES = NCT6779_REG_FAN_PULSES; @@ -3949,22 +3959,27 @@ static int nct6775_probe(struct platform_device *pdev) case nct6791: data->temp_label = nct6779_temp_label; data->temp_mask = NCT6791_TEMP_MASK; + data->REG_FAN_RPM = NCT6779_REG_FAN_RPM; break; case nct6792: data->temp_label = nct6792_temp_label; data->temp_mask = NCT6792_TEMP_MASK; + data->REG_FAN_RPM = NCT6779_REG_FAN_RPM; break; case nct6793: data->temp_label = nct6793_temp_label; data->temp_mask = NCT6793_TEMP_MASK; + data->REG_FAN_RPM = NCT6779_REG_FAN_RPM; break; case nct6795: data->temp_label = nct6795_temp_label; data->temp_mask = NCT6795_TEMP_MASK; + data->REG_FAN_RPM = NCT6795_REG_FAN_RPM; break; case nct6796: data->temp_label = nct6796_temp_label; data->temp_mask = NCT6796_TEMP_MASK; + data->REG_FAN_RPM = NCT6795_REG_FAN_RPM; break; } @@ -3976,7 +3991,6 @@ static int nct6775_probe(struct platform_device *pdev) data->REG_IN_MINMAX[0] = NCT6775_REG_IN_MIN; data->REG_IN_MINMAX[1] = NCT6775_REG_IN_MAX; data->REG_TARGET = NCT6775_REG_TARGET; - data->REG_FAN = NCT6779_REG_FAN; data->REG_FAN_MODE = NCT6775_REG_FAN_MODE; data->REG_FAN_MIN = NCT6776_REG_FAN_MIN; data->REG_FAN_PULSES = NCT6779_REG_FAN_PULSES;