aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/host.rs45
-rw-r--r--src/lib.rs8
-rw-r--r--src/target.rs53
3 files changed, 58 insertions, 48 deletions
diff --git a/src/host.rs b/src/host.rs
index e809895..42d5e5e 100644
--- a/src/host.rs
+++ b/src/host.rs
@@ -926,8 +926,8 @@ fn write_flexram_memories(
Ok(())
}
-/// Generate spans for zeroing ECC RAM.
-fn write_ecc_zero_spans(
+/// Generate the symbol content for ECC RAM configurations.
+fn write_ecc_config(
output: &mut dyn Write,
family: Family,
flexram_layout: &[FlexRamKind],
@@ -938,44 +938,21 @@ fn write_ecc_zero_spans(
let dtcm_count = layout_count_of(FlexRamKind::Dtcm, flexram_layout);
let ocram_count = layout_count_of(FlexRamKind::Ocram, flexram_layout);
- // If memory isn't available or doesn't need
- // use ECC, then we don't need to zero it.
- // Generate dummy values that skip the loops.
-
+ let mut ecc_ram_config = 0_u32;
if itcm_count > 0 && flexram_ecc.is_enable() {
- // Make sure to zero the reserved regions, too,
- // just in case they're accidentally / intentionally accessed.
- let itcm = family.itcm_start_size(itcm_count);
- let start = itcm.start - 32;
- let end = start + itcm.size + 32;
- writeln!(output, "__sitcm = {:#010X};", start)?;
- writeln!(output, "__eitcm = {:#010X};", end)?;
- } else {
- writeln!(output, "__sitcm = 0;")?;
- writeln!(output, "__eitcm = 0;")?;
- };
+ ecc_ram_config |= crate::ECC_ITCM_ACTIVE;
+ }
if dtcm_count > 0 && flexram_ecc.is_enable() {
- writeln!(output, "__sdtcm = ORIGIN(DTCM);")?;
- writeln!(output, "__edtcm = ORIGIN(DTCM) + LENGTH(DTCM);")?;
- } else {
- writeln!(output, "__sdtcm = 0;")?;
- writeln!(output, "__edtcm = 0;")?;
- };
+ ecc_ram_config |= crate::ECC_DTCM_ACTIVE;
+ }
let ocram = family.ocram_start_size(ocram_count, flexram_ecc, mecc64);
-
- // The zeroization should specifically target one of the two regions.
- // But we're not prepared to do that, so incur the loop for the whole
- // region no matter which is enabled.
if ocram.size > 0 && (mecc64.is_enable() || flexram_ecc.is_enable()) {
- writeln!(output, "__socram = {:#010X};", ocram.start)?;
- writeln!(output, "__eocram = {:#010X};", ocram.start + ocram.size)?;
- } else {
- writeln!(output, "__socram = 0;")?;
- writeln!(output, "__eocram = 0;")?;
+ ecc_ram_config |= crate::ECC_OCRAM_ACTIVE;
}
+ writeln!(output, "__ecc_ram_config = {ecc_ram_config:#010X};")?;
Ok(())
}
@@ -1003,7 +980,7 @@ fn write_flash_memory_map(
write_flexram_memories(output, family, flexram_layout, flexram_ecc, mecc64)?;
writeln!(output, "}}")?;
writeln!(output, "__fcb_offset = {:#X};", family.fcb_offset())?;
- write_ecc_zero_spans(output, family, flexram_layout, flexram_ecc, mecc64)?;
+ write_ecc_config(output, family, flexram_layout, flexram_ecc, mecc64)?;
Ok(())
}
@@ -1025,7 +1002,7 @@ fn write_ram_memory_map(
writeln!(output, "MEMORY {{")?;
write_flexram_memories(output, family, flexram_layout, flexram_ecc, mecc64)?;
writeln!(output, "}}")?;
- write_ecc_zero_spans(output, family, flexram_layout, flexram_ecc, mecc64)?;
+ write_ecc_config(output, family, flexram_layout, flexram_ecc, mecc64)?;
Ok(())
}
diff --git a/src/lib.rs b/src/lib.rs
index 46963e6..f4c933c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -198,11 +198,19 @@
#![cfg_attr(all(target_arch = "arm", target_os = "none"), no_std)]
+/// `__ecc_ram_config` bit set when ITCM ECC is active.
+const ECC_ITCM_ACTIVE: u32 = 1 << 0;
+/// `__ecc_ram_config` bit set when DTCM ECC is active.
+const ECC_DTCM_ACTIVE: u32 = 1 << 1;
+
cfg_if::cfg_if! {
if #[cfg(all(target_arch = "arm", target_os = "none"))] {
mod target;
pub use target::*;
} else {
+ /// `__ecc_ram_config` bit set when OCRAM ECC is active.
+ const ECC_OCRAM_ACTIVE: u32 = 1 << 2;
+
mod host;
pub use host::*;
}
diff --git a/src/target.rs b/src/target.rs
index bfe6e7e..95dc7b6 100644
--- a/src/target.rs
+++ b/src/target.rs
@@ -71,6 +71,26 @@ global_asm! {r#"
.endm
+.macro maybe_zero_section64 dst, src, end
+ ldr r0, =\dst
+ ldr r2, =\src
+ cmp r2, r0
+ beq 999f
+
+ ldr r1, =\end
+ movw r2, #0
+
+ 888:
+ cmp r0, r1
+ bge 999f
+
+ strd r2, r2, [r0], #8
+ b 888b
+
+ 999:
+
+.endm
+
__pre_init:
ldr r0, =__imxrt_rt_v0.2 @ Need to know which chip family we're initializing.
ldr r1, =0x1180
@@ -107,11 +127,8 @@ __pre_init:
# - the CPU issues RMW operations for smaller accesses.
# - the CPU retries operations when signaled.
#
- # If there's no ECC region, the host sets the ends
- # to zero, and we skip the instructions.
- movw r3, #0
- ldr r0, =__eitcm
- cmp r0, r3
+ ldr r2, =__ecc_ram_config
+ tst r2, #{ecc_itcm}
itttt ne
ldrne r0, =0xE000EF90 @ ITCMCR
ldrne r1, [r0] @ r1 = *ITCMCR
@@ -119,8 +136,7 @@ __pre_init:
strne r1, [r0] @ *ITCMCR = r1
# Same as above, but for DTCM.
- ldr r0, =__edtcm
- cmp r0, r3
+ tst r2, #{ecc_dtcm}
itttt ne
ldrne r0, =0xE000EF94 @ DTCMCR
ldrne r1, [r0] @ r1 = *DTCMCR
@@ -130,12 +146,19 @@ __pre_init:
dsb
isb
- # Zero memory regions for any ECC support.
- # If ECC isn't enabled, then the host generates
- # values that short circuit the loops.
- zero_section64 __sitcm , __eitcm
- zero_section64 __sdtcm , __edtcm
- zero_section64 __socram , __eocram
+ # If any ECC is active, try to zero the RAM-resident sections with 64-bit writes.
+ # We may skip sections if the contents should have already been loaded (by the
+ # debugger, perhaps).
+ cmp r2, #0
+ beq 1000f
+ zero_section64 __estack , __sstack
+ maybe_zero_section64 __svector_table , __sivector_table , __evector_table
+ maybe_zero_section64 __stext , __sitext , __etext
+ maybe_zero_section64 __srodata , __sirodata , __erodata
+ maybe_zero_section64 __sdata , __sidata , __edata
+ zero_section64 __sbss , __ebss
+ zero_section64 __suninit , __euninit
+ zero_section64 __sheap , __eheap
b 1000f
@@ -154,7 +177,9 @@ __pre_init:
.cfi_endproc
.size __pre_init, . - __pre_init
-"#
+"#,
+ ecc_itcm = const crate::ECC_ITCM_ACTIVE,
+ ecc_dtcm = const crate::ECC_DTCM_ACTIVE,
}
/// Returns a pointer to the end of the heap.