developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 1 | From 2be6a2d4eaa4db01d3afbd5e9d6fd15494a87f2f Mon Sep 17 00:00:00 2001 |
| 2 | From: Bo Jiao <Bo.Jiao@mediatek.com> |
| 3 | Date: Fri, 17 Jun 2022 11:23:57 +0800 |
| 4 | Subject: [PATCH 2/8] 9991-add-read-poll-timeout-function-for-kernel5.4 |
| 5 | |
| 6 | --- |
| 7 | include/linux/iopoll.h | 30 +++++++++++++++++++++++++++--- |
| 8 | 1 file changed, 27 insertions(+), 3 deletions(-) |
| 9 | mode change 100644 => 100755 include/linux/iopoll.h |
| 10 | |
| 11 | diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h |
| 12 | old mode 100644 |
| 13 | new mode 100755 |
| 14 | index 35e15dfd4..d96087008 |
| 15 | --- a/include/linux/iopoll.h |
| 16 | +++ b/include/linux/iopoll.h |
| 17 | @@ -31,19 +31,22 @@ |
| 18 | * When available, you'll probably want to use one of the specialized |
| 19 | * macros defined below rather than this macro directly. |
| 20 | */ |
| 21 | -#define readx_poll_timeout(op, addr, val, cond, sleep_us, timeout_us) \ |
| 22 | +#define read_poll_timeout(op, val, cond, sleep_us, timeout_us, \ |
| 23 | + sleep_before_read, args...) \ |
| 24 | ({ \ |
| 25 | u64 __timeout_us = (timeout_us); \ |
| 26 | unsigned long __sleep_us = (sleep_us); \ |
| 27 | ktime_t __timeout = ktime_add_us(ktime_get(), __timeout_us); \ |
| 28 | might_sleep_if((__sleep_us) != 0); \ |
| 29 | + if (sleep_before_read && __sleep_us) \ |
| 30 | + usleep_range((__sleep_us >> 2) + 1, __sleep_us); \ |
| 31 | for (;;) { \ |
| 32 | - (val) = op(addr); \ |
| 33 | + (val) = op(args); \ |
| 34 | if (cond) \ |
| 35 | break; \ |
| 36 | if (__timeout_us && \ |
| 37 | ktime_compare(ktime_get(), __timeout) > 0) { \ |
| 38 | - (val) = op(addr); \ |
| 39 | + (val) = op(args); \ |
| 40 | break; \ |
| 41 | } \ |
| 42 | if (__sleep_us) \ |
| 43 | @@ -52,6 +55,27 @@ |
| 44 | (cond) ? 0 : -ETIMEDOUT; \ |
| 45 | }) |
| 46 | |
| 47 | +/** |
| 48 | + * readx_poll_timeout - Periodically poll an address until a condition is met or a timeout occurs |
| 49 | + * @op: accessor function (takes @addr as its only argument) |
| 50 | + * @addr: Address to poll |
| 51 | + * @val: Variable to read the value into |
| 52 | + * @cond: Break condition (usually involving @val) |
| 53 | + * @sleep_us: Maximum time to sleep between reads in us (0 |
| 54 | + * tight-loops). Should be less than ~20ms since usleep_range |
| 55 | + * is used (see Documentation/timers/timers-howto.rst). |
| 56 | + * @timeout_us: Timeout in us, 0 means never timeout |
| 57 | + * |
| 58 | + * Returns 0 on success and -ETIMEDOUT upon a timeout. In either |
| 59 | + * case, the last read value at @addr is stored in @val. Must not |
| 60 | + * be called from atomic context if sleep_us or timeout_us are used. |
| 61 | + * |
| 62 | + * When available, you'll probably want to use one of the specialized |
| 63 | + * macros defined below rather than this macro directly. |
| 64 | + */ |
| 65 | +#define readx_poll_timeout(op, addr, val, cond, sleep_us, timeout_us) \ |
| 66 | + read_poll_timeout(op, val, cond, sleep_us, timeout_us, false, addr) |
| 67 | + |
| 68 | /** |
| 69 | * readx_poll_timeout_atomic - Periodically poll an address until a condition is met or a timeout occurs |
| 70 | * @op: accessor function (takes @addr as its only argument) |
| 71 | -- |
| 72 | 2.18.0 |
| 73 | |