Skip to contentSkip to conversation

iopoll: Add read_poll_timeout common API

PATCH New Jagan Teki 1 participant 4 messages May 2, 2020 – May 7, 2020

lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH v3 1/3 iopoll: Add read_poll_timeout common API

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")

---
Changes for v3:
- new patch

 include/linux/iopoll.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
include/linux/iopoll.h +4 -2
index ab0ae1969a..51966d83da 100644
@@ -11,7 +11,7 @@
 #include <time.h>
 
 /**
- * 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)
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v3 1/3 iopoll: Add read_poll_timeout common API

Quoted 7 lines · Jagan Teki

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.

Quoted 6 lines

This change is referenced from Linux from below commit:
commit <5f5323a14cad19323060a8cbf9d96f2280a462dd> ("iopoll:
introduce read_poll_timeout macro")

---

Applied all to u-boot-spi/master

author
#2 lore raw

PATCH v3 2/3 iopoll: Add dealy to read poll

In reply to Jagan Teki

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")

---
Changes for v3:
- add delay header

 include/linux/iopoll.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
include/linux/iopoll.h +6 -2
index 51966d83da..76d2f951c1 100644
@@ -6,6 +6,7 @@
 #ifndef _LINUX_IOPOLL_H
 #define _LINUX_IOPOLL_H
 
+#include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <time.h>
@@ -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)
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH v3 3/3 iopoll: Add readl_poll_sleep_timeout

In reply to Jagan Teki

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")

---
Changes for v3:
- add readx_poll_sleep_timeout

 include/linux/iopoll.h | 6 ++++++
 1 file changed, 6 insertions(+)
include/linux/iopoll.h +6 -0
index 76d2f951c1..30cdea0cdc 100644
@@ -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)
 
Signature · 1 line
2.17.1