Skip to content

Commit

Permalink
rtc: pcf8523: don't return invalid date when battery is low
Browse files Browse the repository at this point in the history
commit ecb4a35 upstream.

The RTC_VL_READ ioctl reports the low battery condition. Still,
pcf8523_rtc_read_time() happily returns invalid dates in this case.
Check the battery health on pcf8523_rtc_read_time() to avoid that.

Reported-by: Erik Čuk <erik.cuk@domel.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Baruch Siach authored and Greg Kroah-Hartman committed Jun 19, 2019
1 parent 488beee commit 3177ab5
Showing 1 changed file with 24 additions and 8 deletions.
32 changes: 24 additions & 8 deletions drivers/rtc/rtc-pcf8523.c
Original file line number Diff line number Diff line change
@@ -82,6 +82,18 @@ static int pcf8523_write(struct i2c_client *client, u8 reg, u8 value)
return 0;
}

static int pcf8523_voltage_low(struct i2c_client *client)
{
u8 value;
int err;

err = pcf8523_read(client, REG_CONTROL3, &value);
if (err < 0)
return err;

return !!(value & REG_CONTROL3_BLF);
}

static int pcf8523_select_capacitance(struct i2c_client *client, bool high)
{
u8 value;
@@ -164,6 +176,14 @@ static int pcf8523_rtc_read_time(struct device *dev, struct rtc_time *tm)
struct i2c_msg msgs[2];
int err;

err = pcf8523_voltage_low(client);
if (err < 0) {
return err;
} else if (err > 0) {
dev_err(dev, "low voltage detected, time is unreliable\n");
return -EINVAL;
}

msgs[0].addr = client->addr;
msgs[0].flags = 0;
msgs[0].len = 1;
@@ -248,17 +268,13 @@ static int pcf8523_rtc_ioctl(struct device *dev, unsigned int cmd,
unsigned long arg)
{
struct i2c_client *client = to_i2c_client(dev);
u8 value;
int ret = 0, err;
int ret;

switch (cmd) {
case RTC_VL_READ:
err = pcf8523_read(client, REG_CONTROL3, &value);
if (err < 0)
return err;

if (value & REG_CONTROL3_BLF)
ret = 1;
ret = pcf8523_voltage_low(client);
if (ret < 0)
return ret;

if (copy_to_user((void __user *)arg, &ret, sizeof(int)))
return -EFAULT;

0 comments on commit 3177ab5

Please sign in to comment.