Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1837010pxb; Sat, 27 Feb 2021 01:37:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJz9THw7Lv5jpWrGgMs3U2zjgkfVxCdiDdmjRQnqP9Z653RtJHiJMHKna7pXqVIvEvyV80KZ X-Received: by 2002:a17:906:d115:: with SMTP id b21mr7226751ejz.233.1614418627701; Sat, 27 Feb 2021 01:37:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614418627; cv=none; d=google.com; s=arc-20160816; b=dsSL3OPWoByYa5z2EDZwRURxb06Z5zy9dkc7Qku0tlnKy18GkEjl7vRj9c9wy0JY1c U0sL8m+V4t9ia5+2bEvankTaIWM7pekSkGaFxOLCNW+FDs1wiuC3C9HhVKVvpVaSz8o6 iDrvynvXaLdT/LZa3pgKGUZVszPoW5MgSJRlgDuu5Hg2X8LPW/OqvrTwBSclCTu5wg0I wr8I3C0SPnWS0tG3PGPM3bRA1N5fqez0NbSdWBOVsxx3WzsroBfraNwdWIXsoSsz4+Sn fKfaLoGuzbWqaHHvCfWCx0EM7LlOUmMLFVWEuxD37lCh0Rm4qA5ux8TiTxi6sLuhTPPu LMfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-disposition :mime-version:message-id:subject:cc:to:from:date:dkim-signature; bh=Mu3AQ0P7d7cT8ezCcwJxDwQ1+wZ4e4evURY5sQ2BR2Q=; b=dmRMSpG8DF4UgJ7i/vE181NR5bDCMrLaV9+nVDCWkqxtd8jRghCUqQR65X0ldhoPlp fo/8GVWQ/ixDsqQ4zHMi+dF4voI2iHkUONurKiRYQ7hLzB2jvvfFIQ83pX7llx1ikSTs LngxYKXKbJzFojj6/dw0toDUgsQXC4m7iU+D8sRvi/yO1z8sgSX70BED945Pge23LctV qRUIMVLLmg9ENOxqiajsI9dVC3W0Vuyc/xota2Vuy59xtml5qAatXR34cGKdGrnwgga2 mjvC9IHcidAL+qJ6tuxxu7K9Ei7YpNG+1PcyEDrni7H+3OqIzZQAMp9oAfp577fMQUqp 0t4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@posteo.net header.s=2017 header.b=TXlLfeWv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=posteo.net Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z15si7922204ejr.160.2021.02.27.01.36.45; Sat, 27 Feb 2021 01:37:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@posteo.net header.s=2017 header.b=TXlLfeWv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=posteo.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230084AbhB0Jfo (ORCPT + 99 others); Sat, 27 Feb 2021 04:35:44 -0500 Received: from mout01.posteo.de ([185.67.36.65]:40753 "EHLO mout01.posteo.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229835AbhB0Jfm (ORCPT ); Sat, 27 Feb 2021 04:35:42 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id AA60C160062 for ; Sat, 27 Feb 2021 10:34:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1614418484; bh=T3uT0JzZPYyjoGWasIVLI3FyG8lnKf8d/mRQUMH5fYA=; h=Date:From:To:Cc:Subject:From; b=TXlLfeWvygYLJQFG1nO723+G4Htz2DXqYmM6NbEnJT5G4s3zr+2J484U2VfCohtBb cADH617vqTA0XF6I/3knDd4rL4FgZBkcE+Jcjru3RGxRBoqfg6mCWvur692wThg8H5 yQQwh9e4r1OLGSmziBhLUdvRN86bJ8WcaWz70bryMY8FsrYXnJNy7jbV5JJPWUPtDW V61WFBywanNH2Qh4OlPRpa8sVXfoDWEojgKmJyA6uMWOrTyEi3w3nse1vVz/ZYb3vm Fhd0BF0Qm4y28v62NaCEFs0mzDrKgbokYFz7Xz5/cWuaJwEccfIWzs2qX4MvmneazS 3xUAQrKYuXhSg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4DnhFH63bYz6tmG; Sat, 27 Feb 2021 10:34:43 +0100 (CET) Date: Sat, 27 Feb 2021 10:34:42 +0100 From: Wilken Gottwalt To: linux-kernel@vger.kernel.org Cc: Jean Delvare , Guenter Roeck , Jonathan Corbet , linux-hwmon@vger.kernel.org Subject: [PATCH] hwmon: corsair-psu: update calculation of LINEAR11 values Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Changes the way how LINEAR11 values are calculated. The new method increases the precision of 2-3 digits. old method: corsairpsu-hid-3-1 Adapter: HID adapter v_in: 230.00 V v_out +12v: 12.00 V v_out +5v: 5.00 V v_out +3.3v: 3.00 V psu fan: 0 RPM vrm temp: +44.0?C case temp: +37.0?C power total: 152.00 W power +12v: 112.00 W power +5v: 38.00 W power +3.3v: 5.00 W curr in: N/A curr +12v: 9.00 A curr +5v: 7.00 A curr +3.3v: 1000.00 mA new method: corsairpsu-hid-3-1 Adapter: HID adapter v_in: 230.00 V v_out +12v: 12.16 V v_out +5v: 5.01 V v_out +3.3v: 3.30 V psu fan: 0 RPM vrm temp: +44.5?C case temp: +37.8?C power total: 148.00 W power +12v: 108.00 W power +5v: 37.00 W power +3.3v: 4.50 W curr in: N/A curr +12v: 9.25 A curr +5v: 7.50 A curr +3.3v: 1.50 A Co-developed-by: Jack Doan Signed-off-by: Jack Doan Signed-off-by: Wilken Gottwalt --- drivers/hwmon/corsair-psu.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/drivers/hwmon/corsair-psu.c b/drivers/hwmon/corsair-psu.c index 99494056f4bd..b0953eeeb2d3 100644 --- a/drivers/hwmon/corsair-psu.c +++ b/drivers/hwmon/corsair-psu.c @@ -119,27 +119,13 @@ struct corsairpsu_data { }; /* some values are SMBus LINEAR11 data which need a conversion */ -static int corsairpsu_linear11_to_int(const int val) +static int corsairpsu_linear11_to_int(const u16 val, const int scale) { - int exp = (val & 0xFFFF) >> 0x0B; - int mant = val & 0x7FF; - int i; - - if (exp > 0x0F) - exp -= 0x20; - if (mant > 0x3FF) - mant -= 0x800; - if ((mant & 0x01) == 1) - ++mant; - if (exp < 0) { - for (i = 0; i < -exp; ++i) - mant /= 2; - } else { - for (i = 0; i < exp; ++i) - mant *= 2; - } + const int exp = ((s16)val) >> 11; + const int mant = (((s16)(val & 0x7ff)) << 5) >> 5; + const int result = mant * scale; - return mant; + return (exp >= 0) ? (result << exp) : (result >> -exp); } static int corsairpsu_usb_cmd(struct corsairpsu_data *priv, u8 p0, u8 p1, u8 p2, void *data) @@ -249,14 +235,14 @@ static int corsairpsu_get_value(struct corsairpsu_data *priv, u8 cmd, u8 rail, l case PSU_CMD_RAIL_AMPS: case PSU_CMD_TEMP0: case PSU_CMD_TEMP1: - *val = corsairpsu_linear11_to_int(tmp & 0xFFFF) * 1000; + *val = corsairpsu_linear11_to_int(tmp & 0xFFFF, 1000); break; case PSU_CMD_FAN: - *val = corsairpsu_linear11_to_int(tmp & 0xFFFF); + *val = corsairpsu_linear11_to_int(tmp & 0xFFFF, 1); break; case PSU_CMD_RAIL_WATTS: case PSU_CMD_TOTAL_WATTS: - *val = corsairpsu_linear11_to_int(tmp & 0xFFFF) * 1000000; + *val = corsairpsu_linear11_to_int(tmp & 0xFFFF, 1000000); break; case PSU_CMD_TOTAL_UPTIME: case PSU_CMD_UPTIME: -- 2.30.1