From bce7c84e6aa41cc1cce85f0b098863365dd4a3a0 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 22 Apr 2020 07:43:12 +0200 Subject: iopoll: Introduce read_poll_timeout barebox adoption of Linux commit: | commit 5f5323a14cad19323060a8cbf9d96f2280a462dd | Author: Dejin Zheng | Date: Mon Mar 23 23:05:51 2020 +0800 | | iopoll: introduce read_poll_timeout macro | | this macro is an extension of readx_poll_timeout macro. the accessor | function op just supports only one parameter in the readx_poll_timeout | macro, but this macro can supports multiple variable parameters for | it. so functions like phy_read(struct phy_device *phydev, u32 regnum) | and phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum) can | also use this poll timeout core. and also expand it can sleep some time | before read operation. | | Signed-off-by: Dejin Zheng | Signed-off-by: David S. Miller Also, implement readx_poll_timeout using read_poll_timeout. Signed-off-by: Sascha Hauer --- include/linux/iopoll.h | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h index 66c8f652ca..8bf912e173 100644 --- a/include/linux/iopoll.h +++ b/include/linux/iopoll.h @@ -13,12 +13,12 @@ #include /** - * readx_poll_timeout - Periodically poll an address until a condition is met or a timeout occurs + * read_poll_timeout - Periodically poll an address until a condition is met or a timeout occurs * @op: accessor function (takes @addr as its only argument) - * @addr: Address to poll * @val: Variable to read the value into * @cond: Break condition (usually involving @val) * @timeout_us: Timeout in us, 0 means never timeout + * @args: arguments for @op poll * * Returns 0 on success and -ETIMEDOUT upon a timeout. In either * case, the last read value at @addr is stored in @val. @@ -29,24 +29,43 @@ * We do not have timing functions in the PBL, so ignore the timeout value and * loop infinitely here. */ -#define readx_poll_timeout(op, addr, val, cond, timeout_us) \ +#define read_poll_timeout(op, val, cond, timeout_us, args...) \ ({ \ uint64_t start; \ if (!IN_PBL && timeout_us) \ start = get_time_ns(); \ for (;;) { \ - (val) = op(addr); \ + (val) = op(args); \ if (cond) \ break; \ if (!IN_PBL && timeout_us && \ is_timeout(start, ((timeout_us) * USECOND))) { \ - (val) = op(addr); \ + (val) = op(args); \ break; \ } \ } \ (cond) ? 0 : -ETIMEDOUT; \ }) +/** + * readx_poll_timeout - Periodically poll an address until a condition is met or a timeout occurs + * @op: accessor function (takes @addr as its only argument) + * @addr: Address to poll + * @val: Variable to read the value into + * @cond: Break condition (usually involving @val) + * @timeout_us: Timeout in us, 0 means never timeout + * + * Returns 0 on success and -ETIMEDOUT upon a timeout. In either + * case, the last read value at @addr is stored in @val. + * + * When available, you'll probably want to use one of the specialized + * macros defined below rather than this macro directly. + * + * We do not have timing functions in the PBL, so ignore the timeout value and + * loop infinitely here. + */ +#define readx_poll_timeout(op, addr, val, cond, timeout_us) \ + read_poll_timeout(op, val, cond, timeout_us, addr) #define readb_poll_timeout(addr, val, cond, timeout_us) \ readx_poll_timeout(readb, addr, val, cond, timeout_us) -- cgit v1.2.3