mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
Merge pull request #873 from betrusted-io/fix-race-condition
fix startup race-condition on baosec platform
This commit is contained in:
commit
ce0e719196
4 changed files with 20 additions and 16 deletions
|
|
@ -143,15 +143,11 @@ fn main() {
|
||||||
servers::susres::start_susres_service();
|
servers::susres::start_susres_service();
|
||||||
|
|
||||||
// these two servers need to start so that update_perclk calls can succeed
|
// these two servers need to start so that update_perclk calls can succeed
|
||||||
let clk_mgr = bao1x_hal_service::ClockManager::new();
|
|
||||||
servers::i2c::start_i2c_service();
|
servers::i2c::start_i2c_service();
|
||||||
servers::others::start_peri_service(clk_mgr.get_per());
|
servers::others::start_peri_service();
|
||||||
let i2c_conn =
|
|
||||||
xns.request_connection(SERVER_NAME_BAO1X_I2C).expect("Couldn't connect to bao1x I2C server");
|
|
||||||
let peri_conn =
|
|
||||||
xns.request_connection(SERVER_NAME_BAO1X_OTHERS).expect("Couldn't connect to bao1x misc peri server");
|
|
||||||
|
|
||||||
std::thread::spawn(move || {
|
std::thread::spawn(move || {
|
||||||
|
let xns = xous_names::XousNames::new().unwrap();
|
||||||
let mut ifram_allocs = [Vec::new(), Vec::new()];
|
let mut ifram_allocs = [Vec::new(), Vec::new()];
|
||||||
// code is written assuming the IFRAM blocks have the same size. Since this is fixed in
|
// code is written assuming the IFRAM blocks have the same size. Since this is fixed in
|
||||||
// hardware, it's a good assumption; but the assert is put here in case we port this to
|
// hardware, it's a good assumption; but the assert is put here in case we port this to
|
||||||
|
|
@ -259,6 +255,12 @@ fn main() {
|
||||||
// we want a static array defined like this.
|
// we want a static array defined like this.
|
||||||
let mut irq_table: [Option<IrqLocalRegistration>; 8] = [const { None }; 8];
|
let mut irq_table: [Option<IrqLocalRegistration>; 8] = [const { None }; 8];
|
||||||
|
|
||||||
|
let i2c_conn =
|
||||||
|
xns.request_connection(SERVER_NAME_BAO1X_I2C).expect("Couldn't connect to bao1x I2C server");
|
||||||
|
let peri_conn = xns
|
||||||
|
.request_connection(SERVER_NAME_BAO1X_OTHERS)
|
||||||
|
.expect("Couldn't connect to bao1x misc peri server");
|
||||||
|
|
||||||
let mut msg_opt = None;
|
let mut msg_opt = None;
|
||||||
log::debug!("Starting main loop");
|
log::debug!("Starting main loop");
|
||||||
loop {
|
loop {
|
||||||
|
|
@ -641,7 +643,7 @@ fn main() {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
servers::bio::start_bio_service(clk_mgr.get_fclk());
|
servers::bio::start_bio_service();
|
||||||
|
|
||||||
servers::keyboard::start_keyboard_service();
|
servers::keyboard::start_keyboard_service();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,13 +2,13 @@ use bao1x_api::bio::*;
|
||||||
use bao1x_api::bio_resources::*;
|
use bao1x_api::bio_resources::*;
|
||||||
use bao1x_hal::bio_hw;
|
use bao1x_hal::bio_hw;
|
||||||
|
|
||||||
pub fn start_bio_service(clk_freq: u32) {
|
pub fn start_bio_service() {
|
||||||
std::thread::spawn(move || {
|
std::thread::spawn(move || {
|
||||||
bio_service(clk_freq);
|
bio_service();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
fn bio_service(clk_freq: u32) {
|
fn bio_service() {
|
||||||
let xns = xous_names::XousNames::new().unwrap();
|
let xns = xous_names::XousNames::new().unwrap();
|
||||||
// claim the server name
|
// claim the server name
|
||||||
let sid = xns.register_name(BIO_SERVER_NAME, None).unwrap();
|
let sid = xns.register_name(BIO_SERVER_NAME, None).unwrap();
|
||||||
|
|
@ -18,7 +18,8 @@ fn bio_service(clk_freq: u32) {
|
||||||
#[cfg(feature = "oem-baosec-lite")]
|
#[cfg(feature = "oem-baosec-lite")]
|
||||||
let led_conn = xns.request_connection_blocking("_oem_led_").unwrap();
|
let led_conn = xns.request_connection_blocking("_oem_led_").unwrap();
|
||||||
|
|
||||||
let mut bio_ss = bio_hw::BioSharedState::new(clk_freq);
|
let clk_mgr = bao1x_hal_service::ClockManager::new();
|
||||||
|
let mut bio_ss = bio_hw::BioSharedState::new(clk_mgr.get_fclk());
|
||||||
let mut msg_opt = None;
|
let mut msg_opt = None;
|
||||||
loop {
|
loop {
|
||||||
xous::reply_and_receive_next(sid, &mut msg_opt).unwrap();
|
xous::reply_and_receive_next(sid, &mut msg_opt).unwrap();
|
||||||
|
|
|
||||||
|
|
@ -7,15 +7,15 @@ use bao1x_api::{IoxDir, IoxEnable, IoxFunction, PeripheralOpcode, SERVER_NAME_BA
|
||||||
use bao1x_hal::udma::{Adc, AdcExtChannel, AdcSource};
|
use bao1x_hal::udma::{Adc, AdcExtChannel, AdcSource};
|
||||||
use bao1x_hal_service::UdmaGlobal;
|
use bao1x_hal_service::UdmaGlobal;
|
||||||
|
|
||||||
pub fn start_peri_service(clk_freq: u32) {
|
pub fn start_peri_service() {
|
||||||
let _ = std::thread::spawn({
|
let _ = std::thread::spawn({
|
||||||
move || {
|
move || {
|
||||||
peri_service(clk_freq);
|
peri_service();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
fn peri_service(clk_freq: u32) -> ! {
|
fn peri_service() -> ! {
|
||||||
let xns = xous_names::XousNames::new().unwrap();
|
let xns = xous_names::XousNames::new().unwrap();
|
||||||
// claim the server name
|
// claim the server name
|
||||||
let sid = xns.register_name(SERVER_NAME_BAO1X_OTHERS, None).unwrap();
|
let sid = xns.register_name(SERVER_NAME_BAO1X_OTHERS, None).unwrap();
|
||||||
|
|
@ -23,8 +23,9 @@ fn peri_service(clk_freq: u32) -> ! {
|
||||||
let iox = crate::iox::IoxHal::new();
|
let iox = crate::iox::IoxHal::new();
|
||||||
let udma_global = UdmaGlobal::new();
|
let udma_global = UdmaGlobal::new();
|
||||||
udma_global.udma_clock_config(bao1x_api::PeriphId::Adc, true);
|
udma_global.udma_clock_config(bao1x_api::PeriphId::Adc, true);
|
||||||
|
let clk_mgr = bao1x_hal_service::ClockManager::new();
|
||||||
// safety: clocks are turned on, and perclk already configured as so
|
// safety: clocks are turned on, and perclk already configured as so
|
||||||
let mut adc = unsafe { Adc::new(clk_freq) };
|
let mut adc = unsafe { Adc::new(clk_mgr.get_per()) };
|
||||||
|
|
||||||
let mut msg_opt = None;
|
let mut msg_opt = None;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ use core::num::NonZeroUsize;
|
||||||
|
|
||||||
use aes::Aes256;
|
use aes::Aes256;
|
||||||
use aes::cipher::{BlockDecrypt, BlockEncrypt};
|
use aes::cipher::{BlockDecrypt, BlockEncrypt};
|
||||||
use subtle::ConstantTimeEq;
|
|
||||||
use cipher::generic_array::GenericArray;
|
use cipher::generic_array::GenericArray;
|
||||||
use curve25519_dalek::scalar::Scalar;
|
use curve25519_dalek::scalar::Scalar;
|
||||||
use curve25519_dalek::{EdwardsPoint, edwards::CompressedEdwardsY};
|
use curve25519_dalek::{EdwardsPoint, edwards::CompressedEdwardsY};
|
||||||
|
|
@ -23,6 +22,7 @@ use precursor_hal::board::*;
|
||||||
use rand_core::RngCore;
|
use rand_core::RngCore;
|
||||||
use root_keys::key2bits::*;
|
use root_keys::key2bits::*;
|
||||||
use sha2::{Digest, Sha256, Sha512_256Sw, Sha512Hw, Sha512Sw};
|
use sha2::{Digest, Sha256, Sha512_256Sw, Sha512Hw, Sha512Sw};
|
||||||
|
use subtle::ConstantTimeEq;
|
||||||
use utralib::generated::*;
|
use utralib::generated::*;
|
||||||
use ux_api::service::api::BulkRead;
|
use ux_api::service::api::BulkRead;
|
||||||
use xous_semver::SemVer;
|
use xous_semver::SemVer;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue