Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Proper FPU initialitation #554

Merged
merged 2 commits into from
Sep 18, 2024
Merged

Proper FPU initialitation #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c281c4c
Proper FPU initialization
ckormanyos Sep 18, 2024
706225d
Merge branch 'master' into trivial_syntax
ckormanyos Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions ref_app/src/mcal/rpi_pico2_rp2350/mcal_reg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,26 +55,27 @@
constexpr std::uint32_t hw_per_clocks_clk_peri_ctrl { hw_per_clocks_base + UINT32_C(0x00000048) };

// PSM registers.
constexpr std::uint32_t hw_per_psm_base { UINT32_C(0x40018000) };
constexpr std::uint32_t psm_base { UINT32_C(0x40018000) };
constexpr std::uint32_t psm_frce_on { psm_base + UINT32_C(0x00000000) };
constexpr std::uint32_t psm_frce_off { psm_base + UINT32_C(0x00000004) };
constexpr std::uint32_t psm_wdsel { psm_base + UINT32_C(0x00000008) };
constexpr std::uint32_t psm_done { psm_base + UINT32_C(0x0000000C) };

// PPB registers.
constexpr std::uint32_t hw_per_ppb_base { UINT32_C(0xE0000000) };
constexpr std::uint32_t hw_per_ppb_cpacr { hw_per_ppb_base + UINT32_C(0x0000ED88) };
constexpr std::uint32_t hw_per_ppb_nsacr { hw_per_ppb_base + UINT32_C(0x0000ED8C) };

// I/O-Bank registers.
constexpr std::uint32_t pads_bank0_base { UINT32_C(0x40038000) };
constexpr std::uint32_t pads_bank0_gpio { UINT32_C(0x40038004) };

// I/O-Bank registers.
constexpr std::uint32_t io_bank0_base { UINT32_C(0x40028000) };
constexpr std::uint32_t io_bank0_status_base { io_bank0_base + UINT32_C(0x00000000) };

constexpr std::uint32_t hw_per_io_bank0 { io_bank0_base };

constexpr std::uint32_t hw_per_psm_base { UINT32_C(0x40018000) };

constexpr std::uint32_t hw_per_ppb_base { UINT32_C(0xE0000000) };
constexpr std::uint32_t hw_per_ppb_cpacr { hw_per_ppb_base + UINT32_C(0x0000ED88) };

constexpr std::uint32_t hw_per_xosc_base { UINT32_C(0x40048000) };
constexpr std::uint32_t hw_per_xosc_control { UINT32_C(0x40048000) };
constexpr std::uint32_t hw_per_xosc_status { UINT32_C(0x40048004) };
Expand Down
10 changes: 7 additions & 3 deletions ref_app/target/micros/rpi_pico2_rp2350/startup/crt0.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,17 @@ auto __main_core1() -> void
// Synchronize with core 0.
mcal::cpu::rp2350::multicore_sync(local::get_cpuid());

// Initialize the FPU on Core 1: Enable CP10 and CP11.
// Enable the hardware FPU on Core 1.

mcal::reg::reg_access_static<std::uint32_t,
std::uint32_t,
mcal::reg::hw_per_ppb_nsacr,
std::uint32_t { (1UL << 10U) | (1UL << 11U) }>::reg_or();

// HW_PER_PPB->CPACR.reg |= (std::uint32_t) 0x00F00000UL;
mcal::reg::reg_access_static<std::uint32_t,
std::uint32_t,
mcal::reg::hw_per_ppb_cpacr,
std::uint32_t { UINT32_C(0x00F00000) }>::reg_or();
std::uint32_t { (3UL << 20U) | (3UL << 22U) }>::reg_or();

// Jump to main on core 1 (and never return).
asm volatile("ldr r3, =main");
Expand Down