Skip to content

Light-sleep CPU/TOP power-down for ESP32-C6 and ESP32-H2 #5874

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

Draft
JurajSadel wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Light-sleep CPU/TOP power-down for ESP32-C6 and ESP32-H2 #5874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb77c87
regDMA experiments
JurajSadel Jul 1, 2026
d53c1e0
rework
JurajSadel Jul 2, 2026
c332e16
cleanup
JurajSadel Jul 8, 2026
2934a9c
add h2 and clean
JurajSadel Jul 9, 2026
8f31b9c
reviews
JurajSadel Jul 20, 2026
275a33a
PAC rework, more metadata, address review
JurajSadel Jul 30, 2026
270fbf6
cleanup csr, reuse riscv
JurajSadel Aug 7, 2026
3cb265d
reviews
JurajSadel Aug 7, 2026
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
6 changes: 3 additions & 3 deletions esp-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,16 @@ esp32 = { version = "0.40", features = ["critical-section"], optional = true,
esp32c2 = { version = "0.29", features = ["critical-section"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "8d0a072" }
esp32c3 = { version = "0.32", features = ["critical-section"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "8d0a072" }
esp32c5 = { version = "0.2", features = ["critical-section"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "8d0a072" }
esp32c6 = { version = "0.23", features = ["critical-section"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "8d0a072" }
esp32c6 = { version = "0.23", features = ["critical-section"], optional = true, git = "https://github.com/JurajSadel/esp-pacs", branch = "c6-h2-retention-registers" }
esp32c61 = { version = "0.3", features = ["critical-section"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "8d0a072" }
esp32h2 = { version = "0.19", features = ["critical-section"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "8d0a072" }
esp32h2 = { version = "0.19", features = ["critical-section"], optional = true, git = "https://github.com/JurajSadel/esp-pacs", branch = "c6-h2-retention-registers" }
esp32s2 = { version = "0.31", features = ["critical-section"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "8d0a072" }
esp32s3 = { version = "0.35", features = ["critical-section"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "8d0a072" }
esp32s31 = { version = "0.1", features = ["critical-section"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "8d0a072" }
esp32p4 = { version = "0.2", features = ["critical-section"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "8d0a072" }

[target.'cfg(target_arch = "riscv32")'.dependencies]
riscv = { version = "0.16.1" }
riscv = { version = "0.16.1", git = "https://github.com/JurajSadel/riscv.git", branch = "test" }

@JurajSadel JurajSadel Aug 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I opened a bunch of PRs to the riscv upstream - test branch has all PRs changes merged.

esp-riscv-rt = { version = "0.14.0", path = "../esp-riscv-rt", optional = true }

[target.'cfg(target_arch = "xtensa")'.dependencies]
Expand Down
26 changes: 26 additions & 0 deletions esp-hal/src/i2c/master/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ mod low_level;
pub use low_level::{AnyI2c, Instance};
use low_level::{Driver, I2cClockGuard};

#[cfg(sleep_pd_retention)]
#[instability::unstable]
pub use crate::rtc_cntl::retention::I2cRetentionMemory;

const I2C_FIFO_SIZE: usize = property!("i2c_master.fifo_size");
// Chunk writes/reads by this size
const I2C_CHUNK_SIZE: usize = I2C_FIFO_SIZE - 1;
Expand Down Expand Up @@ -680,6 +684,12 @@ pub struct I2c<'d, Dm: DriverMode> {
phantom: PhantomData<Dm>,
guard: PeripheralGuard,
config: DriverConfig,
// Active keeps `TOP` powered; `with_retention_memory` swaps to retained.
#[cfg(sleep_pd_retention)]
power: crate::rtc_cntl::retention::PowerManagement<
'd,
crate::rtc_cntl::retention::I2cRetentionMemory,
>,
}

#[derive(Debug)]
Expand Down Expand Up @@ -736,6 +746,8 @@ impl<'d> I2c<'d, Blocking> {
sda_pin,
scl_pin,
},
#[cfg(sleep_pd_retention)]
power: crate::rtc_cntl::retention::PowerManagement::new(),
};

// Make sure inputs are well-defined.
Expand All @@ -759,6 +771,8 @@ impl<'d> I2c<'d, Blocking> {
phantom: PhantomData,
guard: self.guard,
config: self.config,
#[cfg(sleep_pd_retention)]
power: self.power,
}
}

Expand Down Expand Up @@ -851,6 +865,8 @@ impl<'d> I2c<'d, Async> {
phantom: PhantomData,
guard: self.guard,
config: self.config,
#[cfg(sleep_pd_retention)]
power: self.power,
}
}

Expand Down Expand Up @@ -1038,6 +1054,16 @@ where
self.driver().reset_fsm(*error == Error::Timeout)
}

/// Retain this I2C's config registers in `mem` across a `TOP` power-down in
/// light sleep, dropping the lock that would otherwise keep `TOP` powered.
#[cfg(sleep_pd_retention)]
#[instability::unstable]
pub fn with_retention_memory(mut self, mem: &'d mut I2cRetentionMemory) -> Self {
let base = self.i2c.info().regs() as *const RegisterBlock as usize as u32;
self.power.retain(mem, base);
self
}

#[procmacros::doc_replace]
/// Connect a pin to the I2C SDA signal.
///
Expand Down
Loading
Loading