Merge tag 'tag-chrome-platform-fixes-for-v6.3-rc4' of git://git.kernel.org/pub/scm...

[linux-2.6-block.git] / drivers / rtc / rtc-rv8803.c

diff --git a/drivers/rtc/rtc-rv8803.c b/drivers/rtc/rtc-rv8803.c
index b581b6d5ad731730bbe1f4e18601917cf26f541e..25c3b9e4f515af3dcf6c68d7f689036203935264 100644 (file)
--- a/drivers/rtc/rtc-rv8803.c
+++ b/drivers/rtc/rtc-rv8803.c
@@ -70,6 +70,7 @@ struct rv8803_data {
        struct mutex flags_lock;
        u8 ctrl;
        u8 backup;
+       u8 alarm_invalid:1;
        enum rv8803_type type;
 };
 
@@ -165,13 +166,13 @@ static int rv8803_regs_init(struct rv8803_data *rv8803)
 
 static int rv8803_regs_configure(struct rv8803_data *rv8803);
 
-static int rv8803_regs_reset(struct rv8803_data *rv8803)
+static int rv8803_regs_reset(struct rv8803_data *rv8803, bool full)
 {
        /*
         * The RV-8803 resets all registers to POR defaults after voltage-loss,
         * the Epson RTCs don't, so we manually reset the remainder here.
         */
-       if (rv8803->type == rx_8803 || rv8803->type == rx_8900) {
+       if (full || rv8803->type == rx_8803 || rv8803->type == rx_8900) {
                int ret = rv8803_regs_init(rv8803);
                if (ret)
                        return ret;
@@ -238,6 +239,11 @@ static int rv8803_get_time(struct device *dev, struct rtc_time *tm)
        u8 *date = date1;
        int ret, flags;
 
+       if (rv8803->alarm_invalid) {
+               dev_warn(dev, "Corruption detected, data may be invalid.\n");
+               return -EINVAL;
+       }
+
        flags = rv8803_read_reg(rv8803->client, RV8803_FLAG);
        if (flags < 0)
                return flags;
@@ -313,12 +319,19 @@ static int rv8803_set_time(struct device *dev, struct rtc_time *tm)
                return flags;
        }
 
-       if (flags & RV8803_FLAG_V2F) {
-               ret = rv8803_regs_reset(rv8803);
+       if ((flags & RV8803_FLAG_V2F) || rv8803->alarm_invalid) {
+               /*
+                * If we sense corruption in the alarm registers, but see no
+                * voltage loss flag, we can't rely on other registers having
+                * sensible values. Reset them fully.
+                */
+               ret = rv8803_regs_reset(rv8803, rv8803->alarm_invalid);
                if (ret) {
                        mutex_unlock(&rv8803->flags_lock);
                        return ret;
                }
+
+               rv8803->alarm_invalid = false;
        }
 
        ret = rv8803_write_reg(rv8803->client, RV8803_FLAG,
@@ -344,15 +357,33 @@ static int rv8803_get_alarm(struct device *dev, struct rtc_wkalrm *alrm)
        if (flags < 0)
                return flags;
 
+       alarmvals[0] &= 0x7f;
+       alarmvals[1] &= 0x3f;
+       alarmvals[2] &= 0x3f;
+
+       if (!bcd_is_valid(alarmvals[0]) ||
+           !bcd_is_valid(alarmvals[1]) ||
+           !bcd_is_valid(alarmvals[2]))
+               goto err_invalid;
+
        alrm->time.tm_sec  = 0;
-       alrm->time.tm_min  = bcd2bin(alarmvals[0] & 0x7f);
-       alrm->time.tm_hour = bcd2bin(alarmvals[1] & 0x3f);
-       alrm->time.tm_mday = bcd2bin(alarmvals[2] & 0x3f);
+       alrm->time.tm_min  = bcd2bin(alarmvals[0]);
+       alrm->time.tm_hour = bcd2bin(alarmvals[1]);
+       alrm->time.tm_mday = bcd2bin(alarmvals[2]);
 
        alrm->enabled = !!(rv8803->ctrl & RV8803_CTRL_AIE);
        alrm->pending = (flags & RV8803_FLAG_AF) && alrm->enabled;
 
+       if ((unsigned int)alrm->time.tm_mday > 31 ||
+           (unsigned int)alrm->time.tm_hour >= 24 ||
+           (unsigned int)alrm->time.tm_min >= 60)
+               goto err_invalid;
+
        return 0;
+
+err_invalid:
+       rv8803->alarm_invalid = true;
+       return -EINVAL;
 }
 
 static int rv8803_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
@@ -641,9 +672,14 @@ static int rv8803_probe(struct i2c_client *client)
                return PTR_ERR(rv8803->rtc);
 
        if (client->irq > 0) {
+               unsigned long irqflags = IRQF_TRIGGER_LOW;
+
+               if (dev_fwnode(&client->dev))
+                       irqflags = 0;
+
                err = devm_request_threaded_irq(&client->dev, client->irq,
                                                NULL, rv8803_handle_irq,
-                                               IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+                                               irqflags | IRQF_ONESHOT,
                                                "rv8803", client);
                if (err) {
                        dev_warn(&client->dev, "unable to request IRQ, alarms disabled\n");