| Message ID | 20231117063220.65093-3-mario.limonciello@amd.com |
|---|---|
| State | New |
| Headers | show |
| Series | Extend time to wait for UIP for some callers | expand |
W dniu 17.11.2023 o 07:32, Mario Limonciello pisze: > When mc146818_avoid_UIP() fails to return a valid value, this is because > UIP didn't clear in the timeout period. Adjust the return code in this > case to -ETIMEDOUT. > Hello, Thank you for posting this good patch series. Why don't you CC stable it? Fixes: cdedc45c579fa ("rtc: cmos: avoid UIP when reading alarm time") Fixes: cd17420ebea58 ("rtc: cmos: avoid UIP when writing alarm time") > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> > --- > drivers/rtc/rtc-cmos.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c > index 228fb2d11c70..b39890a5531e 100644 > --- a/drivers/rtc/rtc-cmos.c > +++ b/drivers/rtc/rtc-cmos.c > @@ -557,7 +557,7 @@ static int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t) > * Use mc146818_avoid_UIP() to avoid this. > */ > if (!mc146818_avoid_UIP(cmos_set_alarm_callback, &p)) > - return -EIO; > + return -ETIMEDOUT; > > cmos->alarm_expires = rtc_tm_to_time64(&t->time); This should be changed also in cmos_read_alarm(). Greetings, Mateusz
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index 228fb2d11c70..b39890a5531e 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -557,7 +557,7 @@ static int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t) * Use mc146818_avoid_UIP() to avoid this. */ if (!mc146818_avoid_UIP(cmos_set_alarm_callback, &p)) - return -EIO; + return -ETIMEDOUT; cmos->alarm_expires = rtc_tm_to_time64(&t->time);
When mc146818_avoid_UIP() fails to return a valid value, this is because UIP didn't clear in the timeout period. Adjust the return code in this case to -ETIMEDOUT. Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> --- drivers/rtc/rtc-cmos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)