iio:frequency:adf4377: Fix duplicated soft reset mask
Subsystems (3)
PATCH v3 1/1 iio:frequency:adf4377: Fix duplicated soft reset mask
The regmap_read_poll_timeout() uses ADF4377_0000_SOFT_RESET_R_MSK twice instead of checking both SOFT_RESET_MSK (bit 0) and SOFT_RESET_R_MSK (bit 7). This causes an incomplete reset status check.
The code first sets both SOFT_RESET and SOFT_RESET_R bits to 1 via regmap_update_bits(), then polls for them to be cleared. Since we set both bits before polling, we should be waiting for both to clear.
Fix by using both masks as done in regmap_update_bits() above.
---
v3:
- Summarize discussion about why both bits need to be checked
v2:
- Add Fixes tag
drivers/iio/frequency/adf4377.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/frequency/adf4377.c +1 -1
@@ -501,7 +501,7 @@ static int adf4377_soft_reset(struct adf4377_state *st)return ret;return regmap_read_poll_timeout (st->regmap,0x0 , read_val, - !(read_val & (ADF4377_0000_SOFT_RESET_R_MSK | + !(read_val & (ADF4377_0000_SOFT_RESET_MSK |ADF4377_0000_SOFT_RESET_R_MSK )),200 ,200 *100 ); }
Signature · 1 line
2.52.0
Jonathan Cameron
maintainerQuoted 4 lines · On Sat, 24 Jan 2026 04:47:58 +0900 SeungJu Cheon <[email protected]> wrote:
The
regmap_read_poll_timeout()usesADF4377_0000_SOFT_RESET_R_MSKtwice instead of checking bothSOFT_RESET_MSK(bit 0) andSOFT_RESET_R_MSK(bit 7). This causes an incomplete reset status check.
Quoted 8 lines
The code first sets both
SOFT_RESETandSOFT_RESET_Rbits to 1 viaregmap_update_bits(), then polls for them to be cleared. Since we set both bits before polling, we should be waiting for both to clear.Fix by using both masks as done in
regmap_update_bits()above.Fixes eda549e2e524 ("iio:frequency:adf4377: add support for ADF4377")Signed-off-by SeungJu Cheon <[email protected]>
For now I've applied this to a local branch which I'll push out once I have a suitable base (release, or rc1 depending on when I do it).
Given Antoniu and Andy's involvement in earlier discussion, still plenty of time to add tags or indeed suggest I drop it again for a v4!
Thanks,
Jonathan
Quoted 23 lines
---
v3:
- Summarize discussion about why both bits need to be checkedv2:
- Add Fixes tagdrivers/iio/frequency/adf4377.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/iio/frequency/adf4377.c +1
-1@@ -501,7 +501,7 @@ static int adf4377_soft_reset(struct adf4377_state *st)return ret;return regmap_read_poll_timeout (st->regmap,0x0 , read_val, - !(read_val & (ADF4377_0000_SOFT_RESET_R_MSK | + !(read_val & (ADF4377_0000_SOFT_RESET_MSK |ADF4377_0000_SOFT_RESET_R_MSK )),200 ,200 *100 ); }