Messages in this thread Patch in this message | | | From | Tim Harvey <> | Subject | [PATCH] regmap: irq: do not allow setting irq bits during ack | Date | Mon, 28 Dec 2020 13:45:51 -0800 |
| |
Some interrupt controllers may not de-assert their interrupt if bits are set when acknowledging the bits that caused the interrupt.
Take care to not apply the mask to the status until we are done acknowledging the interrupt and take care to mask the bits according for the ack_invert state.
This is needed to avoid a stuck interrupt case for the Gateworks System Controller which uses ack_invert. If the status has the mask applied before clearing the bits it will end up setting bits that are enabled but were not the cause the interrupt which will keep the GSC from ever de-asserting its interrupt.
Cc: Tony Lindgren <tony@atomide.com> Cc: Laxminath Kasam <lkasam@codeaurora.org> Cc: Robert Jones <rjones@gateworks.com> Signed-off-by: Tim Harvey <tharvey@gateworks.com> --- drivers/base/regmap/regmap-irq.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c index ad5c2de..560c641 100644 --- a/drivers/base/regmap/regmap-irq.c +++ b/drivers/base/regmap/regmap-irq.c @@ -496,29 +496,29 @@ static irqreturn_t regmap_irq_thread(int irq, void *d) * 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 || chip->use_ack)) { + if ((data->status_buf[i] && ~data->mask_buf[i]) && + (chip->ack_base || chip->use_ack)) { reg = chip->ack_base + (i * map->reg_stride * data->irq_reg_stride); if (chip->ack_invert) ret = regmap_write(map, reg, - ~data->status_buf[i]); + ~data->status_buf[i] & data->mask_buf[i]); else ret = regmap_write(map, reg, - data->status_buf[i]); + data->status_buf[i] & ~data->mask_buf[i]); if (chip->clear_ack) { if (chip->ack_invert && !ret) ret = regmap_write(map, reg, - data->status_buf[i]); + data->status_buf[i] & ~data->mask_buf[i]); else if (!ret) ret = regmap_write(map, reg, - ~data->status_buf[i]); + ~data->status_buf[i] & data->mask_buf[i]); } if (ret != 0) dev_err(map->dev, "Failed to ack 0x%x: %d\n", reg, ret); } + data->status_buf[i] &= ~data->mask_buf[i]; } for (i = 0; i < chip->num_irqs; i++) { -- 2.7.4
| |