Merge branch 'linus' into perf/urgent, to pick up dependent commits

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 57 insertions, 7 deletions

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 978abfbac617..15eddc1353ba 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -120,21 +120,65 @@ struct reg_sequence {
  */
 #define regmap_read_poll_timeout(map, addr, val, cond, sleep_us, timeout_us) \
 ({ \
-        ktime_t timeout = ktime_add_us(ktime_get(), timeout_us); \
+        u64 __timeout_us = (timeout_us); \
+        unsigned long __sleep_us = (sleep_us); \
+        ktime_t __timeout = ktime_add_us(ktime_get(), __timeout_us); \
+        int __ret; \
+        might_sleep_if(__sleep_us); \
+        for (;;) { \
+                __ret = regmap_read((map), (addr), &(val)); \
+                if (__ret) \
+                        break; \
+                if (cond) \
+                        break; \
+                if ((__timeout_us) && \
+                    ktime_compare(ktime_get(), __timeout) > 0) { \
+                        __ret = regmap_read((map), (addr), &(val)); \
+                        break; \
+                } \
+                if (__sleep_us) \
+                        usleep_range((__sleep_us >> 2) + 1, __sleep_us); \
+        } \
+        __ret ?: ((cond) ? 0 : -ETIMEDOUT); \
+})
+
+/**
+ * regmap_field_read_poll_timeout - Poll until a condition is met or timeout
+ *
+ * @field: Regmap field to read from
+ * @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).  Should be less than ~20ms since usleep_range
+ *            is used (see Documentation/timers/timers-howto.txt).
+ * @timeout_us: Timeout in us, 0 means never timeout
+ *
+ * Returns 0 on success and -ETIMEDOUT upon a timeout or the regmap_field_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 readx_poll_timeout macros in linux/iopoll.h.
+ */
+#define regmap_field_read_poll_timeout(field, val, cond, sleep_us, timeout_us) \
+({ \
+        u64 __timeout_us = (timeout_us); \
+        unsigned long __sleep_us = (sleep_us); \
+        ktime_t timeout = ktime_add_us(ktime_get(), __timeout_us); \
         int pollret; \
-        might_sleep_if(sleep_us); \
+        might_sleep_if(__sleep_us); \
         for (;;) { \
-                pollret = regmap_read((map), (addr), &(val)); \
+                pollret = regmap_field_read((field), &(val)); \
                 if (pollret) \
                         break; \
                 if (cond) \
                         break; \
-                if (timeout_us && ktime_compare(ktime_get(), timeout) > 0) { \
-                        pollret = regmap_read((map), (addr), &(val)); \
+                if (__timeout_us && ktime_compare(ktime_get(), timeout) > 0) { \
+                        pollret = regmap_field_read((field), &(val)); \
                         break; \
                 } \
-                if (sleep_us) \
-                        usleep_range((sleep_us >> 2) + 1, sleep_us); \
+                if (__sleep_us) \
+                        usleep_range((__sleep_us >> 2) + 1, __sleep_us); \
         } \
         pollret ?: ((cond) ? 0 : -ETIMEDOUT); \
 })
@@ -273,6 +317,9 @@ typedef void (*regmap_unlock)(void *);
  *
  * @ranges: Array of configuration entries for virtual address ranges.
  * @num_ranges: Number of range configuration entries.
+ * @hwlock_id: Specify the hardware spinlock id.
+ * @hwlock_mode: The hardware spinlock mode, should be HWLOCK_IRQSTATE,
+ *               HWLOCK_IRQ or 0.
  */
 struct regmap_config {
         const char *name;
@@ -317,6 +364,9 @@ struct regmap_config {
 
         const struct regmap_range_cfg *ranges;
         unsigned int num_ranges;
+
+        unsigned int hwlock_id;
+        unsigned int hwlock_mode;
 };
 
 /**