From patchwork Sat May 2 07:15:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 244762 List-Id: U-Boot discussion From: jagan at amarulasolutions.com (Jagan Teki) Date: Sat, 2 May 2020 12:45:01 +0530 Subject: [PATCH v3 1/3] iopoll: Add read_poll_timeout common API Message-ID: <20200502071503.11493-1-jagan@amarulasolutions.com> Add read_poll_timeout common API similar to Linux iopoll. readx_poll_timeout will trigger read_poll_timeout with proper op. This will help to extend the functionalities like sleep_us to poll timeout in future. This change is referenced from Linux from below commit: commit <5f5323a14cad19323060a8cbf9d96f2280a462dd> ("iopoll: introduce read_poll_timeout macro") Signed-off-by: Jagan Teki --- Changes for v3: - new patch include/linux/iopoll.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h index ab0ae1969a..51966d83da 100644 --- a/include/linux/iopoll.h +++ b/include/linux/iopoll.h @@ -11,7 +11,7 @@ #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 @@ -24,7 +24,7 @@ * When available, you'll probably want to use one of the specialized * macros defined below rather than this macro directly. */ -#define readx_poll_timeout(op, addr, val, cond, timeout_us) \ +#define read_poll_timeout(op, addr, val, cond, timeout_us) \ ({ \ unsigned long timeout = timer_get_us() + timeout_us; \ for (;;) { \ @@ -39,6 +39,8 @@ (cond) ? 0 : -ETIMEDOUT; \ }) +#define readx_poll_timeout(op, addr, val, cond, timeout_us) \ + read_poll_timeout(op, addr, val, cond, timeout_us) #define readb_poll_timeout(addr, val, cond, timeout_us) \ readx_poll_timeout(readb, addr, val, cond, timeout_us) From patchwork Sat May 2 07:15:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 244763 List-Id: U-Boot discussion From: jagan at amarulasolutions.com (Jagan Teki) Date: Sat, 2 May 2020 12:45:02 +0530 Subject: [PATCH v3 2/3] iopoll: Add dealy to read poll In-Reply-To: <20200502071503.11493-1-jagan@amarulasolutions.com> References: <20200502071503.11493-1-jagan@amarulasolutions.com> Message-ID: <20200502071503.11493-2-jagan@amarulasolutions.com> Some drivers and other bsp code not only poll the register with timeout but also required to delay on each transaction. This patch add that requirement by adding sleep_us variable so-that read_poll_timeout now support delay as well. This change is referenced from Linux from below commit: commit <5f5323a14cad19323060a8cbf9d96f2280a462dd> ("iopoll: introduce read_poll_timeout macro") Signed-off-by: Jagan Teki --- Changes for v3: - add delay header include/linux/iopoll.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h index 51966d83da..76d2f951c1 100644 --- a/include/linux/iopoll.h +++ b/include/linux/iopoll.h @@ -6,6 +6,7 @@ #ifndef _LINUX_IOPOLL_H #define _LINUX_IOPOLL_H +#include #include #include #include @@ -16,6 +17,7 @@ * @addr: Address to poll * @val: Variable to read the value into * @cond: Break condition (usually involving @val) + * @sleep_us: Maximum time to sleep in us * @timeout_us: Timeout in us, 0 means never timeout * * Returns 0 on success and -ETIMEDOUT upon a timeout. In either @@ -24,7 +26,7 @@ * When available, you'll probably want to use one of the specialized * macros defined below rather than this macro directly. */ -#define read_poll_timeout(op, addr, val, cond, timeout_us) \ +#define read_poll_timeout(op, addr, val, cond, sleep_us, timeout_us) \ ({ \ unsigned long timeout = timer_get_us() + timeout_us; \ for (;;) { \ @@ -35,12 +37,14 @@ (val) = op(addr); \ break; \ } \ + if (sleep_us) \ + udelay(sleep_us); \ } \ (cond) ? 0 : -ETIMEDOUT; \ }) #define readx_poll_timeout(op, addr, val, cond, timeout_us) \ - read_poll_timeout(op, addr, val, cond, timeout_us) + read_poll_timeout(op, addr, val, cond, false, timeout_us) #define readb_poll_timeout(addr, val, cond, timeout_us) \ readx_poll_timeout(readb, addr, val, cond, timeout_us) From patchwork Sat May 2 07:15:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 244764 List-Id: U-Boot discussion From: jagan at amarulasolutions.com (Jagan Teki) Date: Sat, 2 May 2020 12:45:03 +0530 Subject: [PATCH v3 3/3] iopoll: Add readl_poll_sleep_timeout In-Reply-To: <20200502071503.11493-1-jagan@amarulasolutions.com> References: <20200502071503.11493-1-jagan@amarulasolutions.com> Message-ID: <20200502071503.11493-3-jagan@amarulasolutions.com> Add readl poll API with sleep and timeout support. This change is referenced from Linux from below commit: commit <5f5323a14cad19323060a8cbf9d96f2280a462dd> ("iopoll: introduce read_poll_timeout macro") Signed-off-by: Jagan Teki --- Changes for v3: - add readx_poll_sleep_timeout include/linux/iopoll.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h index 76d2f951c1..30cdea0cdc 100644 --- a/include/linux/iopoll.h +++ b/include/linux/iopoll.h @@ -43,6 +43,12 @@ (cond) ? 0 : -ETIMEDOUT; \ }) +#define readx_poll_sleep_timeout(op, addr, val, cond, sleep_us, timeout_us) \ + read_poll_timeout(op, addr, val, cond, sleep_us, timeout_us) + +#define readl_poll_sleep_timeout(addr, val, cond, sleep_us, timeout_us) \ + readx_poll_sleep_timeout(readl, addr, val, cond, sleep_us, timeout_us) + #define readx_poll_timeout(op, addr, val, cond, timeout_us) \ read_poll_timeout(op, addr, val, cond, false, timeout_us)