Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
CC:     Maciej Purski <m.purski@samsung.com>,
        Guenter Roeck <linux@roeck-us.net>,
        Sasha Levin <Alexander.Levin@microsoft.com>
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
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
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: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Maciej Purski <m.purski@samsung.com>

[ 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 <m.purski@samsung.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 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