| Message ID | 20230210224332.98482-1-avolmat@me.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | reset: sti: rely on regmap_field_read_poll_timeout for ack wait | expand |
Hi Alain On 2/10/23 23:43, Alain Volmat wrote: > Use regmap_field_read_poll_timeout function when waiting for the > ack bit upon performing the reset control. > > Signed-off-by: Alain Volmat <avolmat@me.com> > --- > drivers/reset/sti/reset-syscfg.c | 18 ++++-------------- > 1 file changed, 4 insertions(+), 14 deletions(-) > > diff --git a/drivers/reset/sti/reset-syscfg.c b/drivers/reset/sti/reset-syscfg.c > index b4b46e0f207e..c1ba04f6f155 100644 > --- a/drivers/reset/sti/reset-syscfg.c > +++ b/drivers/reset/sti/reset-syscfg.c > @@ -64,22 +64,12 @@ static int syscfg_reset_program_hw(struct reset_controller_dev *rcdev, > return err; > > if (ch->ack) { > - unsigned long timeout = jiffies + msecs_to_jiffies(1000); > u32 ack_val; > > - while (true) { > - err = regmap_field_read(ch->ack, &ack_val); > - if (err) > - return err; > - > - if (ack_val == ctrl_val) > - break; > - > - if (time_after(jiffies, timeout)) > - return -ETIME; > - > - cpu_relax(); > - } > + err = regmap_field_read_poll_timeout(ch->ack, ack_val, (ack_val == ctrl_val), > + 100, USEC_PER_SEC); > + if (err) > + return err; > } > > return 0; Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com> Thanks Patrice
diff --git a/drivers/reset/sti/reset-syscfg.c b/drivers/reset/sti/reset-syscfg.c index b4b46e0f207e..c1ba04f6f155 100644 --- a/drivers/reset/sti/reset-syscfg.c +++ b/drivers/reset/sti/reset-syscfg.c @@ -64,22 +64,12 @@ static int syscfg_reset_program_hw(struct reset_controller_dev *rcdev, return err; if (ch->ack) { - unsigned long timeout = jiffies + msecs_to_jiffies(1000); u32 ack_val; - while (true) { - err = regmap_field_read(ch->ack, &ack_val); - if (err) - return err; - - if (ack_val == ctrl_val) - break; - - if (time_after(jiffies, timeout)) - return -ETIME; - - cpu_relax(); - } + err = regmap_field_read_poll_timeout(ch->ack, ack_val, (ack_val == ctrl_val), + 100, USEC_PER_SEC); + if (err) + return err; } return 0;
Use regmap_field_read_poll_timeout function when waiting for the ack bit upon performing the reset control. Signed-off-by: Alain Volmat <avolmat@me.com> --- drivers/reset/sti/reset-syscfg.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)