Skip to content

Commit f58e5e1

Browse files
cbiffleadamgreig
authored andcommitted
ITM: don't test reserved bits in is_fifo_ready
On ARMv7-M, bits 31:1 of the value read from STIMx are reserved, so comparing them against zero is a bad idea. On ARMv8-M, bit 1 has been repurposed to indicate DISABLED. This means that the is_fifo_ready impl hangs forever when ITM is disabled on a Cortex-M33 (for example). Changed to test only the FIFOREADY bit on ARMv7-M, and to test either FIFOREADY or DISABLED on ARMv8-M.
1 parent c7fa03e commit f58e5e1

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

src/peripheral/itm.rs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,19 @@ impl Stim {
5353
}
5454

5555
/// Returns `true` if the stimulus port is ready to accept more data
56+
#[cfg(not(armv8m))]
5657
#[inline]
5758
pub fn is_fifo_ready(&self) -> bool {
58-
unsafe { ptr::read_volatile(self.register.get()) & 1 == 1 }
59+
unsafe { ptr::read_volatile(self.register.get()) & 0b1 == 1 }
60+
}
61+
62+
/// Returns `true` if the stimulus port is ready to accept more data
63+
#[cfg(armv8m)]
64+
#[inline]
65+
pub fn is_fifo_ready(&self) -> bool {
66+
// ARMv8-M adds a disabled bit; we indicate that we are ready to
67+
// proceed with a stimulus write if the port is either ready (bit 0) or
68+
// disabled (bit 1).
69+
unsafe { ptr::read_volatile(self.register.get()) & 0b11 != 0 }
5970
}
6071
}

0 commit comments

Comments
 (0)