Commit 40c67636 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/usb-20200317-pull-request' into staging 



usb: bugfixes for usb-serial @ xhci.

# gpg: Signature made Tue 17 Mar 2020 09:50:04 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/usb-20200317-pull-request:
  usb-serial: Fix timeout closing the device
  usb-serial: Increase receive buffer to 496
  usb-serial: chunk data to wMaxPacketSize
  usb-serial: Move USB_TOKEN_IN into a helper function

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3189e9d3 647ee987

hw/usb/dev-serial.c

+59 −36
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ do { printf("usb-serial: " fmt , ## __VA_ARGS__); } while (0) 
#define DPRINTF(fmt, ...) do {} while(0)

#endif



#define RECV_BUF 384

#define RECV_BUF (512 - (2 * 8))



/* Commands */

#define FTDI_RESET		0
@@ -332,7 +332,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p, 
        break;

    case DeviceInVendor | FTDI_GET_MDM_ST:

        data[0] = usb_get_modem_lines(s) | 1;

        data[1] = 0;

        data[1] = FTDI_THRE | FTDI_TEMT;

        p->actual_length = 2;

        break;

    case DeviceOutVendor | FTDI_SET_EVENT_CHR:
@@ -358,36 +358,18 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p, 
    }

}



static void usb_serial_handle_data(USBDevice *dev, USBPacket *p)

static void usb_serial_token_in(USBSerialState *s, USBPacket *p)

{

    USBSerialState *s = (USBSerialState *)dev;

    uint8_t devep = p->ep->nr;

    struct iovec *iov;

    const int max_packet_size = desc_iface0.eps[0].wMaxPacketSize;

    int packet_len;

    uint8_t header[2];

    int i, first_len, len;



    switch (p->pid) {

    case USB_TOKEN_OUT:

        if (devep != 2)

            goto fail;

        for (i = 0; i < p->iov.niov; i++) {

            iov = p->iov.iov + i;

            /* XXX this blocks entire thread. Rewrite to use

             * qemu_chr_fe_write and background I/O callbacks */

            qemu_chr_fe_write_all(&s->cs, iov->iov_base, iov->iov_len);

        }

        p->actual_length = p->iov.size;

        break;



    case USB_TOKEN_IN:

        if (devep != 1)

            goto fail;

        first_len = RECV_BUF - s->recv_ptr;

        len = p->iov.size;

        if (len <= 2) {

    packet_len = p->iov.size;

    if (packet_len <= 2) {

        p->status = USB_RET_NAK;

            break;

        return;

    }



    header[0] = usb_get_modem_lines(s) | 1;

    /* We do not have the uart details */

    /* handle serial break */
@@ -395,25 +377,66 @@ static void usb_serial_handle_data(USBDevice *dev, USBPacket *p) 
        s->event_trigger &= ~FTDI_BI;

        header[1] = FTDI_BI;

        usb_packet_copy(p, header, 2);

            break;

        return;

    } else {

        header[1] = 0;

    }



    if (!s->recv_used) {

        p->status = USB_RET_NAK;

        return;

    }



    while (s->recv_used && packet_len > 2) {

        int first_len, len;



        len = MIN(packet_len, max_packet_size);

        len -= 2;

        if (len > s->recv_used)

        if (len > s->recv_used) {

            len = s->recv_used;

        if (!len) {

            p->status = USB_RET_NAK;

            break;

        }

        if (first_len > len)



        first_len = RECV_BUF - s->recv_ptr;

        if (first_len > len) {

            first_len = len;

        }

        usb_packet_copy(p, header, 2);

        usb_packet_copy(p, s->recv_buf + s->recv_ptr, first_len);

        if (len > first_len)

        if (len > first_len) {

            usb_packet_copy(p, s->recv_buf, len - first_len);

        }

        s->recv_used -= len;

        s->recv_ptr = (s->recv_ptr + len) % RECV_BUF;

        packet_len -= len + 2;

    }



    return;

}



static void usb_serial_handle_data(USBDevice *dev, USBPacket *p)

{

    USBSerialState *s = (USBSerialState *)dev;

    uint8_t devep = p->ep->nr;

    struct iovec *iov;

    int i;



    switch (p->pid) {

    case USB_TOKEN_OUT:

        if (devep != 2)

            goto fail;

        for (i = 0; i < p->iov.niov; i++) {

            iov = p->iov.iov + i;

            /* XXX this blocks entire thread. Rewrite to use

             * qemu_chr_fe_write and background I/O callbacks */

            qemu_chr_fe_write_all(&s->cs, iov->iov_base, iov->iov_len);

        }

        p->actual_length = p->iov.size;

        break;



    case USB_TOKEN_IN:

        if (devep != 1)

            goto fail;

        usb_serial_token_in(s, p);

        break;



    default: