diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/host.rs | 56 | ||||
| -rw-r--r-- | src/target.rs | 52 |
2 files changed, 108 insertions, 0 deletions
diff --git a/src/host.rs b/src/host.rs index 5f1dc33..e809895 100644 --- a/src/host.rs +++ b/src/host.rs @@ -816,6 +816,7 @@ impl RuntimeBuilder { "__flexram_config = {:#010X};", flexram_config(self.family, &self.flexram_layout) )?; + // The target runtime looks at this value to predicate some pre-init instructions. // Could be helpful for binary identification, but it's an undocumented feature. writeln!(writer, "__imxrt_rt_v0.2 = {:#010X};", self.family.id(),)?; @@ -925,6 +926,59 @@ fn write_flexram_memories( Ok(()) } +/// Generate spans for zeroing ECC RAM. +fn write_ecc_zero_spans( + output: &mut dyn Write, + family: Family, + flexram_layout: &[FlexRamKind], + flexram_ecc: FlexRamEcc, + mecc64: Mecc64, +) -> io::Result<()> { + let itcm_count = layout_count_of(FlexRamKind::Itcm, flexram_layout); + 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. + + 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;")?; + }; + + 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;")?; + }; + + 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;")?; + } + + Ok(()) +} + /// Generate a linker script MEMORY command that includes a FLASH block. fn write_flash_memory_map( output: &mut dyn Write, @@ -949,6 +1003,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)?; Ok(()) } @@ -970,6 +1025,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)?; Ok(()) } diff --git a/src/target.rs b/src/target.rs index 96ae9f7..4515934 100644 --- a/src/target.rs +++ b/src/target.rs @@ -55,6 +55,22 @@ global_asm! {r#" 999: .endm +.macro zero_section64 beg, end + ldr r0, =\beg + 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 @@ -85,6 +101,42 @@ __pre_init: ldr r1, [r0, #64] @ r1 = *(IMXRT_IOMUXC_GPR + 16) orr r1, r1, #1<<2 @ r1 |= 1 << 2 str r1, [r0, #64] @ *(IMXRT_IOMUXC_GPR + 16) = r1 + + # If there's an ITCM ECC region, make sure + # + # - 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 + itttt ne + ldrne r0, =0xE000EF90 @ ITCMCR + ldrne r1, [r0] @ r1 = *ITCMCR + orrne r1, r1, #3<<1 @ r1 |= 3 << 1, setting RMW and RETEN + strne r1, [r0] @ *ITCMCR = r1 + + # Same as above, but for DTCM. + ldr r0, =__edtcm + cmp r0, r3 + itttt ne + ldrne r0, =0xE000EF94 @ DTCMCR + ldrne r1, [r0] @ r1 = *DTCMCR + orrne r1, r1, #3<<1 @ r1 |= 3 << 1, setting RMW and RETEN + strne r1, [r0] @ *DTCMCR = r1 + + 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 + b 1000f 1180: |
