regmap: irq: Factor register read out of the IRQ parsing loop
Subsystems (2)
PATCH 1/2 regmap: irq: Factor register read out of the IRQ parsing loop
In preparation for adding back support for block reads.
Signed-off-by Mark Brown <[email protected]>
--- drivers/base/regmap/regmap-irq.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/base/regmap/regmap-irq.c +9 -7
@@ -170,13 +170,6 @@ static irqreturn_t regmap_irq_thread(int irq, void *d) } } -/* -* Ignore masked IRQs and ack if we need to; we ack early so -* there is no race between handling and acknowleding the -* interrupt. We assume that typically few of the interrupts -* will fire simultaneously so don't worry about overhead from -* doing a write per register. -*/ for (i =0 ; i < data->chip->num_regs; i++) { ret = regmap_read(map, chip->status_base + (i * map->reg_stride * data->irq_reg_stride),
@@ -189,7 +182,16 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)pm_runtime_put (map->dev);return IRQ_NONE ; } + } +/* +* Ignore masked IRQs and ack if we need to; we ack early so +* there is no race between handling and acknowleding the +* interrupt. We assume that typically few of the interrupts +* will fire simultaneously so don't worry about overhead from +* doing a write per register. +*/ +for (i =0 ; i < data->chip->num_regs; i++) { data->status_buf[i] &= ~data->mask_buf[i];if (data->status_buf[i] && chip->ack_base) {
Signature · 1 line
1.7.10.4
PATCH 2/2 regmap: irq: Use a bulk read for interrupt status where possible
If the interrupt status registers are a single block of registers and the chip supports bulk reads then do a single bulk read rather than pay the extra I/O cost. This restores the original behaviour which was lost when support for register striding was added.
Signed-off-by Mark Brown <[email protected]>
--- drivers/base/regmap/regmap-irq.c | 67 +++++++++++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 8 deletions(-)
drivers/base/regmap/regmap-irq.c +59 -8
@@ -34,6 +34,7 @@ struct regmap_irq_chip_data {int irq;int wake_count; +void *status_reg_buf;unsigned int *status_buf;unsigned int *mask_buf;unsigned int *mask_buf_def;
@@ -170,18 +171,58 @@ static irqreturn_t regmap_irq_thread(int irq, void *d) } } -for (i =0 ; i < data->chip->num_regs; i++) { - ret =regmap_read (map, chip->status_base + (i * map->reg_stride - * data->irq_reg_stride), - &data->status_buf[i]); - +/* +* Read in the statuses, using a single bulk read if possible +* in order to reduce the I/O overheads. +*/ +if (!map->use_single_rw && map->reg_stride ==1 && + data->irq_reg_stride ==1 ) { +u8 *buf8 = data->status_reg_buf; +u16 *buf16 = data->status_reg_buf; +u32 *buf32 = data->status_reg_buf; + + ret =regmap_bulk_read (map, chip->status_base, + data->status_reg_buf, + chip->num_regs);if (ret !=0 ) {dev_err (map->dev,"Failed to read IRQ status: %d\n" , - ret); -if (chip->runtime_pm) -pm_runtime_put (map->dev); + ret);return IRQ_NONE ; } + +for (i =0 ; i < data->chip->num_regs; i++) { +switch (map->format.val_bytes) { +case 1 : + data->status_buf[i] = buf8[i]; +break ; +case 2 : + data->status_buf[i] = buf16[i]; +break ; +case 4 : + data->status_buf[i] = buf32[i]; +break ; +default : +BUG (); +return IRQ_NONE ; + } + } + + }else { +for (i =0 ; i < data->chip->num_regs; i++) { + ret =regmap_read (map, chip->status_base + + (i * map->reg_stride + * data->irq_reg_stride), + &data->status_buf[i]); + +if (ret !=0 ) { +dev_err (map->dev, +"Failed to read IRQ status: %d\n" , + ret); +if (chip->runtime_pm) +pm_runtime_put (map->dev); +return IRQ_NONE ; + } + } }/*
@@ -327,6 +368,14 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,else d->irq_reg_stride =1 ; +if (map->reg_stride ==1 && chip->irq_reg_stride ==1 ) { + d->status_reg_buf =kzalloc (sizeof (unsigned int ) * + chip->num_regs, +GFP_KERNEL ); +if (!d->status_reg_buf) + goto err_alloc; + } +mutex_init (&d->lock);for (i =0 ; i < chip->num_irqs; i++)
@@ -397,6 +446,7 @@ err_alloc:kfree (d->mask_buf_def);kfree (d->mask_buf);kfree (d->status_buf); +kfree (d->status_reg_buf);kfree (d);return ret; }
@@ -418,6 +468,7 @@ void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *d)kfree (d->wake_buf);kfree (d->mask_buf_def);kfree (d->mask_buf); +kfree (d->status_reg_buf);kfree (d->status_buf);kfree (d); }
Signature · 1 line
1.7.10.4