alex/rp-hal-boards
1
0
Fork 0
mirror of https://github.com/italicsjenga/rp-hal-boards.git synced 2025-01-23 01:36:35 +11:00
Code Issues Projects Releases Packages Wiki Activity

Clear sie_status.suspended / sie_status.resume flags in poll()

Browse source 
usb_device ignores PollResult::Suspend when already suspended,
and PollResult::Resume when not suspended.

This may lead to repeatedly triggered interrupts if for some reason
the Suspend flag gets set while the device is already suspended.

I observed such a situation when a reset was triggered while the device
was suspended.

To make sure that this can't cause interrupt storms, clear the flags
before returning from poll()
This commit is contained in:
Jan Niehusmann 2022-08-02 22:05:38 +00:00
parent 786062aa74
commit b636afb7b5
1 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
rp2040-hal/src/usb.rs
View file

@ -538,24 +538,8 @@ impl UsbBusTrait for UsbBus {
.bit_is_set() .bit_is_set()
}) })
} }
fn suspend(&self) { fn suspend(&self) {}
interrupt::free(|cs| { fn resume(&self) {}
let inner = self.inner.borrow(cs).borrow_mut();
inner
.ctrl_reg
.sie_status
.write(|w| w.suspended().set_bit());
});
}
fn resume(&self) {
interrupt::free(|cs| {
let inner = self.inner.borrow(cs).borrow_mut();
inner
.ctrl_reg
.sie_status
.write(|w| w.resume().set_bit());
});
}
fn poll(&self) -> PollResult { fn poll(&self) -> PollResult {
interrupt::free(|cs| { interrupt::free(|cs| {
let mut inner = self.inner.borrow(cs).borrow_mut(); let mut inner = self.inner.borrow(cs).borrow_mut();
@ -565,8 +549,10 @@ impl UsbBusTrait for UsbBus {
if sie_status.bus_reset().bit_is_set() { if sie_status.bus_reset().bit_is_set() {
return PollResult::Reset; return PollResult::Reset;
} else if sie_status.suspended().bit_is_set() { } else if sie_status.suspended().bit_is_set() {
inner.ctrl_reg.sie_status.write(|w| w.suspended().set_bit());
return PollResult::Suspend; return PollResult::Suspend;
} else if sie_status.resume().bit_is_set() { } else if sie_status.resume().bit_is_set() {
inner.ctrl_reg.sie_status.write(|w| w.resume().set_bit());
return PollResult::Resume; return PollResult::Resume;
} }