Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

rtc: pcf8523: properly handle oscillator stop bit

The time and date register of the pcf8223 are undefined after a power
reset. Properly handle the OS bit and return -EINVAL when that bit is set.

It is properly removed when setting the time.

This solves an issue where the time and date may be valid for
rtc_valid_tm() but is not the current time.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

+3 -22
+3 -22
drivers/rtc/rtc-pcf8523.c
··· 178 178 if (err < 0) 179 179 return err; 180 180 181 - if (regs[0] & REG_SECONDS_OS) { 182 - /* 183 - * If the oscillator was stopped, try to clear the flag. Upon 184 - * power-up the flag is always set, but if we cannot clear it 185 - * the oscillator isn't running properly for some reason. The 186 - * sensible thing therefore is to return an error, signalling 187 - * that the clock cannot be assumed to be correct. 188 - */ 189 - 190 - regs[0] &= ~REG_SECONDS_OS; 191 - 192 - err = pcf8523_write(client, REG_SECONDS, regs[0]); 193 - if (err < 0) 194 - return err; 195 - 196 - err = pcf8523_read(client, REG_SECONDS, &regs[0]); 197 - if (err < 0) 198 - return err; 199 - 200 - if (regs[0] & REG_SECONDS_OS) 201 - return -EAGAIN; 202 - } 181 + if (regs[0] & REG_SECONDS_OS) 182 + return -EINVAL; 203 183 204 184 tm->tm_sec = bcd2bin(regs[0] & 0x7f); 205 185 tm->tm_min = bcd2bin(regs[1] & 0x7f); ··· 215 235 return err; 216 236 217 237 regs[0] = REG_SECONDS; 238 + /* This will purposely overwrite REG_SECONDS_OS */ 218 239 regs[1] = bin2bcd(tm->tm_sec); 219 240 regs[2] = bin2bcd(tm->tm_min); 220 241 regs[3] = bin2bcd(tm->tm_hour);