counter: 104-quad-8: Fix skipped IRQ lines during events configuration

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.1663844776.git.william.gray@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/counter/104-quad-8.c b/drivers/counter/104-quad-8.c
index 62c2b7ac4339fb4ff36d633cd9df11ea84106651..4407203e0c9b3cd8cb5d783f3066c6923917f105 100644 (file)
--- a/drivers/counter/104-quad-8.c
+++ b/drivers/counter/104-quad-8.c
@@ -449,6 +449,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;
@@ -462,9 +465,6 @@ static int quad8_events_configure(struct counter_device *counter)
                          priv->irq_trigger[event_node->channel] << 3;
                iowrite8(QUAD8_CTR_IOR | ior_cfg,
                         &priv->reg->channel[event_node->channel].control);
-
-               /* Enable IRQ line */
-               irq_enabled |= BIT(event_node->channel);
        }
 
        iowrite8(irq_enabled, &priv->reg->index_interrupt);