commit 2bc54aaa65d2126ae629919175708a28ce7ef06e upstream.

IRQ trigger configuration is skipped if it has already been set before; however, the IRQ line still needs to be OR'd to irq_enabled because irq_enabled is reset for every events_configure call. This patch moves the irq_enabled OR operation update to before the irq_trigger check so that IRQ line enablement is not skipped.

Fixes: c95cc0d95702 ("counter: 104-quad-8: Fix persistent enabled events bug") Cc: stable stable@kernel.org Link: https://lore.kernel.org/r/20220815122301.2750-1-william.gray@linaro.org/ Signed-off-by: William Breathitt Gray william.gray@linaro.org Link: https://lore.kernel.org/r/179eed11eaf225dbd908993b510df0c8f67b1230.166384477... Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- This is a backport for the 5.19-stable tree; just a simple context adjustment to get it to apply cleanly.

Link: https://lore.kernel.org/r/16640913585139@kroah.com/ --- drivers/counter/104-quad-8.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/counter/104-quad-8.c b/drivers/counter/104-quad-8.c index a17e51d65aca..4e3f88f0e0a4 100644 --- a/drivers/counter/104-quad-8.c +++ b/drivers/counter/104-quad-8.c @@ -426,6 +426,9 @@ static int quad8_events_configure(struct counter_device *counter) return -EINVAL; }

+ /* Enable IRQ line */ + irq_enabled |= BIT(event_node->channel); + /* Skip configuration if it is the same as previously set */ if (priv->irq_trigger[event_node->channel] == next_irq_trigger) continue; @@ -439,9 +442,6 @@ static int quad8_events_configure(struct counter_device *counter) priv->irq_trigger[event_node->channel] << 3; base_offset = priv->base + 2 * event_node->channel + 1; outb(QUAD8_CTR_IOR | ior_cfg, base_offset); - - /* Enable IRQ line */ - irq_enabled |= BIT(event_node->channel); }

outb(irq_enabled, priv->base + QUAD8_REG_INDEX_INTERRUPT);