regulator: qcom_spmi: Include offset when translating voltages
authorStephen Boyd <sboyd@codeaurora.org>
Thu, 2 Nov 2017 05:06:19 +0000 (22:06 -0700)
committerMark Brown <broonie@kernel.org>
Thu, 2 Nov 2017 16:11:28 +0000 (16:11 +0000)
This driver converts voltages from a non-linear range in hardware
to a linear range in software and vice versa. During the
conversion, we exclude certain voltages that are invalid to use
because the software interface is more flexible than reality.

For example, the FTSMPS2P5 regulators have a voltage range from
80000uV to 1355000uV that software could support, but we only
want to use the range of 350000uV to 1355000uV. If we don't
account for the hw selectors between 80000uV and 350000uV we'll
pick a hw selector of 0 to mean 350000uV when it really means
80000uV. This can cause us to program voltages into the hardware
that are significantly lower than what we're expecting.

And when we read it back from the hardware we'll have the same
problem, voltages that are in the invalid band will end up being
calculated as some software selector that represents a larger
voltage than what is programmed and the user will be confused.

Fix all this by properly offsetting the software selector and hw
selector when converting from one number space to another.

Fixes: 1b5b19689278 ("regulator: qcom_spmi: Only use selector based regulator ops")
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/qcom_spmi-regulator.c

index 16c5f84e06a7590cac829f611f5d712baaab0a44..c372b244f3dac03ea771929c1b9aeb5e87fbffb1 100644 (file)
@@ -593,13 +593,20 @@ static int spmi_sw_selector_to_hw(struct spmi_regulator *vreg,
                                  u8 *voltage_sel)
 {
        const struct spmi_voltage_range *range, *end;
                                  u8 *voltage_sel)
 {
        const struct spmi_voltage_range *range, *end;
+       unsigned offset;
 
        range = vreg->set_points->range;
        end = range + vreg->set_points->count;
 
        for (; range < end; range++) {
                if (selector < range->n_voltages) {
 
        range = vreg->set_points->range;
        end = range + vreg->set_points->count;
 
        for (; range < end; range++) {
                if (selector < range->n_voltages) {
-                       *voltage_sel = selector;
+                       /*
+                        * hardware selectors between set point min and real
+                        * min are invalid so we ignore them
+                        */
+                       offset = range->set_point_min_uV - range->min_uV;
+                       offset /= range->step_uV;
+                       *voltage_sel = selector + offset;
                        *range_sel = range->range_sel;
                        return 0;
                }
                        *range_sel = range->range_sel;
                        return 0;
                }
@@ -613,15 +620,35 @@ static int spmi_sw_selector_to_hw(struct spmi_regulator *vreg,
 static int spmi_hw_selector_to_sw(struct spmi_regulator *vreg, u8 hw_sel,
                                  const struct spmi_voltage_range *range)
 {
 static int spmi_hw_selector_to_sw(struct spmi_regulator *vreg, u8 hw_sel,
                                  const struct spmi_voltage_range *range)
 {
-       int sw_sel = hw_sel;
+       unsigned sw_sel = 0;
+       unsigned offset, max_hw_sel;
        const struct spmi_voltage_range *r = vreg->set_points->range;
        const struct spmi_voltage_range *r = vreg->set_points->range;
-
-       while (r != range) {
+       const struct spmi_voltage_range *end = r + vreg->set_points->count;
+
+       for (; r < end; r++) {
+               if (r == range && range->n_voltages) {
+                       /*
+                        * hardware selectors between set point min and real
+                        * min and between set point max and real max are
+                        * invalid so we return an error if they're
+                        * programmed into the hardware
+                        */
+                       offset = range->set_point_min_uV - range->min_uV;
+                       offset /= range->step_uV;
+                       if (hw_sel < offset)
+                               return -EINVAL;
+
+                       max_hw_sel = range->set_point_max_uV - range->min_uV;
+                       max_hw_sel /= range->step_uV;
+                       if (hw_sel > max_hw_sel)
+                               return -EINVAL;
+
+                       return sw_sel + hw_sel - offset;
+               }
                sw_sel += r->n_voltages;
                sw_sel += r->n_voltages;
-               r++;
        }
 
        }
 
-       return sw_sel;
+       return -EINVAL;
 }
 
 static const struct spmi_voltage_range *
 }
 
 static const struct spmi_voltage_range *