Patch "rtc: ds1307: remove clear of oscillator stop flag (OSF) in probe" has been added to the 5.4-stable tree
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 6 lines · Sasha Levin
This is a note to let you know that I've just added the patch titled
rtc: ds1307: remove clear of oscillator stop flag (OSF) in probe
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
Hi Sasha,
FYI, patch 2/2 of the series wasn't applied to 5.4, but was applied to all the other trees.
"rtc: ds1307: handle oscillator stop flag (OSF) for ds1341"
[PATCH 2/2] rtc: ds1307: handle oscillator stop flag (OSF) for ds1341 - Meagan Lloyd <https://lore.kernel.org/all/1749665656-30108-3-git-send-email-meaganlloyd@linux.microsoft.com/>
(upstream commit 523923cfd5d622b8f4ba893fdaf29fa6adeb8c3e)
Thank you,
Meagan
Sasha Levin
maintainerQuoted 10 lines · Meagan Lloyd
Quoted 6 lines · Sasha Levin
This is a note to let you know that I've just added the patch titled
rtc: ds1307: remove clear of oscillator stop flag (OSF) in probe
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summaryHi Sasha,
Quoted 7 lines
FYI, patch 2/2 of the series wasn't applied to 5.4, but was applied to all the other trees.
"rtc: ds1307: handle oscillator stop flag (OSF) for ds1341"
[PATCH 2/2] rtc: ds1307: handle oscillator stop flag (OSF) for ds1341 - Meagan Lloyd <https://lore.kernel.org/all/1749665656-30108-3-git-send-email-meaganlloyd@linux.microsoft.com/>
(upstream commit
523923cfd5d622b8f4ba893fdaf29fa6adeb8c3e)
Looks like it failed to apply :(
Could you send a backport to 5.4 please? Or should I just patch 1/2 from 5.4?
Signature · 2 lines
Thanks, Sasha
PATCH 1/1 rtc: ds1307: handle oscillator stop flag (OSF) for ds1341
[ Upstream commit 523923cfd5d622b8f4ba893fdaf29fa6adeb8c3e ]
In using CONFIG_RTC_HCTOSYS, rtc_hctosys() will sync the RTC time to the kernel time as long as rtc_read_time() succeeds. In some power loss situations, our supercapacitor-backed DS1342 RTC comes up with either an unpredictable future time or the default 01/01/00 from the datasheet. The oscillator stop flag (OSF) is set in these scenarios due to the power loss and can be used to determine the validity of the RTC data.
This change expands the oscillator stop flag (OSF) handling that has already been implemented for some chips to the ds1341 chip (DS1341 and DS1342 share a datasheet). This handling manages the validity of the RTC data in .read_time and .set_time based on the OSF.
[ Git was trying to insert the code above the ds_1388 case statement block (in each respective function) which don't exist in the v5.4.296 rtc-ds1307 driver, thus a manual fixup was required. ]
---
Here's the backport of patch 2/2 of the series for v5.4.
--- drivers/rtc/rtc-ds1307.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/rtc/rtc-ds1307.c +11 -0
@@ -252,6 +252,13 @@ static int ds1307_get_time(struct device *dev, struct rtc_time *t)if (tmp &DS1340_BIT_OSF )return -EINVAL ;break ; +case ds_1341: + ret =regmap_read (ds1307->regmap,DS1337_REG_STATUS , &tmp); +if (ret) +return ret; +if (tmp &DS1337_BIT_OSF ) +return -EINVAL ; +break ;case mcp794xx:if (!(tmp &MCP794XX_BIT_ST ))return -EINVAL ;
@@ -343,6 +350,10 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t)regmap_update_bits (ds1307->regmap,DS1340_REG_FLAG ,DS1340_BIT_OSF ,0 );break ; +case ds_1341: +regmap_update_bits (ds1307->regmap,DS1337_REG_STATUS , +DS1337_BIT_OSF ,0 ); +break ;case mcp794xx:/* * these bits were cleared when preparing the date/time
Signature · 1 line
2.49.0