mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
handle time panics more gracefully; work around RTC HW issues
- don't hard panic if the time seems wrong; just clear the PDDB entries, and move on. This at least allows the user to intervene to fix the time, intsead of insta-crashing when anything seems wrong and depriving users an opportunity to fix anything - fix HW derpiness by introducing some dummy reads during the resetting of the hardware process. One thing I wanted to do was to have the RTC always powered off of the battery. This is not a default mode but it's an option. In theory, this is a more efficient because anyways, VDD comes from VBAT, right? However, the RTC hardware gets a little side-eye when VBAT is higher than VDD most of the time and reports a strange error code. The power savings is miniscule -- some tens of nanowatts -- so I'm not going to fight with the RTC hardware quirks anymore.
This commit is contained in:
parent
e4caa84463
commit
a4c97a410c
1 changed files with 75 additions and 40 deletions
|
|
@ -51,12 +51,15 @@ const MINS: usize = 2;
|
||||||
const HOURS: usize = 3;
|
const HOURS: usize = 3;
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
const DAYS: usize = 4;
|
const DAYS: usize = 4;
|
||||||
// note 5 is skipped - this is weekdays, and is unused
|
#[allow(dead_code)]
|
||||||
|
const WEEKDAYS: usize = 5;
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
const MONTHS: usize = 6;
|
const MONTHS: usize = 6;
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
const YEARS: usize = 7;
|
const YEARS: usize = 7;
|
||||||
|
|
||||||
|
use llio::RTC_PWR_MODE;
|
||||||
|
|
||||||
/// Do not modify the discriminants in this structure. They are used in `libstd` directly.
|
/// Do not modify the discriminants in this structure. They are used in `libstd` directly.
|
||||||
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
|
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
|
||||||
pub(crate) enum TimeOp {
|
pub(crate) enum TimeOp {
|
||||||
|
|
@ -137,6 +140,47 @@ impl NtpUdpSocket for UdpSocketWrapper {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn reset_rtc(i2c: &mut llio::I2c, start_time: u64, tt: &ticktimer_server::Ticktimer) {
|
||||||
|
log::debug!("performing rtc reset");
|
||||||
|
i2c.i2c_mutex_acquire();
|
||||||
|
// issue a "software reset" of the RTC
|
||||||
|
i2c.i2c_write(ABRTCMC_I2C_ADR, ABRTCMC_CONTROL1, &[0x58]).expect("RTC access error");
|
||||||
|
i2c.i2c_mutex_release();
|
||||||
|
tt.sleep_ms(1100).ok(); // give the RTC 1 second to resume register operations
|
||||||
|
// note: this readback seems necessary to get the RTC to behave after a reset
|
||||||
|
for i in 0..0x14 {
|
||||||
|
let mut d = [0u8; 1];
|
||||||
|
i2c.i2c_mutex_acquire();
|
||||||
|
i2c.i2c_read_no_repeated_start(ABRTCMC_I2C_ADR, i, &mut d).ok();
|
||||||
|
log::debug!("reg {:x}: {:x}", i, d[0]);
|
||||||
|
i2c.i2c_mutex_release();
|
||||||
|
}
|
||||||
|
|
||||||
|
let reset_vals = [
|
||||||
|
0, // clear interrupts, normal run
|
||||||
|
0, // clear interrupts
|
||||||
|
RTC_PWR_MODE, // power mode
|
||||||
|
to_bcd((start_time & 0xFF) as u8 % 60), // seconds
|
||||||
|
to_bcd(((start_time >> 8) & 0xFF) as u8 % 60), // minutes
|
||||||
|
to_bcd(((start_time >> 16) & 0xFF) as u8 % 24), // hours
|
||||||
|
to_bcd(((start_time >> 24) & 0xFF) as u8 % 28 + 1), // days
|
||||||
|
0, // sunday
|
||||||
|
to_bcd(((start_time >> 32) & 0xFF) as u8 % 12 + 1), // months
|
||||||
|
to_bcd(((start_time >> 40) & 0xFF) as u8 % 5 + 1), // years
|
||||||
|
];
|
||||||
|
i2c.i2c_mutex_acquire();
|
||||||
|
log::debug!("writing: {:x?}", reset_vals);
|
||||||
|
i2c.i2c_write(ABRTCMC_I2C_ADR, ABRTCMC_CONTROL1, &reset_vals).expect("RTC access error");
|
||||||
|
i2c.i2c_mutex_release();
|
||||||
|
tt.sleep_ms(1100).ok(); // give the RTC 1 second to resume register operations
|
||||||
|
i2c.i2c_mutex_acquire();
|
||||||
|
let mut readback = [0u8; 10];
|
||||||
|
// this readback seems necessary to get values to "stick" in the RTC
|
||||||
|
i2c.i2c_read_no_repeated_start(ABRTCMC_I2C_ADR, 0, &mut readback).ok();
|
||||||
|
log::debug!("reset readback: {:x?}", readback);
|
||||||
|
i2c.i2c_mutex_release();
|
||||||
|
}
|
||||||
|
|
||||||
pub fn start_time_server() {
|
pub fn start_time_server() {
|
||||||
let rtc_checked = Arc::new(AtomicBool::new(false));
|
let rtc_checked = Arc::new(AtomicBool::new(false));
|
||||||
|
|
||||||
|
|
@ -173,7 +217,7 @@ pub fn start_time_server() {
|
||||||
let mut settings = [0u8; 8];
|
let mut settings = [0u8; 8];
|
||||||
loop {
|
loop {
|
||||||
i2c.i2c_mutex_acquire();
|
i2c.i2c_mutex_acquire();
|
||||||
match i2c.i2c_read(ABRTCMC_I2C_ADR, ABRTCMC_CONTROL3, &mut settings) {
|
match i2c.i2c_read_no_repeated_start(ABRTCMC_I2C_ADR, ABRTCMC_CONTROL3, &mut settings) {
|
||||||
Ok(I2cStatus::ResponseReadOk) => {
|
Ok(I2cStatus::ResponseReadOk) => {
|
||||||
i2c.i2c_mutex_release();
|
i2c.i2c_mutex_release();
|
||||||
break
|
break
|
||||||
|
|
@ -187,23 +231,7 @@ pub fn start_time_server() {
|
||||||
}
|
}
|
||||||
if is_rtc_invalid(&settings) {
|
if is_rtc_invalid(&settings) {
|
||||||
log::warn!("RTC settings were invalid. Re-initializing! {:?}", settings);
|
log::warn!("RTC settings were invalid. Re-initializing! {:?}", settings);
|
||||||
settings[CTL3] = (Control3::BATT_STD_BL_EN).bits();
|
reset_rtc(&mut i2c, trng.get_u64().unwrap(), &tt);
|
||||||
let mut start_time = trng.get_u64().unwrap();
|
|
||||||
// set the clock to a random start time from 1 to 10 years into its maximum range of 100 years
|
|
||||||
settings[SECS] = to_bcd((start_time & 0xFF) as u8 % 60);
|
|
||||||
start_time >>= 8;
|
|
||||||
settings[MINS] = to_bcd((start_time & 0xFF) as u8 % 60);
|
|
||||||
start_time >>= 8;
|
|
||||||
settings[HOURS] = to_bcd((start_time & 0xFF) as u8 % 24);
|
|
||||||
start_time >>= 8;
|
|
||||||
settings[DAYS] = to_bcd((start_time & 0xFF) as u8 % 28 + 1);
|
|
||||||
start_time >>= 8;
|
|
||||||
settings[MONTHS] = to_bcd((start_time & 0xFF) as u8 % 12 + 1);
|
|
||||||
start_time >>= 8;
|
|
||||||
settings[YEARS] = to_bcd((start_time & 0xFF) as u8 % 10 + 1);
|
|
||||||
i2c.i2c_mutex_acquire();
|
|
||||||
i2c.i2c_write(ABRTCMC_I2C_ADR, ABRTCMC_CONTROL3, &settings).expect("RTC access error");
|
|
||||||
i2c.i2c_mutex_release();
|
|
||||||
}
|
}
|
||||||
rtc_checked.store(true, Ordering::SeqCst);
|
rtc_checked.store(true, Ordering::SeqCst);
|
||||||
loop {
|
loop {
|
||||||
|
|
@ -211,23 +239,7 @@ pub fn start_time_server() {
|
||||||
match FromPrimitive::from_usize(msg.body.id()) {
|
match FromPrimitive::from_usize(msg.body.id()) {
|
||||||
Some(PrivTimeOp::ResetRtc) => xous::msg_blocking_scalar_unpack!(msg, _, _, _, _, {
|
Some(PrivTimeOp::ResetRtc) => xous::msg_blocking_scalar_unpack!(msg, _, _, _, _, {
|
||||||
log::warn!("RTC time reset command received.");
|
log::warn!("RTC time reset command received.");
|
||||||
settings[CTL3] = (Control3::BATT_STD_BL_EN).bits();
|
reset_rtc(&mut i2c, trng.get_u64().unwrap(), &tt);
|
||||||
let mut start_time = trng.get_u64().unwrap();
|
|
||||||
// set the clock to a random start time from 1 to 10 years into its maximum range of 100 years
|
|
||||||
settings[SECS] = to_bcd((start_time & 0xFF) as u8 % 60);
|
|
||||||
start_time >>= 8;
|
|
||||||
settings[MINS] = to_bcd((start_time & 0xFF) as u8 % 60);
|
|
||||||
start_time >>= 8;
|
|
||||||
settings[HOURS] = to_bcd((start_time & 0xFF) as u8 % 24);
|
|
||||||
start_time >>= 8;
|
|
||||||
settings[DAYS] = to_bcd((start_time & 0xFF) as u8 % 28 + 1);
|
|
||||||
start_time >>= 8;
|
|
||||||
settings[MONTHS] = to_bcd((start_time & 0xFF) as u8 % 12 + 1);
|
|
||||||
start_time >>= 8;
|
|
||||||
settings[YEARS] = to_bcd((start_time & 0xFF) as u8 % 10 + 1);
|
|
||||||
i2c.i2c_mutex_acquire();
|
|
||||||
i2c.i2c_write(ABRTCMC_I2C_ADR, ABRTCMC_CONTROL3, &settings).expect("RTC access error");
|
|
||||||
i2c.i2c_mutex_release();
|
|
||||||
xous::return_scalar(msg.sender, 0).unwrap();
|
xous::return_scalar(msg.sender, 0).unwrap();
|
||||||
}),
|
}),
|
||||||
Some(PrivTimeOp::SusRes) => xous::msg_scalar_unpack!(msg, token, _, _, _, {
|
Some(PrivTimeOp::SusRes) => xous::msg_scalar_unpack!(msg, token, _, _, _, {
|
||||||
|
|
@ -258,7 +270,20 @@ pub fn start_time_server() {
|
||||||
while !rtc_checked.load(Ordering::SeqCst) {
|
while !rtc_checked.load(Ordering::SeqCst) {
|
||||||
tt.sleep_ms(42).unwrap();
|
tt.sleep_ms(42).unwrap();
|
||||||
}
|
}
|
||||||
let mut start_rtc_secs = llio.get_rtc_secs().expect("couldn't read RTC offset value");
|
let mut start_rtc_secs: u64;
|
||||||
|
// this loop allows us to fail slightly more gracefully in the case that there is an RTC hardware failure
|
||||||
|
loop {
|
||||||
|
match llio.get_rtc_secs() {
|
||||||
|
Ok(s) => {
|
||||||
|
start_rtc_secs = s;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
log::warn!("RTC HW should be initialized, but it's not: {:?}", e);
|
||||||
|
tt.sleep_ms(2000).ok(); // wait before polling again
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
let mut start_tt_ms = tt.elapsed_ms();
|
let mut start_tt_ms = tt.elapsed_ms();
|
||||||
log::trace!("start_rtc_secs: {}", start_rtc_secs);
|
log::trace!("start_rtc_secs: {}", start_rtc_secs);
|
||||||
log::trace!("start_tt_ms: {}", start_tt_ms);
|
log::trace!("start_tt_ms: {}", start_tt_ms);
|
||||||
|
|
@ -372,7 +397,11 @@ pub fn start_time_server() {
|
||||||
start_rtc_secs as i64 * 1000i64
|
start_rtc_secs as i64 * 1000i64
|
||||||
+ (tt.elapsed_ms() - start_tt_ms) as i64
|
+ (tt.elapsed_ms() - start_tt_ms) as i64
|
||||||
+ utc_offset_ms;
|
+ utc_offset_ms;
|
||||||
assert!(t > 0, "time result is negative, this is an error");
|
if t < 0 { // the offset has some error in it, perhaps due to an RTC reset. reset the offset!
|
||||||
|
log::warn!("Time was negative, recovering from time setting error by clearing utc offset to 0");
|
||||||
|
prefs.set_utc_offset(0).ok();
|
||||||
|
utc_offset_ms = 0;
|
||||||
|
}
|
||||||
log::trace!("utc ms {}", t);
|
log::trace!("utc ms {}", t);
|
||||||
xous::return_scalar2(msg.sender,
|
xous::return_scalar2(msg.sender,
|
||||||
(((t as u64) >> 32) & 0xFFFF_FFFF) as usize,
|
(((t as u64) >> 32) & 0xFFFF_FFFF) as usize,
|
||||||
|
|
@ -386,7 +415,13 @@ pub fn start_time_server() {
|
||||||
+ (tt.elapsed_ms() - start_tt_ms) as i64
|
+ (tt.elapsed_ms() - start_tt_ms) as i64
|
||||||
+ utc_offset_ms
|
+ utc_offset_ms
|
||||||
+ tz_offset_ms;
|
+ tz_offset_ms;
|
||||||
assert!(t > 0, "time result is negative, this is an error");
|
if t < 0 {
|
||||||
|
log::warn!("Time was negative, recovering from time setting error by clearing utc and timezone offsets to 0.");
|
||||||
|
prefs.set_utc_offset(0).ok();
|
||||||
|
prefs.set_timezone_offset(0).ok();
|
||||||
|
utc_offset_ms = 0;
|
||||||
|
tz_offset_ms = 0;
|
||||||
|
}
|
||||||
log::trace!("local since epoch {}", t / 1000);
|
log::trace!("local since epoch {}", t / 1000);
|
||||||
xous::return_scalar2(msg.sender,
|
xous::return_scalar2(msg.sender,
|
||||||
(((t as u64) >> 32) & 0xFFFF_FFFF) as usize,
|
(((t as u64) >> 32) & 0xFFFF_FFFF) as usize,
|
||||||
|
|
@ -462,7 +497,7 @@ pub fn start_time_server() {
|
||||||
|
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
fn is_rtc_invalid(settings: &[u8]) -> bool {
|
fn is_rtc_invalid(settings: &[u8]) -> bool {
|
||||||
((settings[CTL3] & 0xE0) != (Control3::BATT_STD_BL_EN).bits()) // power switchover setting should be initialized
|
((settings[CTL3] & 0xE0) != RTC_PWR_MODE) // power switchover setting should be initialized
|
||||||
|| ((settings[SECS] & 0x80) != 0) // clock integrity should be guaranteed
|
|| ((settings[SECS] & 0x80) != 0) // clock integrity should be guaranteed
|
||||||
|| (to_binary(settings[SECS]) > 59)
|
|| (to_binary(settings[SECS]) > 59)
|
||||||
|| (to_binary(settings[MINS]) > 59)
|
|| (to_binary(settings[MINS]) > 59)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue