From: Stephen Boyd <sboyd@codeaurora.org>
To: Mark Brown <broonie@kernel.org>
Cc: Samuel Ortiz <sameo@linux.intel.com>,
Srinivas Ramana <sramana@codeaurora.org>,
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
Lee Jones <lee.jones@linaro.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH] regmap: Allow regmap_bulk_read() to work for "no-bus" regmaps
Date: Fri, 13 Dec 2013 09:14:07 -0800 [thread overview]
Message-ID: <20131213171407.GN21983@codeaurora.org> (raw)
In-Reply-To: <20131213104128.GT11044@sirena.org.uk>
regmap_bulk_read() should decay to performing individual reads if
we're using a "no-bus" regmap. Unfortunately, it returns an
error because there is no map->bus pointer. Fix it.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
On 12/13/13 02:41, Mark Brown wrote:
> On Thu, Dec 12, 2013 at 03:13:01PM -0800, Stephen Boyd wrote:
>
>>> bulk_read() should decay to individual reads if there isn't a block
>>> operaton and it's not like the hardware actually supports bulk reads
>>> anyway.
>
>> So regmap_bulk_read() should work if I don't have a map->bus? To make it
>> work with reg_read/write I had to do this. I'm not sure how to make
>> bulk_write work.
>
> Yes, I'd expect the operation to work. Your changes below are mostly
> fine (we should add an additional check for values that aren't integer
> numbers of bytes, I can add that) - can you send as a signed off patch
> please and I'll apply?
Here you go. Do you have any suggestions on how to make regmap_bulk_write()
work?
drivers/base/regmap/regmap.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 9c021d9..1ccd61b 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1897,14 +1897,10 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val,
size_t val_bytes = map->format.val_bytes;
bool vol = regmap_volatile_range(map, reg, val_count);
- if (!map->bus)
- return -EINVAL;
- if (!map->format.parse_inplace)
- return -EINVAL;
if (reg % map->reg_stride)
return -EINVAL;
- if (vol || map->cache_type == REGCACHE_NONE) {
+ if (map->bus && map->format.parse_inplace && (vol || map->cache_type == REGCACHE_NONE)) {
/*
* Some devices does not support bulk read, for
* them we have a series of single read operations.
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Boyd <sboyd@codeaurora.org>
To: Mark Brown <broonie@kernel.org>
Cc: Samuel Ortiz <sameo@linux.intel.com>,
Lee Jones <lee.jones@linaro.org>,
Srinivas Ramana <sramana@codeaurora.org>,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH] regmap: Allow regmap_bulk_read() to work for "no-bus" regmaps
Date: Fri, 13 Dec 2013 09:14:07 -0800 [thread overview]
Message-ID: <20131213171407.GN21983@codeaurora.org> (raw)
In-Reply-To: <20131213104128.GT11044@sirena.org.uk>
regmap_bulk_read() should decay to performing individual reads if
we're using a "no-bus" regmap. Unfortunately, it returns an
error because there is no map->bus pointer. Fix it.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
On 12/13/13 02:41, Mark Brown wrote:
> On Thu, Dec 12, 2013 at 03:13:01PM -0800, Stephen Boyd wrote:
>
>>> bulk_read() should decay to individual reads if there isn't a block
>>> operaton and it's not like the hardware actually supports bulk reads
>>> anyway.
>
>> So regmap_bulk_read() should work if I don't have a map->bus? To make it
>> work with reg_read/write I had to do this. I'm not sure how to make
>> bulk_write work.
>
> Yes, I'd expect the operation to work. Your changes below are mostly
> fine (we should add an additional check for values that aren't integer
> numbers of bytes, I can add that) - can you send as a signed off patch
> please and I'll apply?
Here you go. Do you have any suggestions on how to make regmap_bulk_write()
work?
drivers/base/regmap/regmap.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 9c021d9..1ccd61b 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1897,14 +1897,10 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val,
size_t val_bytes = map->format.val_bytes;
bool vol = regmap_volatile_range(map, reg, val_count);
- if (!map->bus)
- return -EINVAL;
- if (!map->format.parse_inplace)
- return -EINVAL;
if (reg % map->reg_stride)
return -EINVAL;
- if (vol || map->cache_type == REGCACHE_NONE) {
+ if (map->bus && map->format.parse_inplace && (vol || map->cache_type == REGCACHE_NONE)) {
/*
* Some devices does not support bulk read, for
* them we have a series of single read operations.
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
WARNING: multiple messages have this Message-ID (diff)
From: sboyd@codeaurora.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] regmap: Allow regmap_bulk_read() to work for "no-bus" regmaps
Date: Fri, 13 Dec 2013 09:14:07 -0800 [thread overview]
Message-ID: <20131213171407.GN21983@codeaurora.org> (raw)
In-Reply-To: <20131213104128.GT11044@sirena.org.uk>
regmap_bulk_read() should decay to performing individual reads if
we're using a "no-bus" regmap. Unfortunately, it returns an
error because there is no map->bus pointer. Fix it.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
On 12/13/13 02:41, Mark Brown wrote:
> On Thu, Dec 12, 2013 at 03:13:01PM -0800, Stephen Boyd wrote:
>
>>> bulk_read() should decay to individual reads if there isn't a block
>>> operaton and it's not like the hardware actually supports bulk reads
>>> anyway.
>
>> So regmap_bulk_read() should work if I don't have a map->bus? To make it
>> work with reg_read/write I had to do this. I'm not sure how to make
>> bulk_write work.
>
> Yes, I'd expect the operation to work. Your changes below are mostly
> fine (we should add an additional check for values that aren't integer
> numbers of bytes, I can add that) - can you send as a signed off patch
> please and I'll apply?
Here you go. Do you have any suggestions on how to make regmap_bulk_write()
work?
drivers/base/regmap/regmap.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 9c021d9..1ccd61b 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1897,14 +1897,10 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val,
size_t val_bytes = map->format.val_bytes;
bool vol = regmap_volatile_range(map, reg, val_count);
- if (!map->bus)
- return -EINVAL;
- if (!map->format.parse_inplace)
- return -EINVAL;
if (reg % map->reg_stride)
return -EINVAL;
- if (vol || map->cache_type == REGCACHE_NONE) {
+ if (map->bus && map->format.parse_inplace && (vol || map->cache_type == REGCACHE_NONE)) {
/*
* Some devices does not support bulk read, for
* them we have a series of single read operations.
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
next prev parent reply other threads:[~2013-12-13 17:14 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-10 23:35 [PATCH 0/8] Modernize pm8921 with irqdomains + regmap Stephen Boyd
2013-12-10 23:35 ` Stephen Boyd
2013-12-10 23:35 ` [PATCH 1/8] mfd: ssbi: Remove platform data structs and hide ssbi type enum Stephen Boyd
2013-12-10 23:35 ` Stephen Boyd
2013-12-11 9:27 ` Lee Jones
2013-12-11 9:27 ` Lee Jones
2013-12-10 23:35 ` [PATCH 2/8] mfd: ssbi: Constify buffer in ssbi_write Stephen Boyd
2013-12-10 23:35 ` Stephen Boyd
2013-12-11 9:28 ` Lee Jones
2013-12-11 9:28 ` Lee Jones
2013-12-10 23:35 ` [PATCH 3/8] regmap: Add support for using regmap over ssbi Stephen Boyd
2013-12-10 23:35 ` Stephen Boyd
2013-12-10 23:50 ` Mark Brown
2013-12-10 23:50 ` Mark Brown
2013-12-11 0:13 ` Stephen Boyd
2013-12-11 0:13 ` Stephen Boyd
2013-12-11 0:51 ` Mark Brown
2013-12-11 0:51 ` Mark Brown
2013-12-11 1:32 ` Stephen Boyd
2013-12-11 1:32 ` Stephen Boyd
2013-12-11 13:27 ` Mark Brown
2013-12-11 13:27 ` Mark Brown
2013-12-12 23:13 ` Stephen Boyd
2013-12-12 23:13 ` Stephen Boyd
2013-12-13 10:41 ` Mark Brown
2013-12-13 10:41 ` Mark Brown
2013-12-13 17:14 ` Stephen Boyd [this message]
2013-12-13 17:14 ` [PATCH] regmap: Allow regmap_bulk_read() to work for "no-bus" regmaps Stephen Boyd
2013-12-13 17:14 ` Stephen Boyd
2013-12-16 20:57 ` Mark Brown
2013-12-16 20:57 ` Mark Brown
2013-12-13 21:37 ` [PATCH 3/8] regmap: Add support for using regmap over ssbi Stephen Boyd
2013-12-13 21:37 ` Stephen Boyd
2013-12-16 21:01 ` Mark Brown
2013-12-16 21:01 ` Mark Brown
2013-12-17 2:30 ` [PATCH] regmap: Allow regmap_bulk_write() to work for "no-bus" regmaps Stephen Boyd
2013-12-17 2:30 ` Stephen Boyd
2013-12-18 18:45 ` Mark Brown
2013-12-18 18:45 ` Mark Brown
2013-12-23 20:05 ` Stephen Boyd
2013-12-23 20:05 ` Stephen Boyd
2013-12-24 12:53 ` Mark Brown
2013-12-24 12:53 ` Mark Brown
2013-12-26 19:34 ` Stephen Boyd
2013-12-26 19:34 ` Stephen Boyd
2013-12-26 21:52 ` [PATCH v2] " Stephen Boyd
2013-12-26 21:52 ` Stephen Boyd
2013-12-30 12:42 ` Mark Brown
2013-12-30 12:42 ` Mark Brown
2013-12-10 23:35 ` [PATCH 4/8] mfd: ssbi: Mark match table const Stephen Boyd
2013-12-10 23:35 ` Stephen Boyd
2013-12-11 9:29 ` Lee Jones
2013-12-11 9:29 ` Lee Jones
2013-12-10 23:35 ` [PATCH 5/8] mfd: Move pm8xxx-irq.c contents into only driver that uses it Stephen Boyd
2013-12-10 23:35 ` Stephen Boyd
2013-12-11 9:35 ` Lee Jones
2013-12-11 9:35 ` Lee Jones
2013-12-12 19:06 ` Stephen Boyd
2013-12-12 19:06 ` Stephen Boyd
2013-12-10 23:35 ` [PATCH 6/8] mfd: pm8921: Update for genirq changes Stephen Boyd
2013-12-10 23:35 ` Stephen Boyd
2013-12-11 9:48 ` Lee Jones
2013-12-11 9:48 ` Lee Jones
2013-12-10 23:35 ` [PATCH 7/8] mfd: pm8921: Migrate to irqdomains Stephen Boyd
2013-12-10 23:35 ` Stephen Boyd
2013-12-11 9:53 ` Lee Jones
2013-12-11 9:53 ` Lee Jones
2013-12-11 21:30 ` Courtney Cavin
2013-12-11 21:30 ` Courtney Cavin
2013-12-11 21:30 ` Courtney Cavin
2013-12-12 19:05 ` Stephen Boyd
2013-12-12 19:05 ` Stephen Boyd
2013-12-12 19:05 ` Stephen Boyd
2013-12-10 23:35 ` [PATCH 8/8] mfd: pm8921: Use ssbi regmap Stephen Boyd
2013-12-10 23:35 ` Stephen Boyd
2013-12-11 9:55 ` Lee Jones
2013-12-11 9:55 ` Lee Jones
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=20131213171407.GN21983@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=broonie@kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=sramana@codeaurora.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.