Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mfd: cpcap: Fix interrupt regression with regmap clear_ack

With commit 3a6f0fb7b8eb ("regmap: irq: Add support to clear ack
registers"), the cpcap interrupts are no longer getting acked properly
leading to a very unresponsive device with CPUs fully loaded spinning
in the threaded IRQ handlers.

To me it looks like the clear_ack commit above actually fixed a long
standing bug in regmap_irq_thread() where we unconditionally acked the
interrupts earlier without considering ack_invert. And the issue with
cpcap started happening as we now also consider ack_invert.

Tim Harvey <tharvey@gateworks.com> tried to fix this issue earlier with
"[PATCH v2] regmap: irq: fix ack-invert", but the reading of the ack
register was considered unnecessary for just ack_invert, and we did not
have clear_ack available yet. As the cpcap irqs worked both with and
without ack_invert earlier because of the unconditional ack, the
problem remained hidden until now.

Also, looks like the earlier v3.0.8 based Motorola Android Linux kernel
does clear_ack style read-clear-write with "ireg_val & ~mreg_val" instead
of just ack_invert style write. So let's switch cpcap to use clear_ack
to fix the issue.

Fixes: 3a6f0fb7b8eb ("regmap: irq: Add support to clear ack registers")
Cc: Carl Philipp Klemm <philipp@uvos.xyz>
Cc: Laxminath Kasam <lkasam@codeaurora.org>
Cc: Merlijn Wajer <merlijn@wizzup.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Sebastian Reichel <sre@kernel.org>
Cc: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tested-by: Pavel Machek <pavel@ucw.cz>
Reviewed-By: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

authored by

Tony Lindgren and committed by
Lee Jones
14639a22 d75846ed

+3 -3
+3 -3
drivers/mfd/motorola-cpcap.c
··· 97 97 .ack_base = CPCAP_REG_MI1, 98 98 .mask_base = CPCAP_REG_MIM1, 99 99 .use_ack = true, 100 - .ack_invert = true, 100 + .clear_ack = true, 101 101 }, 102 102 { 103 103 .name = "cpcap-m2", ··· 106 106 .ack_base = CPCAP_REG_MI2, 107 107 .mask_base = CPCAP_REG_MIM2, 108 108 .use_ack = true, 109 - .ack_invert = true, 109 + .clear_ack = true, 110 110 }, 111 111 { 112 112 .name = "cpcap1-4", ··· 115 115 .ack_base = CPCAP_REG_INT1, 116 116 .mask_base = CPCAP_REG_INTM1, 117 117 .use_ack = true, 118 - .ack_invert = true, 118 + .clear_ack = true, 119 119 }, 120 120 }; 121 121