Skip to content

Fix the "pending" state of RTCs, on Pi 5 and beyond #7198

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

Open
pelwell wants to merge 2 commits into
base: rpi-6.12.y
Choose a base branch
from
+18 −3
Open

Fix the "pending" state of RTCs, on Pi 5 and beyond #7198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de19412
rtc: rtc-rpi: Populate the alarm's pending state
pelwell Jan 15, 2026
1349279
rtc: Make pending alarm value mirror the hardware
pelwell Jan 15, 2026
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
4 changes: 4 additions & 0 deletions drivers/rtc/interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ int rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
} else {
memset(alarm, 0, sizeof(struct rtc_wkalrm));
alarm->enabled = rtc->aie_timer.enabled;
alarm->pending = test_bit(RTC_PENDING_ALARM, &rtc->flags);
alarm->time = rtc_ktime_to_tm(rtc->aie_timer.node.expires);
}
mutex_unlock(&rtc->ops_lock);
Expand Down Expand Up @@ -504,6 +505,7 @@ int rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)

rtc->aie_timer.node.expires = alarm_time;
rtc->aie_timer.period = 0;
clear_bit(RTC_PENDING_ALARM, &rtc->flags);
if (alarm->enabled)
err = rtc_timer_enqueue(rtc, &rtc->aie_timer);

Expand Down Expand Up @@ -533,6 +535,8 @@ int rtc_initialize_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)

rtc->aie_timer.node.expires = rtc_tm_to_ktime(alarm->time);
rtc->aie_timer.period = 0;
if (alarm->pending)
set_bit(RTC_PENDING_ALARM, &rtc->flags);

/* Alarm has to be enabled & in the future for us to enqueue it */
if (alarm->enabled && (rtc_tm_to_ktime(now) <
Expand Down
16 changes: 13 additions & 3 deletions drivers/rtc/rtc-rpi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,13 @@ static int rpi_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
&data, sizeof(data));
rtc_time64_to_tm(data[1], &alarm->time);

data[0] = RTC_ALARM_PENDING;
data[1] = 0;
if (!err)
err = rpi_firmware_property(vrtc->fw, RPI_FIRMWARE_GET_RTC_REG,
&data, sizeof(data));
alarm->pending = data[1] & 1;

return err;
}

Expand Down Expand Up @@ -243,8 +250,6 @@ static int rpi_rtc_probe(struct platform_device *pdev)
if (ret)
return ret;

rpi_rtc_alarm_clear_pending(dev);

/*
* Optionally enable trickle charging - if the property isn't
* present (or set to zero), trickle charging is disabled.
Expand All @@ -254,7 +259,12 @@ static int rpi_rtc_probe(struct platform_device *pdev)

rpi_rtc_set_charge_voltage(dev);

return devm_rtc_register_device(vrtc->rtc);
ret = devm_rtc_register_device(vrtc->rtc);

if (!ret)
rpi_rtc_alarm_clear_pending(dev);

return ret;
}

static const struct of_device_id rpi_rtc_dt_match[] = {
Expand Down
1 change: 1 addition & 0 deletions include/linux/rtc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ struct rtc_timer {
/* flags */
#define RTC_DEV_BUSY 0
#define RTC_NO_CDEV 1
#define RTC_PENDING_ALARM 2

struct rtc_device {
struct device dev;
Expand Down