svn commit: r271562 - head/sys/mips/cavium

[Alexander Kabaev]

Author: kan
Date: Sun Sep 14 00:02:40 2014
New Revision: 271562
URL: http://svnweb.freebsd.org/changeset/base/271562

Log:
  Fix RTC clock writes on many Octeon boards.
  
  The struct clocktime uses 0-based week day number, so back out part of
  r229161 by gonzo, which actually broke the RTC clock writes on Sundays.

Modified:
  head/sys/mips/cavium/octeon_ds1337.c

Modified: head/sys/mips/cavium/octeon_ds1337.c
==============================================================================
--- head/sys/mips/cavium/octeon_ds1337.c	Sun Sep 14 00:02:37 2014	(r271561)
+++ head/sys/mips/cavium/octeon_ds1337.c	Sun Sep 14 00:02:40 2014	(r271562)
@@ -81,7 +81,7 @@ static int validate_ct_struct(struct clo
     CT_CHECK(ct->min < 0  || ct->min > 59,  "minute");
     CT_CHECK(ct->hour < 0 || ct->hour > 23, "hour");
     CT_CHECK(ct->day < 1 || ct->day > 31, "day");
-    CT_CHECK(ct->dow < 1 || ct->dow > 7,  "day of week");
+    CT_CHECK(ct->dow < 0 || ct->dow > 6,  "day of week");
     CT_CHECK(ct->mon < 1  || ct->mon > 12,  "month");
     CT_CHECK(ct->year > 2037,"year");
 
@@ -124,7 +124,7 @@ uint32_t cvmx_rtc_ds1337_read(void)
     {
 	ct.hour = (ct.hour + 12) % 24;
     }
-    ct.dow = (reg[3] & 0x7);         /* Day of week field is 1..7 */
+    ct.dow = (reg[3] & 0x7) - 1; /* Day of week field is 0..6 */
     ct.day = bcd2bin(reg[4] & 0x3f);
     ct.mon  = bcd2bin(reg[5] & 0x1f); /* Month field is 1..12 */
 #if defined(OCTEON_BOARD_CAPK_0100ND)
@@ -136,7 +136,6 @@ uint32_t cvmx_rtc_ds1337_read(void)
     ct.year = ((reg[5] & 0x80) ? 2000 : 1900) + bcd2bin(reg[6]);
 #endif
 
-
     if (validate_ct_struct(&ct))
 	cvmx_dprintf("Warning: RTC calendar is not configured properly\n");
 
@@ -174,13 +173,15 @@ int cvmx_rtc_ds1337_write(uint32_t time)
     reg[0] = bin2bcd(ct.sec);
     reg[1] = bin2bcd(ct.min);
     reg[2] = bin2bcd(ct.hour);       /* Force 0..23 format even if using AM/PM */
-    reg[3] = bin2bcd(ct.dow);
+    reg[3] = bin2bcd(ct.dow + 1);
     reg[4] = bin2bcd(ct.day);
     reg[5] = bin2bcd(ct.mon);
+#if !defined(OCTEON_BOARD_CAPK_0100ND)
     if (ct.year >= 2000)             /* Set century bit*/
     {
 	reg[5] |= 0x80;
     }
+#endif
     reg[6] = bin2bcd(ct.year % 100);
 
     /* Lockless write: detects the infrequent roll-over and retries */