linux-kernel - [PATCH RFT] regulator: pfuze100: Fix n_voltages setting for SW2~SW4 with high bit set

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 30 Jul 2013 10:46:28 +0800
From:	Axel Lin <axel.lin@...ics.com>
To:	Mark Brown <broonie@...nel.org>
Cc:	Robin Gong <b38343@...escale.com>,
	Liam Girdwood <lgirdwood@...il.com>,
	linux-kernel@...r.kernel.org
Subject: [PATCH RFT] regulator: pfuze100: Fix n_voltages setting for SW2~SW4
 with high bit set

Current code adjust min_uV and uV_step but missed adjusting the n_voltages
setting.

When BIT6 is clear:
        n_voltages = (1975000 - 400000) / 25000 + 1 = 64
When BIT6 is set:
        n_voltages = (3300000 - 800000) / 50000 + 1 = 51

The n_voltages needs update because when BIT6 is set 0x73 ~ 0x7f are reserved.
When using regulator_list_voltage_linear, the n_voltages does matter here
because wrong n_voltages setting make the equation return wrong result.
e.g. if selector is 63, regulator_list_voltage_linear returns
     800000 + (50000 * 63) = 4000000
     It should return -EINVAL if the selector is in the range of 51 ~ 63.

Signed-off-by: Axel Lin <axel.lin@...ics.com>
---
 drivers/regulator/pfuze100-regulator.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c
index 2dadc31..a77379b 100644
--- a/drivers/regulator/pfuze100-regulator.c
+++ b/drivers/regulator/pfuze100-regulator.c
@@ -387,8 +387,11 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
 
 	for (i = 0; i < PFUZE100_MAX_REGULATOR; i++) {
 		struct regulator_init_data *init_data;
+		struct regulator_desc *desc;
 		int val;
 
+		desc = &pfuze_chip->regulator_descs[i].desc;
+
 		if (pdata)
 			init_data = pdata->init_data[i];
 		else
@@ -396,13 +399,11 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
 
 		/* SW2~SW4 high bit check and modify the voltage value table */
 		if (i > PFUZE100_SW1C && i < PFUZE100_SWBST) {
-			regmap_read(pfuze_chip->regmap, PFUZE100_SW2VOL +
-					(i - PFUZE100_SW2) * 7, &val);
+			regmap_read(pfuze_chip->regmap, desc->vsel_reg, &val);
 			if (val & 0x40) {
-				pfuze_chip->regulator_descs[i].desc.min_uV
-				= 800000;
-				pfuze_chip->regulator_descs[i].desc.uV_step
-				= 50000;
+				desc->min_uV = 800000;
+				desc->uV_step = 50000;
+				desc->n_voltages = 51;
 			}
 		}
 
@@ -411,8 +412,7 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
 		config.driver_data = pfuze_chip;
 		config.of_node = match_of_node(i);
 
-		pfuze_chip->regulators[i] = regulator_register(&pfuze_chip
-			->regulator_descs[i].desc, &config);
+		pfuze_chip->regulators[i] = regulator_register(desc, &config);
 		if (IS_ERR(pfuze_chip->regulators[i])) {
 			dev_err(&client->dev, "register regulator%s failed\n",
 				pfuze100_regulators[i].desc.name);
-- 
1.8.1.2



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/