From d26b04f0433d93190bfa62e75daa24ff669c0e2f Mon Sep 17 00:00:00 2001 From: hanatonikkou Date: Wed, 15 Apr 2026 14:14:00 +0200 Subject: [PATCH] allow changing fclk through susres server --- libs/bao1x-hal/src/clocks.rs | 13 ++++++++++++ services/bao1x-hal-service/src/api.rs | 12 ----------- services/bao1x-hal-service/src/lib.rs | 3 +-- .../bao1x-hal-service/src/servers/susres.rs | 20 +++++++++++++++++-- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/libs/bao1x-hal/src/clocks.rs b/libs/bao1x-hal/src/clocks.rs index 789f85361..657af914c 100644 --- a/libs/bao1x-hal/src/clocks.rs +++ b/libs/bao1x-hal/src/clocks.rs @@ -46,6 +46,19 @@ pub struct PmuControl { pmu_0p8v_dig_hv_ena: bool, } +#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive)] +pub enum ClockOp { + GetVco, + GetFclk, + GetAclk, + GetHclk, + GetIclk, + GetPclk, + GetPer, + SetFclk, + DeepSleep, +} + /// Requires: /// `freq_hz`: target frequency of PLL - generally it is 2x of the CPU clock frequency /// `daric_cgu`: Pointer to SYSCTL_BASE - for setting clocks diff --git a/services/bao1x-hal-service/src/api.rs b/services/bao1x-hal-service/src/api.rs index 8ae1aa918..e611317f2 100644 --- a/services/bao1x-hal-service/src/api.rs +++ b/services/bao1x-hal-service/src/api.rs @@ -20,15 +20,3 @@ pub enum TimeOp { /// Serialize the internal state for storage across reboots GetState = 1024, } - -#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive)] -pub enum ClockOp { - GetVco, - GetFclk, - GetAclk, - GetHclk, - GetIclk, - GetPclk, - GetPer, - DeepSleep, -} diff --git a/services/bao1x-hal-service/src/lib.rs b/services/bao1x-hal-service/src/lib.rs index b2e295531..a7eb0add8 100644 --- a/services/bao1x-hal-service/src/lib.rs +++ b/services/bao1x-hal-service/src/lib.rs @@ -3,12 +3,11 @@ pub mod trng; use bao1x_api::*; use bao1x_hal::udma::{AdcExtChannel, AdcSource}; +use bao1x_hal::clocks::ClockOp; use num_traits::*; use xous::{Message, send_message}; use xous_api_susres::api::Opcode as SusresOp; -use crate::api::ClockOp; - pub struct UdmaGlobal { conn: xous::CID, } diff --git a/services/bao1x-hal-service/src/servers/susres.rs b/services/bao1x-hal-service/src/servers/susres.rs index f21e4936a..b367cf6c4 100644 --- a/services/bao1x-hal-service/src/servers/susres.rs +++ b/services/bao1x-hal-service/src/servers/susres.rs @@ -5,8 +5,9 @@ use utralib::*; use xous::{CID, Message, msg_blocking_scalar_unpack, msg_scalar_unpack, send_message, sender::Sender}; use xous_api_susres::*; use xous_ipc::Buffer; +use bao1x_api::divide_by_fd; +use bao1x_hal::clocks::{fd_from_frequency,ClockOp}; -use crate::api::ClockOp; static TIMEOUT_TIME: AtomicU32 = AtomicU32::new(5000); @@ -376,7 +377,7 @@ fn susres_service() { }), Some(Opcode::Quit) => break, Some(Opcode::PlatformSpecific) => { - msg_blocking_scalar_unpack!(msg, op, _arg2, _arg3, _arg4, { + msg_blocking_scalar_unpack!(msg, op, arg2, _arg3, _arg4, { let platform_op = FromPrimitive::from_usize(op); match platform_op { Some(ClockOp::GetVco) => { @@ -400,6 +401,21 @@ fn susres_service() { Some(ClockOp::GetPer) => { xous::return_scalar(msg.sender, clk_mgr.perclk as usize).unwrap() } + Some(ClockOp::SetFclk) => { + const MAX_DEVIATION: f32 = 0.05; + let requested_freq = arg2 as u32; + let fclk_fd = fd_from_frequency(requested_freq, clk_mgr.clktop); + let achievable_freq = divide_by_fd(fclk_fd, clk_mgr.clktop); + if (1.0 - (achievable_freq as f32 / requested_freq as f32)).abs() < MAX_DEVIATION { + clk_mgr.set_fclk_fd(fclk_fd as u8); + clk_mgr.update_clocks(); + log::info!("Changed fclk to {}", clk_mgr.fclk); + xous::return_scalar2(msg.sender, 1, achievable_freq as usize).unwrap(); + } else { + // let user know closest achievable frequency + xous::return_scalar2(msg.sender, 0, achievable_freq as usize).unwrap(); + } + } Some(ClockOp::DeepSleep) => { log::info!("entering deep sleep"); clk_mgr.deep_sleep();