speed up
This commit is contained in:
parent
44c36b203d
commit
a20e0fa3e5
2
.gdbinit
2
.gdbinit
@ -8,7 +8,7 @@ monitor arm semihosting enable
|
|||||||
# monitor itm port 0 on
|
# monitor itm port 0 on
|
||||||
load
|
load
|
||||||
# tbreak cortex_m_rt::reset_handler
|
# tbreak cortex_m_rt::reset_handler
|
||||||
monitor reset halt
|
# monitor reset halt
|
||||||
|
|
||||||
# cycle counter delta tool, place two bkpts around the section
|
# cycle counter delta tool, place two bkpts around the section
|
||||||
define qq
|
define qq
|
||||||
|
|||||||
16
memory.x
16
memory.x
@ -1,11 +1,11 @@
|
|||||||
MEMORY
|
MEMORY
|
||||||
{
|
{
|
||||||
ITCM : ORIGIN = 0x00000000, LENGTH = 64K
|
ITCM (rwx) : ORIGIN = 0x00000000, LENGTH = 64K
|
||||||
RAM : ORIGIN = 0x20000000, LENGTH = 128K
|
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 128K
|
||||||
RAM_D1 : ORIGIN = 0x24000000, LENGTH = 512K
|
RAM_D1 (rwx) : ORIGIN = 0x24000000, LENGTH = 512K
|
||||||
RAM_D2 : ORIGIN = 0x30000000, LENGTH = 288K
|
RAM_D2 (rwx) : ORIGIN = 0x30000000, LENGTH = 288K
|
||||||
RAM_D3 : ORIGIN = 0x38000000, LENGTH = 64K
|
RAM_D3 (rwx) : ORIGIN = 0x38000000, LENGTH = 64K
|
||||||
RAM_B : ORIGIN = 0x38800000, LENGTH = 4K
|
RAM_B (rwx) : ORIGIN = 0x38800000, LENGTH = 4K
|
||||||
FLASH : ORIGIN = 0x08000000, LENGTH = 1024K
|
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 1024K
|
||||||
FLASH1 : ORIGIN = 0x08100000, LENGTH = 1024K
|
FLASH1 (rx) : ORIGIN = 0x08100000, LENGTH = 1024K
|
||||||
}
|
}
|
||||||
|
|||||||
170
src/main.rs
170
src/main.rs
@ -49,32 +49,166 @@ mod build_info {
|
|||||||
|
|
||||||
#[entry]
|
#[entry]
|
||||||
fn main() -> ! {
|
fn main() -> ! {
|
||||||
init_log();
|
|
||||||
info!("Version {} {}", build_info::PKG_VERSION, build_info::GIT_VERSION.unwrap());
|
|
||||||
info!("{} {}", build_info::RUSTC_VERSION, build_info::TARGET);
|
|
||||||
info!("Built on {}", build_info::BUILT_TIME_UTC);
|
|
||||||
|
|
||||||
let mut cp = cortex_m::Peripherals::take().unwrap();
|
let mut cp = cortex_m::Peripherals::take().unwrap();
|
||||||
|
let dp = stm32::Peripherals::take().unwrap();
|
||||||
|
|
||||||
|
// go to VOS1 voltage scale high perf
|
||||||
|
let pwr = dp.PWR;
|
||||||
|
pwr.pwr_cr3.write(|w|
|
||||||
|
w.sden().set_bit()
|
||||||
|
.ldoen().set_bit()
|
||||||
|
.bypass().clear_bit()
|
||||||
|
);
|
||||||
|
while pwr.pwr_csr1.read().actvosrdy().bit_is_clear() {}
|
||||||
|
pwr.pwr_d3cr.write(|w| unsafe { w.vos().bits(0b11) }); // vos1
|
||||||
|
while pwr.pwr_d3cr.read().vosrdy().bit_is_clear() {}
|
||||||
|
|
||||||
|
let rcc = dp.RCC;
|
||||||
|
|
||||||
|
// Reset all peripherals
|
||||||
|
rcc.ahb1rstr.write(|w| unsafe { w.bits(0xFFFF_FFFF) });
|
||||||
|
rcc.ahb1rstr.write(|w| unsafe { w.bits(0)});
|
||||||
|
rcc.apb1lrstr.write(|w| unsafe { w.bits(0xFFFF_FFFF) });
|
||||||
|
rcc.apb1lrstr.write(|w| unsafe { w.bits(0)});
|
||||||
|
|
||||||
|
rcc.ahb2rstr.write(|w| unsafe { w.bits(0xFFFF_FFFF) });
|
||||||
|
rcc.ahb2rstr.write(|w| unsafe { w.bits(0)});
|
||||||
|
rcc.apb2rstr.write(|w| unsafe { w.bits(0xFFFF_FFFF) });
|
||||||
|
rcc.apb2rstr.write(|w| unsafe { w.bits(0)});
|
||||||
|
|
||||||
|
/* breaks semihosting
|
||||||
|
rcc.ahb3rstr.write(|w| unsafe { w.bits(0xFFFF_FFFF) });
|
||||||
|
rcc.ahb3rstr.write(|w| unsafe { w.bits(0)});
|
||||||
|
*/
|
||||||
|
rcc.apb3rstr.write(|w| unsafe { w.bits(0xFFFF_FFFF) });
|
||||||
|
rcc.apb3rstr.write(|w| unsafe { w.bits(0)});
|
||||||
|
|
||||||
|
rcc.ahb4rstr.write(|w| unsafe { w.bits(0xFFFF_FFFF) });
|
||||||
|
rcc.ahb4rstr.write(|w| unsafe { w.bits(0)});
|
||||||
|
rcc.apb4rstr.write(|w| unsafe { w.bits(0xFFFF_FFFF) });
|
||||||
|
rcc.apb4rstr.write(|w| unsafe { w.bits(0)});
|
||||||
|
|
||||||
|
// Ensure HSI is on and stable
|
||||||
|
rcc.cr.modify(|_, w| w.hsion().set_bit());
|
||||||
|
while rcc.cr.read().hsirdy().bit_is_clear() {}
|
||||||
|
|
||||||
|
// Set system clock to HSI
|
||||||
|
rcc.cfgr.modify(|_, w| unsafe { w.sw().bits(0) }); // hsi
|
||||||
|
while rcc.cfgr.read().sws().bits() != 0 {}
|
||||||
|
|
||||||
|
// Clear registers to reset value
|
||||||
|
rcc.cr.write(|w| w.hsion().set_bit());
|
||||||
|
rcc.cfgr.reset();
|
||||||
|
|
||||||
|
// Ensure HSE is on and stable
|
||||||
|
rcc.cr.modify(|_, w| w.hseon().set_bit());
|
||||||
|
while rcc.cr.read().hserdy().bit_is_clear() {}
|
||||||
|
|
||||||
|
rcc.pllckselr.modify(|_, w| unsafe {
|
||||||
|
w.pllsrc().bits(0b10) // hse
|
||||||
|
.divm1().bits(1) // ref prescaler
|
||||||
|
.divm2().bits(4) // ref prescaler
|
||||||
|
});
|
||||||
|
// Configure PLL1: 8MHz /1 *100 /2 = 400 MHz
|
||||||
|
rcc.pllcfgr.modify(|_, w| unsafe {
|
||||||
|
w.pll1vcosel().clear_bit() // 192-836 MHz VCO
|
||||||
|
.pll1rge().bits(0b11) // 8-16 MHz PFD
|
||||||
|
.pll1fracen().clear_bit()
|
||||||
|
.divp1en().set_bit()
|
||||||
|
.pll2vcosel().set_bit() // 150-420 MHz VCO
|
||||||
|
.pll2rge().bits(0b01) // 2-4 MHz PFD
|
||||||
|
.pll2fracen().clear_bit()
|
||||||
|
.divp2en().set_bit()
|
||||||
|
.divq2en().set_bit()
|
||||||
|
});
|
||||||
|
rcc.pll1divr.write(|w| unsafe {
|
||||||
|
w.divn1().bits(100 - 1) // feebdack divider
|
||||||
|
.divp1().bits(2 - 1) // p output divider
|
||||||
|
});
|
||||||
|
rcc.cr.modify(|_, w| w.pll1on().set_bit());
|
||||||
|
while rcc.cr.read().pll1rdy().bit_is_clear() {}
|
||||||
|
|
||||||
|
// Configure PLL2: 8MHz /4 * 125 = 250 MHz
|
||||||
|
rcc.pll2divr.write(|w| unsafe {
|
||||||
|
w.divn1().bits(125 - 1) // feebdack divider
|
||||||
|
.divp1().bits(2 - 1) // p output divider
|
||||||
|
.divq1().bits(2 - 1) // q output divider
|
||||||
|
});
|
||||||
|
rcc.cr.modify(|_, w| w.pll2on().set_bit());
|
||||||
|
while rcc.cr.read().pll2rdy().bit_is_clear() {}
|
||||||
|
|
||||||
|
// hclk 200 MHz, pclk 100 MHz
|
||||||
|
rcc.d1cfgr.write(|w| unsafe {
|
||||||
|
w.d1cpre().bits(0) // sys_ck not divided
|
||||||
|
.d1ppre().bits(0b100) // rcc_pclk3 = rcc_hclk3 / 2
|
||||||
|
.hpre().bits(0b1000) // rcc_hclk3 = sys_d1cpre_ck / 2
|
||||||
|
});
|
||||||
|
rcc.d2cfgr.write(|w| unsafe {
|
||||||
|
w.d2ppre1().bits(0b100) // rcc_pclk1 = rcc_hclk3 / 2
|
||||||
|
.d2ppre2().bits(0b100) // rcc_pclk2 = rcc_hclk3 / 2
|
||||||
|
});
|
||||||
|
rcc.d3cfgr.write(|w| unsafe {
|
||||||
|
w.d3ppre().bits(0b100) // rcc_pclk4 = rcc_hclk3 / 2
|
||||||
|
});
|
||||||
|
|
||||||
|
let flash = dp.FLASH;
|
||||||
|
// 2 wait states, 0b10 programming delay
|
||||||
|
// 185-210 MHz
|
||||||
|
flash.acr.write(|w| unsafe {
|
||||||
|
w.wrhighfreq().bits(2)
|
||||||
|
.latency().bits(2)
|
||||||
|
});
|
||||||
|
while flash.acr.read().latency().bits() != 2 {}
|
||||||
|
|
||||||
|
// Set system clock to HSI
|
||||||
|
rcc.cfgr.modify(|_, w| unsafe { w.sw().bits(0b011) }); // pll1p
|
||||||
|
while rcc.cfgr.read().sws().bits() != 0b011 {}
|
||||||
|
|
||||||
cp.SCB.enable_icache();
|
cp.SCB.enable_icache();
|
||||||
cp.SCB.enable_dcache(&mut cp.CPUID);
|
cp.SCB.enable_dcache(&mut cp.CPUID);
|
||||||
cp.DWT.enable_cycle_counter();
|
cp.DWT.enable_cycle_counter();
|
||||||
let mut dp = stm32::Peripherals::take().unwrap();
|
|
||||||
/*
|
init_log();
|
||||||
let clocks = dp.RCC.constrain()
|
// info!("Version {} {}", build_info::PKG_VERSION, build_info::GIT_VERSION.unwrap());
|
||||||
.cfgr
|
info!("Built on {}", build_info::BUILT_TIME_UTC);
|
||||||
.sysclk(84.mhz())
|
// info!("{} {}", build_info::RUSTC_VERSION, build_info::TARGET);
|
||||||
.hclk(84.mhz())
|
|
||||||
.pclk1(16.mhz())
|
// FP_LED0
|
||||||
.pclk2(32.mhz())
|
let gpiod = dp.GPIOD;
|
||||||
.freeze();
|
rcc.ahb4enr.modify(|_, w| w.gpioden().set_bit());
|
||||||
let gpiod = dp.GPIOD.split();
|
gpiod.otyper.modify(|_, w| w.ot5().push_pull());
|
||||||
let mut led_fp0 = gpiod.pd5.into_push_pull_output();
|
gpiod.moder.modify(|_, w| w.moder5().output());
|
||||||
*/
|
gpiod.odr.modify(|_, w| w.odr5().set_bit());
|
||||||
|
|
||||||
|
// FP_LED1
|
||||||
|
gpiod.otyper.modify(|_, w| w.ot6().push_pull());
|
||||||
|
gpiod.moder.modify(|_, w| w.moder6().output());
|
||||||
|
gpiod.odr.modify(|_, w| w.odr6().set_bit());
|
||||||
|
|
||||||
|
// LED_FP0
|
||||||
|
let gpiog = dp.GPIOG;
|
||||||
|
rcc.ahb4enr.modify(|_, w| w.gpiogen().set_bit());
|
||||||
|
gpiog.otyper.modify(|_, w| w.ot4().push_pull());
|
||||||
|
gpiog.moder.modify(|_, w| w.moder4().output());
|
||||||
|
gpiog.odr.modify(|_, w| w.odr4().set_bit());
|
||||||
|
|
||||||
|
// LED_FP0
|
||||||
|
gpiod.otyper.modify(|_, w| w.ot12().push_pull());
|
||||||
|
gpiod.moder.modify(|_, w| w.moder12().output());
|
||||||
|
gpiod.odr.modify(|_, w| w.odr12().set_bit());
|
||||||
|
|
||||||
|
rcc.d2ccip1r.modify(|_, w| unsafe {
|
||||||
|
w.spi123src().bits(1) // pll2_p
|
||||||
|
.spi45src().bits(1) // pll2_q
|
||||||
|
});
|
||||||
|
rcc.d3ccipr.modify(|_, w| unsafe {
|
||||||
|
w.spi6src().bits(1) // pll2_q
|
||||||
|
});
|
||||||
|
|
||||||
cortex_m::interrupt::free(|_cs| {
|
cortex_m::interrupt::free(|_cs| {
|
||||||
});
|
});
|
||||||
loop {
|
loop {
|
||||||
cortex_m::asm::wfi();
|
// cortex_m::asm::wfi();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user