]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
rtc: stm32: use the proper register sequence to read date/time
authorAntonio Borneo <antonio.borneo@foss.st.com>
Wed, 5 Jul 2023 17:43:51 +0000 (19:43 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Thu, 27 Jul 2023 21:03:33 +0000 (23:03 +0200)
Date and time are read from two separate RTC registers.
To ensure consistency between the two registers, reading the time
register locks the values in the shadow date register until the
date register is read.
Thus, the whole date/time read requires reading the time register
first, followed by reading the date register.
If the reads are done in reversed order, the shadow date register
will remain locked until a future read operation. The future read
will read the former date value that could be already invalid.

Fix the read order of date/time registers in stm32_rtc_valid_alrm()

Signed-off-by: Antonio Borneo <antonio.borneo@foss.st.com>
Signed-off-by: Valentin Caron <valentin.caron@foss.st.com>
Link: https://lore.kernel.org/r/20230705174357.353616-2-valentin.caron@foss.st.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-stm32.c

index 3d36e11cff80c291fc8197612ab4e0f672c59a2f..abb77ad774a1c70e764d1b3a27cf427cfab39044 100644 (file)
@@ -429,8 +429,8 @@ static int stm32_rtc_valid_alrm(struct stm32_rtc *rtc, struct rtc_time *tm)
 {
        const struct stm32_rtc_registers *regs = &rtc->data->regs;
        int cur_day, cur_mon, cur_year, cur_hour, cur_min, cur_sec;
-       unsigned int dr = readl_relaxed(rtc->base + regs->dr);
        unsigned int tr = readl_relaxed(rtc->base + regs->tr);
+       unsigned int dr = readl_relaxed(rtc->base + regs->dr);
 
        cur_day = (dr & STM32_RTC_DR_DATE) >> STM32_RTC_DR_DATE_SHIFT;
        cur_mon = (dr & STM32_RTC_DR_MONTH) >> STM32_RTC_DR_MONTH_SHIFT;