ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/usb/canokey: fix compatibility of qemu-xhci 

XHCI wont poll interrupt IN endpoint if NAKed, and needs wakeup

Suggested-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Hongren (Zenithal) Zheng <i@zenithal.me>
Message-Id: <YqcqSHNpI7sXRNpZ@Sun>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Hongren (Zenithal) Zheng 2022-06-13 20:15:04 +08:00 committed by Gerd Hoffmann
parent ada270cd18
commit 1042563027
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/usb/canokey.c
View File

@ -103,6 +103,13 @@ int canokey_emu_transmit(
pbuf, size);
key->ep_in_size[ep_in] += size;
key->ep_in_state[ep_in] = CANOKEY_EP_IN_READY;
/*
* wake up controller if we NAKed IN token before
* Note: this is a quirk for CanoKey CTAPHID
*/
if (ep_in == CANOKEY_EMU_EP_CTAPHID) {
usb_wakeup(usb_ep_get(&key->dev, USB_TOKEN_IN, ep_in), 0);
}
/*
* ready for more data in device loop
*
@ -208,6 +215,22 @@ static void canokey_handle_data(USBDevice *dev, USBPacket *p)
key->ep_out_size[ep_out] = out_len;
canokey_emu_data_out(ep_out, NULL);
}
/*
* Note: this is a quirk for CanoKey CTAPHID
*
* There is one code path that uses this device loop
* INTR IN -> useful data_in and useless device_loop -> NAKed
* INTR OUT -> useful device loop -> transmit -> wakeup
* (useful thanks to both data_in and data_out having been called)
* the next INTR IN -> actual data to guest
*
* if there is no such device loop, there would be no further
* INTR IN, no device loop, no transmit hence no usb_wakeup
* then qemu would hang
*/
if (ep_in == CANOKEY_EMU_EP_CTAPHID) {
canokey_emu_device_loop(); /* may call transmit multiple times */
}
break;
case USB_TOKEN_IN:
if (key->ep_in_pos[ep_in] == 0) { /* first time IN */