diff --git a/bao1x-boot/boot0/src/platform/bao1x/bao1x.rs b/bao1x-boot/boot0/src/platform/bao1x/bao1x.rs index bef13a2a3..f0f92df91 100644 --- a/bao1x-boot/boot0/src/platform/bao1x/bao1x.rs +++ b/bao1x-boot/boot0/src/platform/bao1x/bao1x.rs @@ -362,10 +362,10 @@ pub unsafe fn init_clock_asic_350mhz() -> u32 { let perclk = 175000000; // turn off gates - daric_cgu.add(utra::sysctrl::SFR_ACLKGR.offset()).write_volatile(0xff); - daric_cgu.add(utra::sysctrl::SFR_HCLKGR.offset()).write_volatile(0xff); - daric_cgu.add(utra::sysctrl::SFR_ICLKGR.offset()).write_volatile(0xff); - daric_cgu.add(utra::sysctrl::SFR_PCLKGR.offset()).write_volatile(0xff); + daric_cgu.add(utra::sysctrl::SFR_ACLKGR.offset()).write_volatile(0x00); // mbox/qfc turned off + daric_cgu.add(utra::sysctrl::SFR_HCLKGR.offset()).write_volatile(0x02); // mdma off, sce on + daric_cgu.add(utra::sysctrl::SFR_ICLKGR.offset()).write_volatile(0x90); // bio/udc enable + daric_cgu.add(utra::sysctrl::SFR_PCLKGR.offset()).write_volatile(0x80); // enable mesh // commit dividers daric_cgu.add(utra::sysctrl::SFR_CGUSET.offset()).write_volatile(0x32); @@ -427,9 +427,9 @@ pub unsafe fn init_clock_asic_350mhz() -> u32 { cgu.wo(sysctrl::SFR_CGUSET, 0x32); bao1x_api::bollard!(6); - // Taken in from latest daric_util.c + // UDMA subsystem controls its own gates let mut udmacore = CSR::new(utra::udma_ctrl::HW_UDMA_CTRL_BASE as *mut u32); - udmacore.wo(utra::udma_ctrl::REG_CG, 0xFFFF_FFFF); + udmacore.wo(utra::udma_ctrl::REG_CG, 0x0); // glitch_safety: check that we're running on the PLL bao1x_hal::hardening::check_pll(); diff --git a/libs/bao1x-hal/src/clocks.rs b/libs/bao1x-hal/src/clocks.rs index cf3fd0d20..d0e1295ad 100644 --- a/libs/bao1x-hal/src/clocks.rs +++ b/libs/bao1x-hal/src/clocks.rs @@ -220,9 +220,6 @@ pub unsafe fn init_clock_asic( let fsfreq = (daric_cgu.add(offset).read_volatile() >> shift) & 0xffff; crate::println!("{}: {} MHz", name, fsfreq); } - // Comment this out - I think we manage the UDMA clocks explicitly per-driver - // let mut udmacore = CSR::new(utra::udma_ctrl::HW_UDMA_CTRL_BASE as *mut u32); - // udmacore.wo(utra::udma_ctrl::REG_CG, 0xFFFF_FFFF); crate::println!("Perclk solution: {:x}|{:x} -> {} MHz", min_cycle, fd, perclk / 1_000_000); crate::println!("PLL configured to {} MHz", freq_hz / 1_000_000);