From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 135C91519BF; Wed, 5 Feb 2025 15:02:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738767731; cv=none; b=NgbRCY45Ov/0m8qHOmWItwPBkFMID5hagD0MfIt5z0OVCiPuYkl9lpKFX+9I/ZaLpXLoBa9yQgnGzxBBiO1jnHn2KOYK/XlkdWhlQiS+MANeWNlfI+x5gz19sTW4/NWeNJ59yXwP0q9sEK9xhSu/DqxHOdmIAU/G/U2mzgQrh80= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738767731; c=relaxed/simple; bh=Liym+K2wNX3b2R6vux0NrpVUGNM0rsNGQ8uGsfKqDm4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QumwpvcZW1jQogoqp3mt3YkVVaAUmc2TQX6Ig9Z2CfdEYQeVZ2jpGAw8pPsupBhiUIa/oE0Zj7ebccKrEp708yOg5lHzcCYQ5l59WrO0miABb6s5fvaPfSnjHdzek5eIMLzmF4Q0Qe+OcnQWQ+BgEKNTikrSJnrSmni4XF/7an4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WJiW6wFu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="WJiW6wFu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15162C4CED1; Wed, 5 Feb 2025 15:02:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738767729; bh=Liym+K2wNX3b2R6vux0NrpVUGNM0rsNGQ8uGsfKqDm4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WJiW6wFuSTivGHIOgxCl6uchYeQPxOYcMY4oqPx38rDdlCRpqJMFBm6JAV0bbPyMS 3CH30+5FlLfIz7025oRnCYDMhwzJZEHBRSnUaaK/DdpPUwdkLm5s5ARTZkQJbrBcpg tujJ4mOgaQhMcCmRlHlZ73C5F/8KU4F4ygwcQp2c= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ming Wang , Huacai Chen , Keguang Zhang , Alexandre Belloni , Sasha Levin Subject: [PATCH 6.12 470/590] rtc: loongson: clear TOY_MATCH0_REG in loongson_rtc_isr() Date: Wed, 5 Feb 2025 14:43:45 +0100 Message-ID: <20250205134513.241350189@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134455.220373560@linuxfoundation.org> References: <20250205134455.220373560@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ming Wang [ Upstream commit 09471d8f5b390883eaf21b917c4bf3ced1b8a1df ] 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 Reviewed-by: Huacai Chen Reviewed-by: Keguang Zhang # on LS1B Tested-by: Keguang Zhang Link: https://lore.kernel.org/r/20241205114307.1891418-1-wangming01@loongson.cn Signed-off-by: Alexandre Belloni Signed-off-by: Sasha Levin --- 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 e8ffc1ab90b02..90e9d97a86b48 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.39.5