[PATCH] regmap: initialize all irqs to wake disabled

[Stephen Warren]

From: Stephen Warren <swa...@nvidia.com>

The kerneldoc for irq_set_irq_wake() says:

Enable/disable power management wakeup mode, which is
disabled by default.

regmap_irq_set_wake() clears bits to enable wake for an interrupt,
and sets bits to disable wake. Hence, we should set all bits in
wake_buf initially, to mirror the expected disabled state.

Signed-off-by: Stephen Warren <swa...@nvidia.com>
---
drivers/base/regmap/regmap-irq.c | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index c7e5b18..75b6939 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -314,6 +314,21 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
}
}

+ /* Wake is disabled by default */
+ if (d->wake_buf) {
+ for (i = 0; i < chip->num_regs; i++) {
+ d->wake_buf[i] = d->mask_buf_def[i];
+ reg = chip->wake_base +
+ (i * map->reg_stride * d->irq_reg_stride);
+ ret = regmap_write(map, reg, d->wake_buf[i]);
+ if (ret != 0) {
+ dev_err(map->dev, "Failed to set masks in 0x%x: %d\n",
+ reg, ret);
+ goto err_alloc;
+ }
+ }
+ }
+
if (irq_base)
d->domain = irq_domain_add_legacy(map->dev->of_node,
chip->num_irqs, irq_base, 0,
--
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[Mark Brown]

On Wed, Aug 01, 2012 at 11:39:44AM -0600, Stephen Warren wrote:

> and sets bits to disable wake. Hence, we should set all bits in
> wake_buf initially, to mirror the expected disabled state.

This fortunately isn't an issue for the only current user as masked is
the default in the silicon.

> + ret = regmap_write(map, reg, d->wake_buf[i]);
> + if (ret != 0) {
> + dev_err(map->dev, "Failed to set masks in 0x%x: %d\n",
> + reg, ret);

This should really be update_bits(). Which is a mistake we're making
in the current code for the masks and should correct there (I'll send a
patch shortly) but we may as well get it right here.

[Stephen Warren]

From: Stephen Warren <swa...@nvidia.com>

The kerneldoc for irq_set_irq_wake() says:

Enable/disable power management wakeup mode, which is
disabled by default.

regmap_irq_set_wake() clears bits to enable wake for an interrupt,

and sets bits to disable wake. Hence, we should set all bits in
wake_buf initially, to mirror the expected disabled state.

Signed-off-by: Stephen Warren <swa...@nvidia.com>
---

v2: Use regmap_update_bits() instead of regmap_write().
---
drivers/base/regmap/regmap-irq.c | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index 5ae5d0e..8bbb0ba 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -321,6 +321,22 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,

}
}

+ /* Wake is disabled by default */
+ if (d->wake_buf) {
+ for (i = 0; i < chip->num_regs; i++) {
+ d->wake_buf[i] = d->mask_buf_def[i];
+ reg = chip->wake_base +
+ (i * map->reg_stride * d->irq_reg_stride);

+ ret = regmap_update_bits(map, reg, d->wake_buf[i],
+ d->wake_buf[i]);

+ if (ret != 0) {
+ dev_err(map->dev, "Failed to set masks in 0x%x: %d\n",
+ reg, ret);

+ goto err_alloc;
+ }
+ }
+ }
+
if (irq_base)
d->domain = irq_domain_add_legacy(map->dev->of_node,
chip->num_irqs, irq_base, 0,
--
1.7.0.4

[Mark Brown]

On Wed, Aug 01, 2012 at 01:57:24PM -0600, Stephen Warren wrote:
> From: Stephen Warren <swa...@nvidia.com>
>
> The kerneldoc for irq_set_irq_wake() says:
>
> Enable/disable power management wakeup mode, which is
> disabled by default.

Applied, thanks.