commit 06e1edd9495d6a540ef308281788cbab7118067d
parent 1462b5ca50fb15aeca229ee999c3501b381f00d3
Author: filipton <filipton12@gmail.com>
Date: Thu, 4 Jul 2024 19:24:43 +0200
feat: add basic helpers, crc32, paddr finder
Diffstat:
7 files changed, 166 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,8 @@
+/target
+
+
+# Added by cargo
+#
+# already existing elements were commented out
+
+#/target
diff --git a/Cargo.lock b/Cargo.lock
@@ -0,0 +1,16 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "embedded-storage"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21dea9854beb860f3062d10228ce9b976da520a73474aed3171ec276bc0c032"
+
+[[package]]
+name = "esp-hal-ota"
+version = "0.1.0"
+dependencies = [
+ "embedded-storage",
+]
diff --git a/Cargo.toml b/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "esp-hal-ota"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+
+[dependencies]
+embedded-storage = "0.3.1"
diff --git a/src/crc32.rs b/src/crc32.rs
@@ -0,0 +1,44 @@
+const CRC_32_TAB: [u32; 256] = [
+ 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
+ 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
+ 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+ 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
+ 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+ 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+ 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+ 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
+ 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+ 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+ 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
+ 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+ 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
+ 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
+ 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+ 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
+ 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
+ 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+ 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
+ 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+ 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+ 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
+ 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
+ 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+ 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+ 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
+ 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+ 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
+ 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
+ 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+ 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
+ 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d,
+];
+
+pub fn calc_crc32(buf: &[u8], mut crc: u32) -> u32 {
+ crc = !crc;
+ for i in 0..buf.len() {
+ let crc_idx = (crc ^ buf[i] as u32) & 0xFF;
+ crc = CRC_32_TAB[crc_idx as usize] ^ (crc >> 8);
+ }
+
+ (crc ^ 0xFFFFFFFF) & 0xFFFFFFFF
+}
diff --git a/src/helpers.rs b/src/helpers.rs
@@ -0,0 +1,20 @@
+use crate::{crc32, PARTITIONS_COUNT};
+
+#[inline(always)]
+/// Helper funcion!
+/// Change seq to partition number
+pub const fn seq_to_part(seq: u32) -> usize {
+ (PARTITIONS_COUNT - 1) - (seq as usize % PARTITIONS_COUNT)
+}
+
+#[inline(always)]
+/// Helper funcion!
+/// If crc of seq is correct it returns seq, otherwise default value is returned
+pub fn seq_or_default(seq: &[u8], crc: u32, default: u32) -> u32 {
+ let crc_calc = crc32::calc_crc32(&seq, 0xFFFFFFFF);
+ if crc == crc_calc {
+ return u32::from_le_bytes(seq.try_into().expect("Wrong size?"));
+ }
+
+ default
+}
diff --git a/src/lib.rs b/src/lib.rs
@@ -0,0 +1,32 @@
+#![no_std]
+
+use embedded_storage::{ReadStorage, Storage};
+
+pub mod crc32;
+pub mod helpers;
+pub mod paddr;
+
+// TOOD: make macros for generating this from partitions.csv, delete them from lib
+pub const PARTITIONS_COUNT: usize = 2;
+pub const PARTITIONS: [core::ops::Range<u32>; PARTITIONS_COUNT] = [
+ (0x10000..0x10000 + 0x100000),
+ (0x110000..0x110000 + 0x100000),
+];
+
+pub const OTADATA_OFFSET: u32 = 0xd000;
+pub const OTADATA_SIZE: u32 = 0x2000;
+
+// I need to use generics, because after adding esp-storage dependency to
+// this project its not compiling LULE
+pub struct Ota<S>
+where
+ S: ReadStorage + Storage,
+{
+ flash: S,
+}
+
+impl<S> Ota<S> where S: ReadStorage + Storage {
+ pub fn dsa(&mut self) {
+ //self.flash.write(offset, bytes)
+ }
+}
diff --git a/src/paddr.rs b/src/paddr.rs
@@ -0,0 +1,37 @@
+use crate::{PARTITIONS, PARTITIONS_COUNT};
+
+// this is for esp32s3, TODO: implement for other esp32's
+const SOC_MMU_VADDR_MASK: u32 = 0x1FFFFFF;
+const MMU_PAGE_64KB: u32 = 0x10000;
+const DR_REG_MMU_TABLE: u32 = 0x600c5000;
+const SOC_MMU_VALID_VAL_MASK: u32 = 0x3fff;
+
+pub fn mmu_ll_get_entry_id(_mmu_id: u32, vaddr: u32) -> u32 {
+ (vaddr & SOC_MMU_VADDR_MASK) >> 16
+}
+
+pub fn mmu_ll_entry_id_to_paddr_base(_mmu_id: u32, entry_id: u32) -> u32 {
+ let ptr = (DR_REG_MMU_TABLE + entry_id * 4) as *const u32;
+ unsafe { ((*ptr) & SOC_MMU_VALID_VAL_MASK) << 16 }
+}
+
+pub fn esp_get_current_running_partition() -> Option<usize> {
+ let ptr = esp_get_current_running_partition as *const () as *const u32;
+ let entry_id = mmu_ll_get_entry_id(0, ptr as u32);
+
+ let shift_code = 16; // bc MMU_PAGE_64K
+ let mmu_hal_pages_to_bytes = 1 << shift_code;
+
+ let offset = (ptr as u32) % mmu_hal_pages_to_bytes;
+
+ let paddr_base = mmu_ll_entry_id_to_paddr_base(0, entry_id);
+ let paddr = paddr_base | offset;
+
+ for i in 0..PARTITIONS_COUNT {
+ if PARTITIONS[i].contains(&paddr) {
+ return Some(i);
+ }
+ }
+
+ None
+}
