From 0c7c90fb781e5b241f9cbcde8ee6cf30745543c2 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 28 Oct 2022 02:55:42 +0800 Subject: [PATCH] have the core spinor routines automatically retry on failure normally we never see these failures, but, as we are seeing flash wear-out on the CI machine the writes can take long enough that we get some concurrent requests. As a work-around, just automatically retry a few times before throwing the error back to the caller. --- services/spinor/src/lib.rs | 60 ++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/services/spinor/src/lib.rs b/services/spinor/src/lib.rs index 7c0a46c8e..134ab8f0e 100644 --- a/services/spinor/src/lib.rs +++ b/services/spinor/src/lib.rs @@ -174,17 +174,25 @@ impl Spinor { // acquire a write lock on the unit #[cfg(not(test))] { - let response = send_message(self.conn, - Message::new_blocking_scalar(Opcode::AcquireExclusive.to_usize().unwrap(), - self.token[0] as usize, - self.token[1] as usize, - self.token[2] as usize, - self.token[3] as usize, - ) - ).expect("couldn't send AcquireExclusive message to Spinor hardware!"); - if let xous::Result::Scalar1(result) = response { - if result == 0 { - return Err(SpinorError::BusyTryAgain) + const RETRY_LIMIT: usize = 5; + for i in 0..RETRY_LIMIT { + let response = send_message(self.conn, + Message::new_blocking_scalar(Opcode::AcquireExclusive.to_usize().unwrap(), + self.token[0] as usize, + self.token[1] as usize, + self.token[2] as usize, + self.token[3] as usize, + ) + ).expect("couldn't send AcquireExclusive message to Spinor hardware!"); + if let xous::Result::Scalar1(result) = response { + if result == 0 { + if i == RETRY_LIMIT - 1 { + return Err(SpinorError::BusyTryAgain) + } + xous::yield_slice(); + } else { + break; + } } } } @@ -235,17 +243,25 @@ impl Spinor { // acquire a write lock on the unit #[cfg(not(test))] { - let response = send_message(self.conn, - Message::new_blocking_scalar(Opcode::AcquireExclusive.to_usize().unwrap(), - self.token[0] as usize, - self.token[1] as usize, - self.token[2] as usize, - self.token[3] as usize, - ) - ).expect("couldn't send AcquireExclusive message to Spinor hardware!"); - if let xous::Result::Scalar1(result) = response { - if result == 0 { - return Err(SpinorError::BusyTryAgain) + const RETRY_LIMIT: usize = 5; + for i in 0..RETRY_LIMIT { + let response = send_message(self.conn, + Message::new_blocking_scalar(Opcode::AcquireExclusive.to_usize().unwrap(), + self.token[0] as usize, + self.token[1] as usize, + self.token[2] as usize, + self.token[3] as usize, + ) + ).expect("couldn't send AcquireExclusive message to Spinor hardware!"); + if let xous::Result::Scalar1(result) = response { + if result == 0 { + if i == RETRY_LIMIT - 1 { + return Err(SpinorError::BusyTryAgain) + } + xous::yield_slice(); + } else { + break; + } } } }