Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 F048A3B14CE for ; Thu, 10 Sep 2026 16:53:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789059220; cv=none; b=Q7Jy2IECeC49sW7qPJFTZZ0aTQsEPd/Ktdzz1IyHqD7XGLvVztgzMZmUWhgoICGfRhVSpME1VQXziPCNPLp7u2OsNQUyI5quoLJUvoAh5e7ML7yYK32r9UAAQIlINfdsH6KoNfJ+8otexBncpmyovnqAXBR7QtqAIv8S3FdmOoU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789059220; c=relaxed/simple; bh=b/7LGvJ3ph/dpx1tcx8+U6IUh2wHWUsxPmy6jnsG+WU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j+JTGydEvTQKxtfHu/M/jPSV2Ke2VC0gA6vm+xt6DNdj47HC/WVZaewjOQbfgRUwrvGNDcIyQodR2LFd3HMblpNqIaPMOKpFfp6tSPGlGRVjYsCJwhaMo8VYXgqzrP0lLafbLjnLfDCv2HpwMf+JwT8uZs7y37KyhSCNfk20Ows= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Cl0sR2sM; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Cl0sR2sM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D87DD1F000FF; Thu, 10 Sep 2026 16:53:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789059218; bh=mcifqayaJrsTFab+f8+mykZxqto8cbRay8cRShRjQKs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Cl0sR2sMSFYv0uGfEw9asFQo8GG0fyFpcjnIpqSrfdcP91pfGjrgP+stuBq6w+OoG FYHV8TIf6NP79EADbNyRr+U3w28dBvX4oyTxuILV25Z1w9qh1dssezjfue3O1b17QF aF19zgL06+B4rT5g17X++IVhZAx/TwD12EUSjlWjCETbB/h0dmDPC/8uaDM4IQBcdd /WitHStoz9Vb5hmzrX7JtD7QBPHg6Kipc8IXQhg3XXEqa+1G8nSqcrSx5OJHGqhwtZ r2P40xO3EuTZUMm7a1yJhemJABfYiFaxFzzc87YRO2DLJsSw5pk6xvXAXFYwaRrt4z B6swpMnCD5Vug== From: Sasha Levin To: stable@vger.kernel.org Cc: Lad Prabhakar , Wolfram Sang , Alexandre Belloni , Sasha Levin Subject: [PATCH 6.1.y] rtc: rzn1: Handle unset alarm weekday in rzn1_rtc_read_alarm Date: Thu, 10 Sep 2026 12:53:36 -0400 Message-ID: <20260910165336.1289665-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026090900-washout-open-1097@gregkh> References: <2026090900-washout-open-1097@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Lad Prabhakar [ Upstream commit 457b5dbce31209e65e1184716ed3af59cb1c0372 ] RZN1_RTC_ALW is a weekday bitmask where bit N represents weekday N. When no alarm has been configured, the register has its power-on-reset value of zero. rzn1_rtc_read_alarm() uses fls() to convert the weekday bitmask into a weekday number. When RZN1_RTC_ALW is zero, fls(0) returns zero and fls(wday) - 1 evaluates to -1. This invalid weekday is then used to calculate the alarm date and can either leave tm_wday set to -1 or produce a fabricated alarm date. Treat a zero RZN1_RTC_ALW value as an unset alarm weekday and return without calculating the alarm date. Move reading RZN1_RTC_CTL1 before this check so that alrm->enabled is updated for both configured and unconfigured alarms. Fixes: b5ad1bf00d2c4 ("rtc: rzn1: Add alarm support") Cc: stable@vger.kernel.org Signed-off-by: Lad Prabhakar Reviewed-by: Wolfram Sang Tested-by: Wolfram Sang Link: https://patch.msgid.link/20260821211032.13554-5-prabhakar.mahadev-lad.rj@bp.renesas.com Signed-off-by: Alexandre Belloni [ retained the ALME-only enable check because RZN1_RTC_CTL1_1SE is absent. ] Signed-off-by: Sasha Levin --- drivers/rtc/rtc-rzn1.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/rtc/rtc-rzn1.c b/drivers/rtc/rtc-rzn1.c index ff094b3ce9e3c..800a0644b877d 100644 --- a/drivers/rtc/rtc-rzn1.c +++ b/drivers/rtc/rtc-rzn1.c @@ -193,13 +193,24 @@ static int rzn1_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) if (ret) return ret; + ctl1 = readl(rtc->base + RZN1_RTC_CTL1); + alrm->enabled = !!(ctl1 & RZN1_RTC_CTL1_ALME); + min = readl(rtc->base + RZN1_RTC_ALM); hour = readl(rtc->base + RZN1_RTC_ALH); - wday = readl(rtc->base + RZN1_RTC_ALW); tm->tm_sec = 0; tm->tm_min = bcd2bin(min); tm->tm_hour = bcd2bin(hour); + + /* + * If wday is zero, no bit is set in RZN1_RTC_ALW. This is the + * register's power-on reset value. + */ + wday = readl(rtc->base + RZN1_RTC_ALW); + if (!wday) + return 0; + delta_days = ((fls(wday) - 1) - tm->tm_wday + 7) % 7; tm->tm_wday = fls(wday) - 1; @@ -208,9 +219,6 @@ static int rzn1_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) rtc_time64_to_tm(alarm, tm); } - ctl1 = readl(rtc->base + RZN1_RTC_CTL1); - alrm->enabled = !!(ctl1 & RZN1_RTC_CTL1_ALME); - return 0; } -- 2.53.0