DmaTxBuf: its an error if buffer is in psram and block_size is none

esp-rs · Sep 20, 2024 · 0bfddcd · 0bfddcd
1 parent 3115063
commit 0bfddcd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/esp-hal/src/dma/mod.rs b/esp-hal/src/dma/mod.rs
@@ -2178,7 +2178,7 @@ impl DmaTxBuf {
                     return Err(DmaBufError::UnsupportedMemoryRegion);
                 }
                 // if its PSRAM, the block_size/alignment must be specified
-                if block_size.is_none() {
+                if is_slice_in_psram(buffer) && block_size.is_none() {
                     return Err(DmaBufError::InvalidAlignment);
                 }
             } else {

diff --git a/hil-test/tests/spi_half_duplex_write_psram.rs b/hil-test/tests/spi_half_duplex_write_psram.rs
@@ -97,8 +97,8 @@ mod tests {
     #[timeout(3)]
     fn test_spi_writes_are_correctly_by_pcnt(ctx: Context) {
         const DMA_BUFFER_SIZE: usize = 4;
-        const DMA_ALIGNMENT: DmaBufBlkSize = DmaBufBlkSize::Size32; // matches dcache line size
-        const DMA_CHUNK_SIZE: usize = 4096 - DMA_ALIGNMENT as usize; // 64 byte aligned
+        const DMA_ALIGNMENT: DmaBufBlkSize = DmaBufBlkSize::Size32;
+        const DMA_CHUNK_SIZE: usize = 4096 - DMA_ALIGNMENT as usize;
 
         let (_, descriptors) = dma_descriptors_chunk_size!(0, DMA_BUFFER_SIZE, DMA_CHUNK_SIZE);
         let buffer = dma_alloc_buffer!(DMA_BUFFER_SIZE, DMA_ALIGNMENT as usize);