From: Nariman Poushin <nariman@opensource.wolfsonmicro.com>
To: broonie@kernel.org
Cc: nariman@opensource.wolfsonmicro.com, gregkh@linuxfoundation.org,
airlied@linux.ie, dmitry.torokhov@gmail.com,
sameo@linux.intel.com, lee.jones@linaro.org, tony@atomide.com,
lgirdwood@gmail.com, brian.austin@cirrus.com,
Paul.Handrigan@cirrus.com, support.opensource@diasemi.com,
bardliao@realtek.com, oder_chiou@realtek.com,
laurent.pinchart+renesas@ideasonboard.com, lars@metafoo.de,
dmurphy@ti.com, linux-kernel@vger.kernel.org,
dri-devel@lists.freedesktop.org,
patches@opensource.wolfsonmicro.com, linux-omap@vger.kernel.org,
alsa-devel@alsa-project.org, peter.ujfalusi@ti.com
Subject: [PATCH 2/2] V4 regmap: Apply optional delay in multi_reg_write/register_patch
Date: Tue, 14 Jul 2015 15:45:52 +0100 [thread overview]
Message-ID: <1436885152-19850-2-git-send-email-nariman@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1436885152-19850-1-git-send-email-nariman@opensource.wolfsonmicro.com>
We treat a delay in a sequence the same way we treat a page change as
they are logically similar in that you can coalesce all write before
a delay (in the same way you can coalesce all writes before a page
change is needed)
Signed-off-by: Nariman Poushin <nariman@opensource.wolfsonmicro.com>
---
drivers/base/regmap/regmap.c | 65 ++++++++++++++++++++++++++++++++++++++++----
1 file changed, 59 insertions(+), 6 deletions(-)
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 0a849ee..a67473c2 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -18,6 +18,7 @@
#include <linux/of.h>
#include <linux/rbtree.h>
#include <linux/sched.h>
+#include <linux/delay.h>
#define CREATE_TRACE_POINTS
#include "trace.h"
@@ -47,6 +48,17 @@ static int _regmap_bus_reg_write(void *context, unsigned int reg,
static int _regmap_bus_raw_write(void *context, unsigned int reg,
unsigned int val);
+static void regmap_sequence_delay(unsigned int delay_us)
+{
+ /* For small delays it isn't worth setting up the hrtimers
+ * so fall back on udelay
+ */
+ if (delay_us < 10)
+ udelay(delay_us);
+ else
+ usleep_range(delay_us, delay_us * 2);
+}
+
bool regmap_reg_in_ranges(unsigned int reg,
const struct regmap_range *ranges,
unsigned int nranges)
@@ -1819,10 +1831,12 @@ static int _regmap_range_multi_paged_reg_write(struct regmap *map,
int i, n;
struct reg_sequence *base;
unsigned int this_page = 0;
+ unsigned int page_change = 0;
/*
* the set of registers are not neccessarily in order, but
* since the order of write must be preserved this algorithm
- * chops the set each time the page changes
+ * chops the set each time the page changes. This also applies
+ * if there is a delay required at any point in the sequence.
*/
base = regs;
for (i = 0, n = 0; i < num_regs; i++, n++) {
@@ -1838,16 +1852,48 @@ static int _regmap_range_multi_paged_reg_write(struct regmap *map,
this_page = win_page;
if (win_page != this_page) {
this_page = win_page;
+ page_change = 1;
+ }
+ }
+
+ /* If we have both a page change and a delay make sure to
+ * write the regs and apply the delay before we change the
+ * page.
+ */
+
+ if (page_change || regs[i].delay_us) {
+
+ /* For situations where the first write requires
+ * a delay we need to make sure we don't call
+ * raw_multi_reg_write with n=0
+ * This can't occur with page breaks as we
+ * never write on the first iteration
+ */
+ if (regs[i].delay_us && i == 0)
+ n = 1;
+
ret = _regmap_raw_multi_reg_write(map, base, n);
if (ret != 0)
return ret;
+
+ if (regs[i].delay_us)
+ regmap_sequence_delay(regs[i].delay_us);
+
base += n;
n = 0;
- }
- ret = _regmap_select_page(map, &base[n].reg, range, 1);
- if (ret != 0)
- return ret;
+
+ if (page_change) {
+ ret = _regmap_select_page(map,
+ &base[n].reg,
+ range, 1);
+ if (ret != 0)
+ return ret;
+
+ page_change = 0;
+ }
+
}
+
}
if (n > 0)
return _regmap_raw_multi_reg_write(map, base, n);
@@ -1866,6 +1912,9 @@ static int _regmap_multi_reg_write(struct regmap *map,
ret = _regmap_write(map, regs[i].reg, regs[i].def);
if (ret != 0)
return ret;
+
+ if (regs[i].delay_us)
+ regmap_sequence_delay(regs[i].delay_us);
}
return 0;
}
@@ -1905,8 +1954,12 @@ static int _regmap_multi_reg_write(struct regmap *map,
for (i = 0; i < num_regs; i++) {
unsigned int reg = regs[i].reg;
struct regmap_range_node *range;
+
+ /* Coalesce all the writes between a page break or a delay
+ * in a sequence
+ */
range = _regmap_range_lookup(map, reg);
- if (range) {
+ if (range || regs[i].delay_us) {
size_t len = sizeof(struct reg_sequence)*num_regs;
struct reg_sequence *base = kmemdup(regs, len,
GFP_KERNEL);
--
2.1.4
next prev parent reply other threads:[~2015-07-14 14:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-14 14:45 [PATCH 1/2] V4 regmap: Use reg_sequence for multi_reg_write / register_patch Nariman Poushin
2015-07-14 14:45 ` Nariman Poushin [this message]
2015-07-16 13:12 ` [alsa-devel] [PATCH 2/2] V4 regmap: Apply optional delay in multi_reg_write/register_patch Takashi Iwai
2015-07-16 12:52 ` [PATCH 1/2] V4 regmap: Use reg_sequence for multi_reg_write / register_patch Mark Brown
2015-07-16 15:45 ` [alsa-devel] " Nariman Poushin
2015-07-16 20:48 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436885152-19850-2-git-send-email-nariman@opensource.wolfsonmicro.com \
--to=nariman@opensource.wolfsonmicro.com \
--cc=Paul.Handrigan@cirrus.com \
--cc=airlied@linux.ie \
--cc=alsa-devel@alsa-project.org \
--cc=bardliao@realtek.com \
--cc=brian.austin@cirrus.com \
--cc=broonie@kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=dmurphy@ti.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=lars@metafoo.de \
--cc=laurent.pinchart+renesas@ideasonboard.com \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=oder_chiou@realtek.com \
--cc=patches@opensource.wolfsonmicro.com \
--cc=peter.ujfalusi@ti.com \
--cc=sameo@linux.intel.com \
--cc=support.opensource@diasemi.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).