ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-31 22:50:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

usb_host: make device creation/destruction robust

Browse Source 
- Signal device ready depending on state (ready or not) immediately or
  when "actconfig" is set
- Report new devices when ready
- Drain packet stream in case there is no device present (needed for
  synchronous operations at client side)
- Do not use 'session_device' on device destruction, check pointer
  directly instead

issue #4149
This commit is contained in:
Sebastian Sumpf 2021-05-20 18:40:59 +02:00 committed by Christian Helmuth
parent 708b7f4619
commit 6910b880e7
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
repos/dde_linux/src/drivers/usb_host/raw.cc
View File

@ -613,6 +613,8 @@ class Device : public List<Device>::Element
wait_queue_head_t wait; wait_queue_head_t wait;
_wait_event(wait, ready()); _wait_event(wait, ready());
report_device_list();
if (_sigh_ready.valid()) if (_sigh_ready.valid())
Signal_transmitter(_sigh_ready).submit(); Signal_transmitter(_sigh_ready).submit();
@ -636,8 +638,6 @@ class Device : public List<Device>::Element
if (!Lx::scheduler().active()) { if (!Lx::scheduler().active()) {
Lx::scheduler().schedule(); } Lx::scheduler().schedule(); }
report_device_list();
} }
~Device() ~Device()
@ -873,6 +873,17 @@ class Usb::Session_component : public Session_rpc_object,
Usb::Cleaner &_cleaner; Usb::Cleaner &_cleaner;
void _drain_packet_stream()
{
while (sink()->packet_avail() && sink()->ready_to_ack()) {
Packet_descriptor p = sink()->get_packet();
p.succeded = false;
p.error = Packet_descriptor::NO_DEVICE_ERROR;
sink()->acknowledge_packet(p);
}
}
void _signal_state_change() void _signal_state_change()
{ {
if (_sigh_state_change.valid()) if (_sigh_state_change.valid())
@ -881,10 +892,13 @@ class Usb::Session_component : public Session_rpc_object,
void _receive() void _receive()
{ {
if (!_device) return; if (!_device) {
_drain_packet_stream();
return;
}
_device->packet_avail();
if (!Lx::scheduler().active()) { if (!Lx::scheduler().active()) {
_device->packet_avail();
Lx::scheduler().schedule(); Lx::scheduler().schedule();
} }
} }
@ -1091,7 +1105,7 @@ class Usb::Session_component : public Session_rpc_object,
return true; return true;
case DEVICE_REMOVE: case DEVICE_REMOVE:
if (!session_device(device)) if (device != _device)
return false; return false;
_device = nullptr; _device = nullptr;
@ -1106,8 +1120,10 @@ class Usb::Session_component : public Session_rpc_object,
{ {
_sigh_state_change = sigh; _sigh_state_change = sigh;
if (_device && _device->ready()) if (_device && _device->ready()) {
Signal_transmitter(_sigh_state_change).submit(); Signal_transmitter(_sigh_state_change).submit();
} else if (_device)
_device->sigh_ready(sigh);
} }
Ram_dataspace_capability tx_ds() { return _tx_ds; } Ram_dataspace_capability tx_ds() { return _tx_ds; }