Skip to content

patch: armhf 202505: (592)drivers-rtc fix rcu unexp reboot #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yanmarkman merged 1 commit into from
Jun 23, 2026
Merged

patch: armhf 202505: (592)drivers-rtc fix rcu unexp reboot #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 101 additions & 0 deletions files/202505/592-drivers-rtc-fix-rcu-kseries.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
From 79109e68f377ca7275158b1b7ef974af79467937 Mon Sep 17 00:00:00 2001
From: Yan Markman <ymarkman@marvell.com>
Date: Mon, 15 Jun 2026 17:02:42 +0000
Subject: [PATCH 1/1] drivers/rtc: fix rcu unexpected reboot

Why needed (PROBLEM):
Under 'chrony' configuration or/and further hwrtc change
the RCU on the rtc_timer_do_work() reported and reproduced.

Easy reproduced on armhf Nokia-AC3X.
Not reproduced on SONiC TRIXIE.

How fixed:
drivers/rtc/interface.c: rtc_timer_do_work()
When processing expired RTC events and rearming them, use "now"
instead of "expiry" to prevent endless loops.

Signed-off-by: Elad Nachman <enachman@marvell.com>
Signed-off-by: Yan Markman <ymarkman@marvell.com>
---
...drivers-rtc-handle-OTF-clock-changes.patch | 55 +++++++++++++++++++
patch/series | 1 +
2 files changed, 56 insertions(+)
create mode 100644 patch/0018-drivers-rtc-handle-OTF-clock-changes.patch

diff --git a/patch/0018-drivers-rtc-handle-OTF-clock-changes.patch b/patch/0018-drivers-rtc-handle-OTF-clock-changes.patch
new file mode 100644
index 0000000..7ff5f2c
--- /dev/null
+++ b/patch/0018-drivers-rtc-handle-OTF-clock-changes.patch
@@ -0,0 +1,55 @@
+From 2415aef978513606be09aff401ed4ee32fc2a0df Mon Sep 17 00:00:00 2001
+From: Elad Nachman <enachman@marvell.com>
+Date: Mon, 15 Jun 2026 10:58:42 +0000
+Subject: [PATCH] drivers: rtc: handle OTF clock changes
+
+When processing expired RTC events and rearming them, use now
+instead of expiry to prevent endless loops.
+
+Signed-off-by: Elad Nachman <enachman@marvell.com>
+---
+ drivers/rtc/interface.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
+index 04ce689da..eb1338b97 100644
+--- a/drivers/rtc/interface.c
++++ b/drivers/rtc/interface.c
+@@ -126,6 +126,7 @@ EXPORT_SYMBOL_GPL(rtc_read_time);
+ int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm)
+ {
+ int err, uie;
++ struct rtc_time new_tm;
+
+ err = rtc_valid_tm(tm);
+ if (err != 0)
+@@ -159,6 +160,17 @@ int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm)
+ else
+ err = -EINVAL;
+
++ if (rtc && rtc->ops && rtc->ops->read_time) {
++ if (!rtc->ops->read_time(rtc->dev.parent, &new_tm)) {
++ pr_err("new rtc tm %d %d %d %d %d %d %d %d %d\n",
++ new_tm.tm_sec, new_tm.tm_min,
++ new_tm.tm_hour, new_tm.tm_mday,
++ new_tm.tm_mon, new_tm.tm_year,
++ new_tm.tm_wday, new_tm.tm_yday,
++ new_tm.tm_isdst);
++ }
++ }
++
+ pm_stay_awake(rtc->dev.parent);
+ mutex_unlock(&rtc->ops_lock);
+ /* A timer might have just expired */
+@@ -932,7 +944,7 @@ void rtc_timer_do_work(struct work_struct *work)
+ trace_rtc_timer_fired(timer);
+ /* Re-add/fwd periodic timers */
+ if (ktime_to_ns(timer->period)) {
+- timer->node.expires = ktime_add(timer->node.expires,
++ timer->node.expires = ktime_add(now/*timer->node.expires*/,
+ timer->period);
+ timer->enabled = 1;
+ timerqueue_add(&rtc->timerqueue, &timer->node);
+--
+2.25.1
+
diff --git a/patch/series b/patch/series
index 9aed86a..0c6c947 100755
--- a/patch/series
+++ b/patch/series
@@ -193,6 +193,7 @@ cisco-npu-disable-other-bars.patch
0015-arm64-dts-marvell-Add-Supermicro-SSE-G3748-board.patch
0016-arm64-dts-marvell-Add-Wistron-ES-1227-54TS-board.patch
0017-Extend-driver-to-support-XMC-XM25QH256C-device.patch
+0018-drivers-rtc-handle-OTF-clock-changes.patch

# amd-pensando elba support
0000-Add-support-for-the-TI-TPS53659.patch
--
2.34.1

55 changes: 55 additions & 0 deletions files/202505/592-drivers-rtc-handle-OTF-clock-changes.patch-PureKernel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
From 2415aef978513606be09aff401ed4ee32fc2a0df Mon Sep 17 00:00:00 2001
From: Elad Nachman <enachman@marvell.com>
Date: Mon, 15 Jun 2026 10:58:42 +0000
Subject: [PATCH] drivers: rtc: handle OTF clock changes

When processing expired RTC events and rearming them, use "now"
instead of "expiry" to prevent endless loops.

Signed-off-by: Elad Nachman <enachman@marvell.com>
---
drivers/rtc/interface.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 04ce689da..eb1338b97 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -126,6 +126,7 @@ EXPORT_SYMBOL_GPL(rtc_read_time);
int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm)
{
int err, uie;
+ struct rtc_time new_tm;

err = rtc_valid_tm(tm);
if (err != 0)
@@ -159,6 +160,17 @@ int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm)
else
err = -EINVAL;

+ if (rtc && rtc->ops && rtc->ops->read_time) {
+ if (!rtc->ops->read_time(rtc->dev.parent, &new_tm)) {
+ pr_err("new rtc tm %d %d %d %d %d %d %d %d %d\n",
+ new_tm.tm_sec, new_tm.tm_min,
+ new_tm.tm_hour, new_tm.tm_mday,
+ new_tm.tm_mon, new_tm.tm_year,
+ new_tm.tm_wday, new_tm.tm_yday,
+ new_tm.tm_isdst);
+ }
+ }
+
pm_stay_awake(rtc->dev.parent);
mutex_unlock(&rtc->ops_lock);
/* A timer might have just expired */
@@ -932,7 +944,7 @@ void rtc_timer_do_work(struct work_struct *work)
trace_rtc_timer_fired(timer);
/* Re-add/fwd periodic timers */
if (ktime_to_ns(timer->period)) {
- timer->node.expires = ktime_add(timer->node.expires,
+ timer->node.expires = ktime_add(now/*timer->node.expires*/,
timer->period);
timer->enabled = 1;
timerqueue_add(&rtc->timerqueue, &timer->node);
--
2.25.1

1 change: 1 addition & 0 deletions files/202505/series_marvell-prestera_armhf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
0001-platform-marvell-prestera-fw_setenv-with-without-f.patch|sonic-buildimage
0012-utilities-restart-mgmt-over-usb-interface-if-not-RUN.patch|src/sonic-utilities
0001-Remove-unsupported-marvell-board-x86_64-marvell_rd98.patch|sonic-buildimage
592-drivers-rtc-fix-rcu-kseries.patch|src/sonic-linux-kernel