Hi,
Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> writes:
> Hello Arnaud,
>
> On Wed, Nov 05, 2014 at 10:42:25PM +0100, Arnaud Ebalard wrote:
>> When Intersil ISL12057 support was added by commit 70e123373c05 ("rtc:
>> Add support for Intersil ISL12057 I2C RTC chip"), two masks for time
>> registers values imported from the device were either wrong or
>> omitted, leading to additional bits from those registers to impact
>> read values:
>>
>> - mask for hour register value when reading it in AM/PM mode. As
>> AM/PM mode is not the usual mode used by the driver, this error
>> would only have an impact on an externally configured RTC hour
>> later read by the driver.
>> - mask for month value. The lack of masking would provide an
>> erroneous value if century bit is set.
>>
>> This patch fixes those two masks.
>>
>> Fixes: 70e123373c05 ("rtc: Add support for Intersil ISL12057 I2C RTC chip")
>> Signed-off-by: Arnaud Ebalard <arno@xxxxxxxxxxxx>
>> ---
>> drivers/rtc/rtc-isl12057.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/rtc/rtc-isl12057.c b/drivers/rtc/rtc-isl12057.c
>> index 455b601d731d..8132fbc7e10a 100644
>> --- a/drivers/rtc/rtc-isl12057.c
>> +++ b/drivers/rtc/rtc-isl12057.c
>> @@ -88,7 +88,7 @@ static void isl12057_rtc_regs_to_tm(struct rtc_time *tm, u8 *regs)
>> tm->tm_min = bcd2bin(regs[ISL12057_REG_RTC_MN]);
>>
>> if (regs[ISL12057_REG_RTC_HR] & ISL12057_REG_RTC_HR_MIL) { /* AM/PM */
>> - tm->tm_hour = bcd2bin(regs[ISL12057_REG_RTC_HR] & 0x0f);
>> + tm->tm_hour = bcd2bin(regs[ISL12057_REG_RTC_HR] & 0x1f);
>> if (regs[ISL12057_REG_RTC_HR] & ISL12057_REG_RTC_HR_PM)
>> tm->tm_hour += 12;
>> } else { /* 24 hour mode */
>> @@ -96,8 +96,8 @@ static void isl12057_rtc_regs_to_tm(struct rtc_time *tm, u8 *regs)
>> }
>>
>> tm->tm_mday = bcd2bin(regs[ISL12057_REG_RTC_DT]);
>> - tm->tm_wday = bcd2bin(regs[ISL12057_REG_RTC_DW]) - 1; /* starts at 1 */
>> + tm->tm_wday = bcd2bin(regs[ISL12057_REG_RTC_DW]) - 1; /* starts at 1 */
> unrelated change?
yep, will remove it.
>> - tm->tm_mon = bcd2bin(regs[ISL12057_REG_RTC_MO]) - 1; /* starts at 1 */
>> + tm->tm_mon = bcd2bin(regs[ISL12057_REG_RTC_MO] & 0x1f) - 1; /* ditto */
>> tm->tm_year = bcd2bin(regs[ISL12057_REG_RTC_YR]) + 100;
>> }
> This patch definitly improves the driver, still I see room for more
> improvement (all but the first issue are unrelated to this patch):
>
> - There is a century bit in the RTC_MO driver that is now correctly
> masked to determine the month. Shouldn't it be used to flag if year
> is >= 2100? That seems to match the hardware leap year handling.
> (I.e. it considers RTC_YR=0 not to be a leap year iff RTC_MO_CENTURY
> is set.)
>
> - I wonder how tm_wday should be handled. It seems to be hardly used by
> callers of rtc_read_time. Is it better to report the hardware state
> here or the weekday matching year/month/day?
>
> - IMHO the probe function shouldn't clear the OSCILLATOR FAILURE BIT
> (OSF). It's an indicator that the stored time is wrong. Instead this
> bit should be evaluated in the read_time callback. (If it's set,
> return -ENODATA.) And only clear the bit in .set_time when the
> registers were updated. I think most drivers get that wrong.
Thanks for your feedback. I will take a look at those after alarm
support is ok.
Cheers,
a+
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
