Skip to contentSkip to conversation

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

PATCH Superseded Stephen Boyd 3 participants 5 messages Nov 20, 2020 – Dec 2, 2020 IIO

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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 16.

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 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/proximity/sx9310.c +1 -1
index a2f820997afc..ee1b4ff05a37 100644
@@ -1305,7 +1305,7 @@ sx9310_get_default_reg(struct sx9310_data *data, int i,
 		if (ret)
 			break;
 
-		pos = min(max(ilog2(pos), 3), 10) - 3;
+		pos = min(max(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 v2 1/1
#1 lore raw

Hi,

Quoted 14 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 16.

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 7 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
maintainer
#2 lore raw
In reply to Stephen Boyd
Quoted 26 lines · On Fri, 20 Nov 2020 10:29:44 -0800 Stephen Boyd <[email protected]> wrote:

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 16.

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 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/proximity/sx9310.c +0 -0
index a2f820997afc..ee1b4ff05a37 100644

drivers/iio/proximity/sx9310.c sx9310_get_default_reg(struct sx9310_data *data, int i, · line 1308

Quoted 5 lines
drivers/iio/proximity/sx9310.c +1 -1
@@ -1305,7 +1305,7 @@ sx9310_get_default_reg(struct sx9310_data *data, int i,
 		if (ret)
 			break;
 
-		pos = min(max(ilog2(pos), 3), 10) - 3;
+		pos = min(max(ilog2(pos), 3), 11) - (pos >= 32 ? 4 : 3);

Given this is now rather tricky to read, I'd just do an explicit lookup of the allowed values. Probably just a switch statement.

Thanks,

Jonathan

Quoted 5 lines
drivers/iio/proximity/sx9310.c +0 -0
 		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 32 lines · On Sat, 21 Nov 2020 14:58:49 +0000 Jonathan Cameron <[email protected]> wrote:
Quoted 29 lines · On Fri, 20 Nov 2020 10:29:44 -0800 Stephen Boyd <[email protected]> wrote:

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 16.

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 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/proximity/sx9310.c +0 -0
index a2f820997afc..ee1b4ff05a37 100644
@@ -1305,7 +1305,7 @@ sx9310_get_default_reg(struct sx9310_data *data, int i,
 		if (ret)
 			break;
 
Quoted 5 lines

drivers/iio/proximity/sx9310.c sx9310_get_default_reg(struct sx9310_data *data, int i, · line 1308

Quoted 2 lines
drivers/iio/proximity/sx9310.c +1 -1
-		pos = min(max(ilog2(pos), 3), 10) - 3;
+		pos = min(max(ilog2(pos), 3), 11) - (pos >= 32 ? 4 : 3);  

Given this is now rather tricky to read, I'd just do an explicit lookup of the allowed values. Probably just a switch statement.

As an alternative, a comment would help saying that it's powers of 2 except for a gap at 64.

Thanks,

J

Quoted 11 lines

Thanks,

Jonathan

Quoted 5 lines
drivers/iio/proximity/sx9310.c +0 -0
 		reg_def->def &= ~SX9310_REG_PROX_CTRL7_AVGPOSFILT_MASK;
 		reg_def->def |= FIELD_PREP(SX9310_REG_PROX_CTRL7_AVGPOSFILT_MASK,
 					   pos);

base-commit: 5b19ca2c78a0838976064c0347e46a2c859b541d

#4 lore raw

Quoting Jonathan Cameron (2020-11-21 07:02:45)

Quoted 13 lines
Quoted 10 lines · On Sat, 21 Nov 2020 14:58:49 +0000 Jonathan Cameron <[email protected]> wrote:
Quoted 8 lines · On Fri, 20 Nov 2020 10:29:44 -0800 Stephen Boyd <[email protected]> wrote:
drivers/iio/proximity/sx9310.c +0 -0
index a2f820997afc..ee1b4ff05a37 100644
@@ -1305,7 +1305,7 @@ sx9310_get_default_reg(struct sx9310_data *data, int i,
            if (ret)
                    break;
 
Quoted 8 lines
Quoted 5 lines

drivers/iio/proximity/sx9310.c sx9310_get_default_reg(struct sx9310_data *data, int i, · line 1308

Quoted 2 lines
drivers/iio/proximity/sx9310.c +1 -1
-           pos = min(max(ilog2(pos), 3), 10) - 3;
+           pos = min(max(ilog2(pos), 3), 11) - (pos >= 32 ? 4 : 3);  

Given this is now rather tricky to read, I'd just do an explicit lookup of the allowed values. Probably just a switch statement.

As an alternative, a comment would help saying that it's powers of 2 except for a gap at 64.

Ok. I'll update with a comment.