itsscb/embassy
1
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2025-10-02 14:44:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3811 from elagil/fix_stm32h5_ucpd

Browse Source 
Fix STM32H5 UCPD reception
This commit is contained in:
Dario Nieuwenhuis 2025-01-26 20:20:25 +00:00 committed by GitHub
commit 3064318220
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
embassy-stm32/src/ucpd.rs
View File

@ -137,6 +137,13 @@ impl<'d, T: Instance> Ucpd<'d, T> {
unsafe { T::Interrupt::enable() }; unsafe { T::Interrupt::enable() };
let r = T::REGS; let r = T::REGS;
#[cfg(stm32h5)]
r.cfgr2().write(|w| {
// Only takes effect, when UCPDEN=0.
w.set_rxafilten(true);
});
r.cfgr1().write(|w| { r.cfgr1().write(|w| {
// "The receiver is designed to work in the clock frequency range from 6 to 18 MHz. // "The receiver is designed to work in the clock frequency range from 6 to 18 MHz.
// However, the optimum performance is ensured in the range from 6 to 12 MHz" // However, the optimum performance is ensured in the range from 6 to 12 MHz"
@ -175,11 +182,6 @@ impl<'d, T: Instance> Ucpd<'d, T> {
w.set_ucpden(true); w.set_ucpden(true);
}); });
#[cfg(stm32h5)]
r.cfgr2().write(|w| {
w.set_rxafilten(true);
});
// Software trim according to RM0481, p. 2650/2668 // Software trim according to RM0481, p. 2650/2668
#[cfg(stm32h5)] #[cfg(stm32h5)]
{ {
@ -436,7 +438,7 @@ impl<'d, T: Instance> PdPhy<'d, T> {
pub async fn receive_with_sop(&mut self, buf: &mut [u8]) -> Result<(Sop, usize), RxError> { pub async fn receive_with_sop(&mut self, buf: &mut [u8]) -> Result<(Sop, usize), RxError> {
let r = T::REGS; let r = T::REGS;
let dma = unsafe { let mut dma = unsafe {
self.rx_dma self.rx_dma
.read(r.rxdr().as_ptr() as *mut u8, buf, TransferOptions::default()) .read(r.rxdr().as_ptr() as *mut u8, buf, TransferOptions::default())
}; };
@ -451,14 +453,20 @@ impl<'d, T: Instance> PdPhy<'d, T> {
}); });
}); });
// Stop DMA reception immediately after receiving a packet, to prevent storing multiple packets in the same buffer.
poll_fn(|cx| { poll_fn(|cx| {
let sr = r.sr().read(); let sr = r.sr().read();
if sr.rxhrstdet() { if sr.rxhrstdet() {
dma.request_stop();
// Clean and re-enable hard reset receive interrupt. // Clean and re-enable hard reset receive interrupt.
r.icr().write(|w| w.set_rxhrstdetcf(true)); r.icr().write(|w| w.set_rxhrstdetcf(true));
r.imr().modify(|w| w.set_rxhrstdetie(true)); r.imr().modify(|w| w.set_rxhrstdetie(true));
Poll::Ready(Err(RxError::HardReset)) Poll::Ready(Err(RxError::HardReset))
} else if sr.rxmsgend() { } else if sr.rxmsgend() {
dma.request_stop();
let ret = if sr.rxovr() { let ret = if sr.rxovr() {
Err(RxError::Overrun) Err(RxError::Overrun)
} else if sr.rxerr() { } else if sr.rxerr() {