Skip to contentSkip to conversation

iio: sx9310: Fix semtech,avg-pos-strength setting when > 16

PATCH In review Stephen Boyd 3 participants 4 messages Dec 2, 2020 – Jan 14, 2021 IIO

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 iio: sx9310: Fix semtech,avg-pos-strength setting when > 16

This DT property can be 0, 16, and then 64, but not 32. The math here doesn't recognize this slight bump in the power of 2 numbers and translates a DT property of 64 into the register value '3' when it really should be '2'. Fix it by subtracting one more if the number being translated is larger than 31. Also use clamp() because we're here.

Cc Daniel Campello <[email protected]>
Cc Lars-Peter Clausen <[email protected]>
Cc Peter Meerwald-Stadler <[email protected]>
Cc Douglas Anderson <[email protected]>
Cc Gwendal Grignou <[email protected]>
Cc Evan Green <[email protected]>

---

Changes from v2 (https://lore.kernel.org/r/[email protected]):
* Use clamp()
* Add comment to clarify

Changes from v1 (https://lore.kernel.org/r/[email protected]):
* Changed ternary to consider 17 to 31 as the same as 16

 drivers/iio/proximity/sx9310.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iio/proximity/sx9310.c +2 -1
index a2f820997afc..0e6863e4d384 100644
@@ -1305,7 +1305,8 @@ sx9310_get_default_reg(struct sx9310_data *data, int i,
 		if (ret)
 			break;
 
-		pos = min(max(ilog2(pos), 3), 10) - 3;
+		/* Powers of 2, except for a gap between 16 and 64 */
+		pos = clamp(ilog2(pos), 3, 11) - (pos >= 32 ? 4 : 3);
 		reg_def->def &= ~SX9310_REG_PROX_CTRL7_AVGPOSFILT_MASK;
 		reg_def->def |= FIELD_PREP(SX9310_REG_PROX_CTRL7_AVGPOSFILT_MASK,
 					   pos);

base-commit: 5b19ca2c78a0838976064c0347e46a2c859b541d

Signature · 1 line
https://chromeos.dev
Reviewed-by on v3 1/1
#1 lore raw

Hi,

Quoted 20 lines · Stephen Boyd

This DT property can be 0, 16, and then 64, but not 32. The math here doesn't recognize this slight bump in the power of 2 numbers and translates a DT property of 64 into the register value '3' when it really should be '2'. Fix it by subtracting one more if the number being translated is larger than 31. Also use clamp() because we're here.

Cc Daniel Campello <[email protected]>
Cc Lars-Peter Clausen <[email protected]>
Cc Peter Meerwald-Stadler <[email protected]>
Cc Douglas Anderson <[email protected]>
Cc Gwendal Grignou <[email protected]>
Cc Evan Green <[email protected]>

---

Changes from v2 (https://lore.kernel.org/r/[email protected]):
* Use clamp()
* Add comment to clarify

Quoted 5 lines

Changes from v1 (https://lore.kernel.org/r/[email protected]):
* Changed ternary to consider 17 to 31 as the same as 16

 drivers/iio/proximity/sx9310.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
#2 lore raw
In reply to Stephen Boyd

Quoting Stephen Boyd (2020-12-02 12:02:52)

Quoted 6 lines

This DT property can be 0, 16, and then 64, but not 32. The math here doesn't recognize this slight bump in the power of 2 numbers and translates a DT property of 64 into the register value '3' when it really should be '2'. Fix it by subtracting one more if the number being translated is larger than 31. Also use clamp() because we're here.

Quoted 8 lines
Cc Daniel Campello <[email protected]>
Cc Lars-Peter Clausen <[email protected]>
Cc Peter Meerwald-Stadler <[email protected]>
Cc Douglas Anderson <[email protected]>
Cc Gwendal Grignou <[email protected]>
Cc Evan Green <[email protected]>

---

Hi Jonathan,

Happy new year! Can this be picked up? Or should I resend?

Quoted 27 lines

Changes from v2 (https://lore.kernel.org/r/[email protected]):
* Use clamp()
* Add comment to clarify

Changes from v1 (https://lore.kernel.org/r/[email protected]):
* Changed ternary to consider 17 to 31 as the same as 16

 drivers/iio/proximity/sx9310.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iio/proximity/sx9310.c +2 -1
index a2f820997afc..0e6863e4d384 100644
@@ -1305,7 +1305,8 @@ sx9310_get_default_reg(struct sx9310_data *data, int i,
                if (ret)
                        break;
 
-               pos = min(max(ilog2(pos), 3), 10) - 3;
+               /* Powers of 2, except for a gap between 16 and 64 */
+               pos = clamp(ilog2(pos), 3, 11) - (pos >= 32 ? 4 : 3);
                reg_def->def &= ~SX9310_REG_PROX_CTRL7_AVGPOSFILT_MASK;
                reg_def->def |= FIELD_PREP(SX9310_REG_PROX_CTRL7_AVGPOSFILT_MASK,
                                           pos);

base-commit: 5b19ca2c78a0838976064c0347e46a2c859b541d

maintainer
#3 lore raw
Quoted 16 lines · On Mon, 11 Jan 2021 11:06:41 -0800 Stephen Boyd <[email protected]> wrote:

Quoting Stephen Boyd (2020-12-02 12:02:52)

Quoted 6 lines

This DT property can be 0, 16, and then 64, but not 32. The math here doesn't recognize this slight bump in the power of 2 numbers and translates a DT property of 64 into the register value '3' when it really should be '2'. Fix it by subtracting one more if the number being translated is larger than 31. Also use clamp() because we're here.

Quoted 8 lines
Cc Daniel Campello <[email protected]>
Cc Lars-Peter Clausen <[email protected]>
Cc Peter Meerwald-Stadler <[email protected]>
Cc Douglas Anderson <[email protected]>
Cc Gwendal Grignou <[email protected]>
Cc Evan Green <[email protected]>

---

Quoted 3 lines

Hi Jonathan,

Happy new year! Can this be picked up? Or should I resend?

Happy new year to you as well!

Oops. Sorry - I lost this one somehow.

Anyhow, now applied and it's the pull request I just sent out.

Jonathan

Quoted 28 lines
Quoted 28 lines

Changes from v2 (https://lore.kernel.org/r/[email protected]):
* Use clamp()
* Add comment to clarify

Changes from v1 (https://lore.kernel.org/r/[email protected]):
* Changed ternary to consider 17 to 31 as the same as 16

 drivers/iio/proximity/sx9310.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iio/proximity/sx9310.c +2 -1
index a2f820997afc..0e6863e4d384 100644
@@ -1305,7 +1305,8 @@ sx9310_get_default_reg(struct sx9310_data *data, int i,
                if (ret)
                        break;
 
-               pos = min(max(ilog2(pos), 3), 10) - 3;
+               /* Powers of 2, except for a gap between 16 and 64 */
+               pos = clamp(ilog2(pos), 3, 11) - (pos >= 32 ? 4 : 3);
                reg_def->def &= ~SX9310_REG_PROX_CTRL7_AVGPOSFILT_MASK;
                reg_def->def |= FIELD_PREP(SX9310_REG_PROX_CTRL7_AVGPOSFILT_MASK,
                                           pos);

base-commit: 5b19ca2c78a0838976064c0347e46a2c859b541d