From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3357373-1521479848-2-13028363327380197104 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES rocaen, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1521479847; b=ZcphvhXMPzkA1NyclS36IgQ58860XJy7IdCgrBKyqmQnZFK bdNkznIlcBVJueSAln3xxE+S8h8/PLZM++YaOy86zH9rvelrs6Ak+8LJwBMXJcPf qrKaNki2zmm078MfWKTU81t7OCgAvJS62XjniR3SgtZd9V1f4lyMpK4GFeLYpkYY ktiw013BkP3Na6FBYH3m3I05jgSJy5zAybW7U8RuabDLr8k8UvRqtIzbsepWmoHw 29VrzvCraA8j5/3qYJivi5LOLyD9b49CGy9vn7bTQuwSiqOzmon+mI4VR+WFynxU 3XpXwy5hIW9a8KSY5CkHp53dAhBnkeQ6E/t/UnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1521479847; bh=LjQdGe HufexL/2fxsCOVXEzoOQwTt+SKkv9dvHCfsp8=; b=CndVRcBDdaYkwG+wQF3Xoy H/oryfOXNAzw9xgIocGnsjFgMUf4mqze3POrzZuA54hR7HejTNBwLr5/t4Om2RYU OKxykSdqWgpTXez7rAv0MI3EREG7Vdai14OBT41isdcT7WDRZb82vFpXuFEaBYdN Zz5ABfxVWE0wkiK34EAfZ1y7399HR5xcdEbdvggQk0qqHbwEFqt4chMtCkoGk+bP tOUz/EmRHEdnRli4VdnvcF7nhN/VeOREXoY20BnQazpZkeiaEJy910GybYPxXWhO ZAK71V7jZ2emcZRR5pF6OVAJtQqoIRqsSn0fzi9XQc1lFYxSCkfHcCbnDcYcY3Pw == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=OATWTcdA x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-category=clean score=-100 state=0 spamcause=gggruggvucftvghtrhhoucdtuddrgedtgedrudefgdelkeculddtuddrgedtfedrtddtmdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfhrghsthforghilhenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufhtfffkfhgjihgtgfggshhpjeesthhqredttddtudenucfhrhhomhepufgrshhhrgcunfgvvhhinhcuoeetlhgvgigrnhguvghrrdfnvghvihhnsehmihgtrhhoshhofhhtrdgtohhmqeenucfkphepvddtledrudefvddrudektddrieejpdehvddrudeikedrheegrddvhedvpdhfvgektdemmeefugelsgemjeelvgejmeelgegvsgemheguiedvnecurfgrrhgrmhepihhnvghtpedvtdelrddufedvrddukedtrdeijedphhgvlhhopehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhmrghilhhfrhhomhepoehsthgrsghlvgdqohifnhgvrhesvhhgvghrrdhkvghrnhgvlhdrohhrghequceuqfffjgepkeeukffvoffkoffgucfukfgkgfepuddvheeiudenucevlhhushhtvghrufhiiigvpedt; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=OATWTcdA x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-category=clean score=-100 state=0 spamcause=gggruggvucftvghtrhhoucdtuddrgedtgedrudefgdelkeculddtuddrgedtfedrtddtmdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfhrghsthforghilhenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufhtfffkfhgjihgtgfggshhpjeesthhqredttddtudenucfhrhhomhepufgrshhhrgcunfgvvhhinhcuoeetlhgvgigrnhguvghrrdfnvghvihhnsehmihgtrhhoshhofhhtrdgtohhmqeenucfkphepvddtledrudefvddrudektddrieejpdehvddrudeikedrheegrddvhedvpdhfvgektdemmeefugelsgemjeelvgejmeelgegvsgemheguiedvnecurfgrrhgrmhepihhnvghtpedvtdelrddufedvrddukedtrdeijedphhgvlhhopehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhmrghilhhfrhhomhepoehsthgrsghlvgdqohifnhgvrhesvhhgvghrrdhkvghrnhgvlhdrohhrghequceuqfffjgepkeeukffvoffkoffgucfukfgkgfepuddvheeiudenucevlhhushhtvghrufhiiigvpedt; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966531AbeCSQJy (ORCPT ); Mon, 19 Mar 2018 12:09:54 -0400 Received: from mail-sn1nam01on0111.outbound.protection.outlook.com ([104.47.32.111]:20373 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966439AbeCSQJS (ORCPT ); Mon, 19 Mar 2018 12:09:18 -0400 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Maciej Purski , Guenter Roeck , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 087/167] hwmon: (ina2xx) Make calibration register value fixed Thread-Topic: [PATCH AUTOSEL for 4.4 087/167] hwmon: (ina2xx) Make calibration register value fixed Thread-Index: AQHTv5xWe2CZS6UrukiUlIDSmVlJQQ== Date: Mon, 19 Mar 2018 16:07:11 +0000 Message-ID: <20180319160513.16384-87-alexander.levin@microsoft.com> References: <20180319160513.16384-1-alexander.levin@microsoft.com> In-Reply-To: <20180319160513.16384-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB0902;7:2+pDMLIFmTnJ+mEzTOKoNd9+OSMjQkLzzfqE2FdgcdGElrfg/cd9foOHg8EJ7u4ZNe8IGJgEInN+zkHdG2uqI/QT8csoX+phmAaajNAFacjN2LmieH8d4Up1C1dGr7bifwnIppXe5mm3uOytf7XS0wbk4RLFvj3EZ1KGheogCOPEebCtKr0mK+4bcHjh3orbWPR/Vp5xvF1MAwz3wWgEjQiKXApo9RIfYn4GFjbPXjcwKKDM2KjharPuL76URRjM;20:uB5KjaxhI+smw1LrZrOVy1LxbZUW8dGvBnMNcHWnMjX13ybUOkVWCqu7B97UG19p/YO4JQJhHpyqwZOklM+l+nGab1OcxLd2Mp3MUjzoThNLnMSdL9yp8ie02OyiuqetoGFLzT30+31fTJCUzmOAkTqzgoY19T6ksxZXp4nK7BM= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: ef45f6ca-804b-45b0-b6c3-08d58db3be75 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB0902; x-ms-traffictypediagnostic: DM5PR2101MB0902: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(7411616537696); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501300)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011);SRVR:DM5PR2101MB0902;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0902; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(366004)(39860400002)(396003)(39380400002)(376002)(199004)(189003)(4326008)(305945005)(7736002)(66066001)(105586002)(316002)(8676002)(25786009)(8936002)(6666003)(2950100002)(5660300001)(97736004)(81166006)(81156014)(3280700002)(22452003)(99286004)(186003)(2906002)(76176011)(5250100002)(59450400001)(54906003)(10090500001)(110136005)(6116002)(2900100001)(3846002)(2501003)(1076002)(86612001)(107886003)(106356001)(6436002)(6512007)(86362001)(53936002)(6506007)(6486002)(26005)(14454004)(10290500003)(102836004)(68736007)(3660700001)(478600001)(72206003)(36756003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0902;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; x-microsoft-antispam-message-info: k86chU+zsq9yEARUuN655P9idE2U3GUWOxNFw8gn9GIqv8fyWuTvx5nUKcYoWHHWeidDBhzJ7NeNsbl7BlJSffzTT8AqD64BXsrTWyr63IyTCmhLcZzt0BVX6bAFZcDnng4b49SJtOiCU0SAW7A+DXLuxKcZGjeKOepvdS5DH9svL4vBJx6FFQYT93YwaWoeAGytY2vrUEUSzZ1BRcGlgWo5GA/1ywfZF+FvHeLXCR/XRadPu+F2IqXeFccs+tQs4kjfwGXVRhsR8lOWgM23bYCaLdB3aFlrmWBpM0JagRfkmC6EuquYp8E+RD0n3uOapsEN75jKFnRGZfpqR9zcDg== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef45f6ca-804b-45b0-b6c3-08d58db3be75 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:07:11.2476 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0902 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Maciej Purski [ Upstream commit 5d389b125186cf254ad5b8015763ac07c151aea4 ] Calibration register is used for calculating current register in hardware according to datasheet: current =3D shunt_volt * calib_register / 2048 (ina 226) current =3D shunt_volt * calib_register / 4096 (ina 219) Fix calib_register value to 2048 for ina226 and 4096 for ina 219 in order to avoid truncation error and provide best precision allowed by shunt_voltage measurement. Make current scale value follow changes of shunt_resistor from sysfs as calib_register value is now fixed. Power_lsb value should also follow shunt_resistor changes as stated in datasheet: power_lsb =3D 25 * current_lsb (ina 226) power_lsb =3D 20 * current_lsb (ina 219) Signed-off-by: Maciej Purski Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/hwmon/ina2xx.c | 87 +++++++++++++++++++++++++++++-----------------= ---- 1 file changed, 50 insertions(+), 37 deletions(-) diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c index b24f1d3045f0..a629f7c130f0 100644 --- a/drivers/hwmon/ina2xx.c +++ b/drivers/hwmon/ina2xx.c @@ -94,18 +94,20 @@ enum ina2xx_ids { ina219, ina226 }; =20 struct ina2xx_config { u16 config_default; - int calibration_factor; + int calibration_value; int registers; int shunt_div; int bus_voltage_shift; int bus_voltage_lsb; /* uV */ - int power_lsb; /* uW */ + int power_lsb_factor; }; =20 struct ina2xx_data { const struct ina2xx_config *config; =20 long rshunt; + long current_lsb_uA; + long power_lsb_uW; struct mutex config_lock; struct regmap *regmap; =20 @@ -115,21 +117,21 @@ struct ina2xx_data { static const struct ina2xx_config ina2xx_config[] =3D { [ina219] =3D { .config_default =3D INA219_CONFIG_DEFAULT, - .calibration_factor =3D 40960000, + .calibration_value =3D 4096, .registers =3D INA219_REGISTERS, .shunt_div =3D 100, .bus_voltage_shift =3D 3, .bus_voltage_lsb =3D 4000, - .power_lsb =3D 20000, + .power_lsb_factor =3D 20, }, [ina226] =3D { .config_default =3D INA226_CONFIG_DEFAULT, - .calibration_factor =3D 5120000, + .calibration_value =3D 2048, .registers =3D INA226_REGISTERS, .shunt_div =3D 400, .bus_voltage_shift =3D 0, .bus_voltage_lsb =3D 1250, - .power_lsb =3D 25000, + .power_lsb_factor =3D 25, }, }; =20 @@ -168,12 +170,16 @@ static u16 ina226_interval_to_reg(int interval) return INA226_SHIFT_AVG(avg_bits); } =20 +/* + * Calibration register is set to the best value, which eliminates + * truncation errors on calculating current register in hardware. + * According to datasheet (eq. 3) the best values are 2048 for + * ina226 and 4096 for ina219. They are hardcoded as calibration_value. + */ static int ina2xx_calibrate(struct ina2xx_data *data) { - u16 val =3D DIV_ROUND_CLOSEST(data->config->calibration_factor, - data->rshunt); - - return regmap_write(data->regmap, INA2XX_CALIBRATION, val); + return regmap_write(data->regmap, INA2XX_CALIBRATION, + data->config->calibration_value); } =20 /* @@ -186,10 +192,6 @@ static int ina2xx_init(struct ina2xx_data *data) if (ret < 0) return ret; =20 - /* - * Set current LSB to 1mA, shunt is in uOhms - * (equation 13 in datasheet). - */ return ina2xx_calibrate(data); } =20 @@ -267,15 +269,15 @@ static int ina2xx_get_value(struct ina2xx_data *data,= u8 reg, val =3D DIV_ROUND_CLOSEST(val, 1000); break; case INA2XX_POWER: - val =3D regval * data->config->power_lsb; + val =3D regval * data->power_lsb_uW; break; case INA2XX_CURRENT: - /* signed register, LSB=3D1mA (selected), in mA */ - val =3D (s16)regval; + /* signed register, result in mA */ + val =3D regval * data->current_lsb_uA; + val =3D DIV_ROUND_CLOSEST(val, 1000); break; case INA2XX_CALIBRATION: - val =3D DIV_ROUND_CLOSEST(data->config->calibration_factor, - regval); + val =3D regval; break; default: /* programmer goofed */ @@ -303,9 +305,32 @@ static ssize_t ina2xx_show_value(struct device *dev, ina2xx_get_value(data, attr->index, regval)); } =20 -static ssize_t ina2xx_set_shunt(struct device *dev, - struct device_attribute *da, - const char *buf, size_t count) +/* + * In order to keep calibration register value fixed, the product + * of current_lsb and shunt_resistor should also be fixed and equal + * to shunt_voltage_lsb =3D 1 / shunt_div multiplied by 10^9 in order + * to keep the scale. + */ +static int ina2xx_set_shunt(struct ina2xx_data *data, long val) +{ + unsigned int dividend =3D DIV_ROUND_CLOSEST(1000000000, + data->config->shunt_div); + if (val <=3D 0 || val > dividend) + return -EINVAL; + + mutex_lock(&data->config_lock); + data->rshunt =3D val; + data->current_lsb_uA =3D DIV_ROUND_CLOSEST(dividend, val); + data->power_lsb_uW =3D data->config->power_lsb_factor * + data->current_lsb_uA; + mutex_unlock(&data->config_lock); + + return 0; +} + +static ssize_t ina2xx_store_shunt(struct device *dev, + struct device_attribute *da, + const char *buf, size_t count) { unsigned long val; int status; @@ -315,18 +340,9 @@ static ssize_t ina2xx_set_shunt(struct device *dev, if (status < 0) return status; =20 - if (val =3D=3D 0 || - /* Values greater than the calibration factor make no sense. */ - val > data->config->calibration_factor) - return -EINVAL; - - mutex_lock(&data->config_lock); - data->rshunt =3D val; - status =3D ina2xx_calibrate(data); - mutex_unlock(&data->config_lock); + status =3D ina2xx_set_shunt(data, val); if (status < 0) return status; - return count; } =20 @@ -386,7 +402,7 @@ static SENSOR_DEVICE_ATTR(power1_input, S_IRUGO, ina2xx= _show_value, NULL, =20 /* shunt resistance */ static SENSOR_DEVICE_ATTR(shunt_resistor, S_IRUGO | S_IWUSR, - ina2xx_show_value, ina2xx_set_shunt, + ina2xx_show_value, ina2xx_store_shunt, INA2XX_CALIBRATION); =20 /* update interval (ina226 only) */ @@ -441,10 +457,7 @@ static int ina2xx_probe(struct i2c_client *client, val =3D INA2XX_RSHUNT_DEFAULT; } =20 - if (val <=3D 0 || val > data->config->calibration_factor) - return -ENODEV; - - data->rshunt =3D val; + ina2xx_set_shunt(data, val); =20 ina2xx_regmap_config.max_register =3D data->config->registers; =20 --=20 2.14.1