From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933011AbcFUHZ7 (ORCPT ); Tue, 21 Jun 2016 03:25:59 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35904 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754327AbcFUHYY (ORCPT ); Tue, 21 Jun 2016 03:24:24 -0400 From: Andrey Smirnov To: rtc-linux@googlegroups.com Cc: Andrey Smirnov , Alessandro Zummo , Alexandre Belloni , linux-kernel@vger.kernel.org, cphealy@gmail.com Subject: [PATCH v2 13/17] RTC: ds1307: Report oscillator problems more intelligently Date: Tue, 21 Jun 2016 00:22:46 -0700 Message-Id: <1466493770-11895-12-git-send-email-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1466493770-11895-1-git-send-email-andrew.smirnov@gmail.com> References: <1466493770-11895-1-git-send-email-andrew.smirnov@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Report oscillator problems more intelligently, by printing more information about what cause the issue and not yelling "SET TIME!" at the user. Signed-off-by: Andrey Smirnov --- drivers/rtc/rtc-ds1307.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index 2af9c00..2169e5b 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -1424,6 +1424,19 @@ static int ds1307_chip_configure(const struct ds1307 *ds1307) return 0; } +static void ds1307_report_clock_halt(const struct ds1307 *ds1307) +{ + dev_warn(&ds1307->client->dev, "RTC's oscillator is turned off. " + "Turning it on. Please set time"); +} + +static void ds1307_report_oscillator_fault(const struct ds1307 *ds1307) +{ + dev_warn(&ds1307->client->dev, "RTC's reported oscillator fault. " + "Clearing the fault flag and re-reading RTC status. " + "Please set time"); +} + static int ds1307_chip_sanity_check(const struct ds1307 *ds1307) { int tmp, retries; @@ -1453,7 +1466,7 @@ static int ds1307_chip_sanity_check(const struct ds1307 *ds1307) if (tmp & DS1307_BIT_CH) { i2c_smbus_write_byte_data(client, DS1307_REG_SECS, 0); - dev_warn(&client->dev, "SET TIME!\n"); + ds1307_report_clock_halt(ds1307); continue; } break; @@ -1469,15 +1482,17 @@ static int ds1307_chip_sanity_check(const struct ds1307 *ds1307) DS1307_REG_CONTROL, regs[DS1307_REG_CONTROL] & ~DS1338_BIT_OSF); - dev_warn(&client->dev, "SET TIME!\n"); + ds1307_report_oscillator_fault(ds1307); continue; } break; case ds_1340: /* clock halted? turn it on, so clock can tick. */ - if (tmp & DS1340_BIT_nEOSC) + if (tmp & DS1340_BIT_nEOSC) { i2c_smbus_write_byte_data(client, DS1307_REG_SECS, 0); + ds1307_report_clock_halt(ds1307); + } tmp = i2c_smbus_read_byte_data(client, DS1340_REG_FLAG); if (tmp < 0) { @@ -1489,7 +1504,7 @@ static int ds1307_chip_sanity_check(const struct ds1307 *ds1307) if (tmp & DS1340_BIT_OSF) { i2c_smbus_write_byte_data(client, DS1340_REG_FLAG, 0); - dev_warn(&client->dev, "SET TIME!\n"); + ds1307_report_oscillator_fault(ds1307); } return 0; @@ -1500,6 +1515,9 @@ static int ds1307_chip_sanity_check(const struct ds1307 *ds1307) DS1307_REG_WDAY, regs[DS1307_REG_WDAY] | MCP794XX_BIT_VBATEN); + dev_warn(&client->dev, + "battery backup was disabled. " + "Re-enabling it\n"); } /* clock halted? turn it on, so clock can tick. */ @@ -1507,7 +1525,7 @@ static int ds1307_chip_sanity_check(const struct ds1307 *ds1307) i2c_smbus_write_byte_data(client, DS1307_REG_SECS, MCP794XX_BIT_ST); - dev_warn(&client->dev, "SET TIME!\n"); + ds1307_report_clock_halt(ds1307); continue; } -- 2.5.5