[v2] rtc: loongson: clear TOY_MATCH0_REG in loongson_rtc_isr()

The TOY_MATCH0_REG should be cleared to 0 in the RTC interrupt handler,
otherwise the interrupt cannot be cleared, which will cause the
loongson_rtc_isr() to be triggered multiple times.

The previous code cleared TOY_MATCH0_REG in the loongson_rtc_handler(),
which is an ACPI interrupt. This did not prevent loongson_rtc_isr()
from being triggered multiple times.

This commit moves the clearing of TOY_MATCH0_REG to the
loongson_rtc_isr() to ensure that the interrupt is properly cleared.

Fixes: 1b733a9ebc3d ("rtc: Add rtc driver for the Loongson family chips")
Signed-off-by: Ming Wang <wangming01@loongson.cn>
---
v1 -> v2: Fix commit message function name format and add missing blank line.
---
 drivers/rtc/rtc-loongson.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Reviewed-by: Huacai Chen <chenhuacai@loongson.cn>

On Thu, Dec 5, 2024 at 7:43 PM Ming Wang <wangming01@loongson.cn> wrote:
>
> The TOY_MATCH0_REG should be cleared to 0 in the RTC interrupt handler,
> otherwise the interrupt cannot be cleared, which will cause the
> loongson_rtc_isr() to be triggered multiple times.
>
> The previous code cleared TOY_MATCH0_REG in the loongson_rtc_handler(),
> which is an ACPI interrupt. This did not prevent loongson_rtc_isr()
> from being triggered multiple times.
>
> This commit moves the clearing of TOY_MATCH0_REG to the
> loongson_rtc_isr() to ensure that the interrupt is properly cleared.
>
> Fixes: 1b733a9ebc3d ("rtc: Add rtc driver for the Loongson family chips")
> Signed-off-by: Ming Wang <wangming01@loongson.cn>
> ---
> v1 -> v2: Fix commit message function name format and add missing blank line.
> ---
>  drivers/rtc/rtc-loongson.c | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/rtc/rtc-loongson.c b/drivers/rtc/rtc-loongson.c
> index e8ffc1ab90b0..90e9d97a86b4 100644
> --- a/drivers/rtc/rtc-loongson.c
> +++ b/drivers/rtc/rtc-loongson.c
> @@ -114,6 +114,13 @@ static irqreturn_t loongson_rtc_isr(int irq, void *id)
>         struct loongson_rtc_priv *priv = (struct loongson_rtc_priv *)id;
>
>         rtc_update_irq(priv->rtcdev, 1, RTC_AF | RTC_IRQF);
> +
> +       /*
> +        * The TOY_MATCH0_REG should be cleared 0 here,
> +        * otherwise the interrupt cannot be cleared.
> +        */
> +       regmap_write(priv->regmap, TOY_MATCH0_REG, 0);
> +
>         return IRQ_HANDLED;
>  }
>
> @@ -131,11 +138,7 @@ static u32 loongson_rtc_handler(void *id)
>         writel(RTC_STS, priv->pm_base + PM1_STS_REG);
>         spin_unlock(&priv->lock);
>
> -       /*
> -        * The TOY_MATCH0_REG should be cleared 0 here,
> -        * otherwise the interrupt cannot be cleared.
> -        */
> -       return regmap_write(priv->regmap, TOY_MATCH0_REG, 0);
> +       return ACPI_INTERRUPT_HANDLED;
>  }
>
>  static int loongson_rtc_set_enabled(struct device *dev)
> --
> 2.43.0
>

Reviewed-by: Keguang Zhang <keguang.zhang@gmail.com> # on LS1B
Tested-by: Keguang Zhang <keguang.zhang@gmail.com>

On Thu, Dec 5, 2024 at 7:43 PM Ming Wang <wangming01@loongson.cn> wrote:
>
> The TOY_MATCH0_REG should be cleared to 0 in the RTC interrupt handler,
> otherwise the interrupt cannot be cleared, which will cause the
> loongson_rtc_isr() to be triggered multiple times.
>
> The previous code cleared TOY_MATCH0_REG in the loongson_rtc_handler(),
> which is an ACPI interrupt. This did not prevent loongson_rtc_isr()
> from being triggered multiple times.
>
> This commit moves the clearing of TOY_MATCH0_REG to the
> loongson_rtc_isr() to ensure that the interrupt is properly cleared.
>
> Fixes: 1b733a9ebc3d ("rtc: Add rtc driver for the Loongson family chips")
> Signed-off-by: Ming Wang <wangming01@loongson.cn>
> ---
> v1 -> v2: Fix commit message function name format and add missing blank line.
> ---
>  drivers/rtc/rtc-loongson.c | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/rtc/rtc-loongson.c b/drivers/rtc/rtc-loongson.c
> index e8ffc1ab90b0..90e9d97a86b4 100644
> --- a/drivers/rtc/rtc-loongson.c
> +++ b/drivers/rtc/rtc-loongson.c
> @@ -114,6 +114,13 @@ static irqreturn_t loongson_rtc_isr(int irq, void *id)
>         struct loongson_rtc_priv *priv = (struct loongson_rtc_priv *)id;
>
>         rtc_update_irq(priv->rtcdev, 1, RTC_AF | RTC_IRQF);
> +
> +       /*
> +        * The TOY_MATCH0_REG should be cleared 0 here,
> +        * otherwise the interrupt cannot be cleared.
> +        */
> +       regmap_write(priv->regmap, TOY_MATCH0_REG, 0);
> +
>         return IRQ_HANDLED;
>  }
>
> @@ -131,11 +138,7 @@ static u32 loongson_rtc_handler(void *id)
>         writel(RTC_STS, priv->pm_base + PM1_STS_REG);
>         spin_unlock(&priv->lock);
>
> -       /*
> -        * The TOY_MATCH0_REG should be cleared 0 here,
> -        * otherwise the interrupt cannot be cleared.
> -        */
> -       return regmap_write(priv->regmap, TOY_MATCH0_REG, 0);
> +       return ACPI_INTERRUPT_HANDLED;
>  }
>
>  static int loongson_rtc_set_enabled(struct device *dev)
> --
> 2.43.0
>

On Thu, 05 Dec 2024 19:43:07 +0800, Ming Wang wrote:
> The TOY_MATCH0_REG should be cleared to 0 in the RTC interrupt handler,
> otherwise the interrupt cannot be cleared, which will cause the
> loongson_rtc_isr() to be triggered multiple times.
> 
> The previous code cleared TOY_MATCH0_REG in the loongson_rtc_handler(),
> which is an ACPI interrupt. This did not prevent loongson_rtc_isr()
> from being triggered multiple times.
> 
> [...]

Applied, thanks!

[1/1] rtc: loongson: clear TOY_MATCH0_REG in loongson_rtc_isr()
      https://git.kernel.org/abelloni/c/09471d8f5b39

Best regards,