Skip to content

Support chips which don't support MIE/MIP CSRs #332

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

Merged
romancardenas merged 3 commits into from
Jul 23, 2025
Merged

Support chips which don't support MIE/MIP CSRs #332

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c4a2d8
Support chips which don't support MIE/MIP CSRs
bjoernQ Jul 22, 2025
15151fb
Rename feature `no-mie-mip` to `no-xie-xip`
bjoernQ Jul 23, 2025
c609929
Adapt changelog entry
bjoernQ Jul 23, 2025
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
1 change: 1 addition & 0 deletions riscv-rt/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- New `#[riscv_rt::post_init]` attribute to aid in the definition of the `__post_init` function.
- Added `.uninit` section to the linker file. Due to its similarities with `.bss`, the
linker will place this new section in `REGION_BSS`.
- Additional feature `no-mie-mip` to work on chips without the MIE and MIP CSRs (e.g. ESP32-C2, ESP32-C3)
Copy link
Contributor

@romancardenas romancardenas Jul 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- Additional feature `no-mie-mip` to work on chips without the MIE and MIP CSRs (e.g. ESP32-C2, ESP32-C3)
- Additional feature `no-xie-xip` to work on chips without the XIE and XIP CSRs (e.g. ESP32-C2, ESP32-C3)

Copy link
Contributor Author

@bjoernQ bjoernQ Jul 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦‍♂️ ofc ... sorry I missed that


### Changed

Expand Down
1 change: 1 addition & 0 deletions riscv-rt/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,6 @@ v-trap = ["riscv-rt-macros/v-trap"]
u-boot = ["riscv-rt-macros/u-boot", "single-hart"]
no-interrupts = []
no-exceptions = []
no-xie-xip = []
device = []
memory = []
9 changes: 5 additions & 4 deletions riscv-rt/src/asm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,14 @@ _abs_start:
.cfi_startproc
.cfi_undefined ra",
// Disable interrupts
#[cfg(feature = "s-mode")]
#[cfg(all(feature = "s-mode", not(feature = "no-xie-xip")))]
"csrw sie, 0
csrw sip, 0",
#[cfg(not(feature = "s-mode"))]
#[cfg(all(not(feature = "s-mode"), not(feature = "no-xie-xip")))]
"csrw mie, 0
csrw mip, 0
csrr a0, mhartid", // Make sure that the hart ID is in a0 in M-mode
csrw mip, 0",
#[cfg(not(feature = "s-mode"))]
"csrr a0, mhartid", // Make sure that the hart ID is in a0 in M-mode
// Set pre-init trap vector
"la t0, _pre_init_trap",
#[cfg(feature = "s-mode")]
Expand Down