| Message ID | 20181122100105.14829-2-narmstrong@baylibre.com |
|---|---|
| State | Accepted |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
| Series | Add Amlogic Meson SPI Flash Controller driver | expand |
Hi Neil, On Thu, 22 Nov 2018 at 03:01, Neil Armstrong <narmstrong@baylibre.com> wrote: > > Add the regmap_read_poll_timeout() macro based on the Linux implementation > to simplify register polling with configurable timeout and sleep. > > Acked-by: Jagan Teki <jagan@openedev.com> > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > include/regmap.h | 38 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) > Is there a change log somewhere? This is v3. Regards, Simon
Hi Simon, On 27/11/2018 02:02, Simon Glass wrote: > Hi Neil, > > On Thu, 22 Nov 2018 at 03:01, Neil Armstrong <narmstrong@baylibre.com> wrote: >> >> Add the regmap_read_poll_timeout() macro based on the Linux implementation >> to simplify register polling with configurable timeout and sleep. >> >> Acked-by: Jagan Teki <jagan@openedev.com> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >> --- >> include/regmap.h | 38 ++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 38 insertions(+) >> > > Is there a change log somewhere? This is v3. Forgot changelog on cover letter, v3 only changes the SPI driver, the regmap patches are only rebased against master. Neil > > Regards, > Simon >
diff --git a/include/regmap.h b/include/regmap.h index b2b733fda6..a3afb72df5 100644 --- a/include/regmap.h +++ b/include/regmap.h @@ -239,6 +239,44 @@ int regmap_raw_read_range(struct regmap *map, uint range_num, uint offset, #define regmap_get(map, type, member, valp) \ regmap_range_get(map, 0, type, member, valp) +/** + * regmap_read_poll_timeout - Poll until a condition is met or a timeout occurs + * + * @map: Regmap to read from + * @addr: Offset to poll + * @val: Unsigned integer variable to read the value into + * @cond: Break condition (usually involving @val) + * @sleep_us: Maximum time to sleep between reads in us (0 tight-loops). + * @timeout_ms: Timeout in ms, 0 means never timeout + * + * Returns 0 on success and -ETIMEDOUT upon a timeout or the regmap_read + * error return value in case of a error read. In the two former cases, + * the last read value at @addr is stored in @val. Must not be called + * from atomic context if sleep_us or timeout_us are used. + * + * This is modelled after the regmap_read_poll_timeout macros in linux but + * with millisecond timeout. + */ +#define regmap_read_poll_timeout(map, addr, val, cond, sleep_us, timeout_ms) \ +({ \ + unsigned long __start = get_timer(0); \ + int __ret; \ + for (;;) { \ + __ret = regmap_read((map), (addr), &(val)); \ + if (__ret) \ + break; \ + if (cond) \ + break; \ + if ((timeout_ms) && get_timer(__start) > (timeout_ms)) { \ + __ret = regmap_read((map), (addr), &(val)); \ + break; \ + } \ + if ((sleep_us)) \ + udelay((sleep_us)); \ + } \ + __ret ?: ((cond) ? 0 : -ETIMEDOUT); \ +}) + /** * regmap_update_bits() - Perform a read/modify/write using a mask *