Commit e679f052 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'kraxel/tags/pull-usb-1' into staging 



Improvements for usb3 bulk stream (usb core, xhci).
Bugfixes for uas emulation.
Add remote wakeup support for ehci.
Add suspend support for xhci.
Misc minor tweaks and fixes.

# gpg: Signature made Thu 28 Nov 2013 11:44:49 PM PST using RSA key ID D3E87138
# gpg: Can't check signature: public key not found

# By Hans de Goede (11) and others
# Via Gerd Hoffmann
* kraxel/tags/pull-usb-1:
  usb: move usb_{hi,lo} helpers to header file.
  usb: add vendor request defines
  trace-events: Clean up after removal of old usb-host code
  Revert "usb-tablet: Don't claim wakeup capability for USB-2 version"
  ehci: implement port wakeup
  xhci: Call usb_device_alloc/free_streams
  usb: Add usb_device_alloc/free_streams
  usb: Add max_streams attribute to endpoint info
  uas: s/ui/iu/
  uas: Fix response iu struct definition
  uas: Bounds check tags when using streams
  uas: Streams are numbered 1-y, rather then 0-x
  uas: Fix / cleanup usb_uas_task error handling
  uas: Only use report iu-s for task_mgmt status reporting
  scsi: Add 2 new sense codes needed by uas
  xhci: add support for suspend/resume
  xhci: Add a few missing checks for disconnected devices

Message-id: 1385712381-30918-1-git-send-email-kraxel@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parents 783eb67e 0b1fa34e

hw/scsi/scsi-bus.c

+10 −0
Original line number Diff line number Diff line
@@ -1293,6 +1293,11 @@ const struct SCSISense sense_code_ILLEGAL_REQ_REMOVAL_PREVENTED = { 
    .key = ILLEGAL_REQUEST, .asc = 0x53, .ascq = 0x02

};



/* Illegal request, Invalid Transfer Tag */

const struct SCSISense sense_code_INVALID_TAG = {

    .key = ILLEGAL_REQUEST, .asc = 0x4b, .ascq = 0x01

};



/* Command aborted, I/O process terminated */

const struct SCSISense sense_code_IO_ERROR = {

    .key = ABORTED_COMMAND, .asc = 0x00, .ascq = 0x06
@@ -1308,6 +1313,11 @@ const struct SCSISense sense_code_LUN_FAILURE = { 
    .key = ABORTED_COMMAND, .asc = 0x3e, .ascq = 0x01

};



/* Command aborted, Overlapped Commands Attempted */

const struct SCSISense sense_code_OVERLAPPED_COMMANDS = {

    .key = ABORTED_COMMAND, .asc = 0x4e, .ascq = 0x00

};



/* Unit attention, Capacity data has changed */

const struct SCSISense sense_code_CAPACITY_CHANGED = {

    .key = UNIT_ATTENTION, .asc = 0x2a, .ascq = 0x09

hw/usb/bus.c

+18 −0
Original line number Diff line number Diff line
@@ -203,6 +203,24 @@ void usb_device_ep_stopped(USBDevice *dev, USBEndpoint *ep) 
    }

}



int usb_device_alloc_streams(USBDevice *dev, USBEndpoint **eps, int nr_eps,

                             int streams)

{

    USBDeviceClass *klass = USB_DEVICE_GET_CLASS(dev);

    if (klass->alloc_streams) {

        return klass->alloc_streams(dev, eps, nr_eps, streams);

    }

    return 0;

}



void usb_device_free_streams(USBDevice *dev, USBEndpoint **eps, int nr_eps)

{

    USBDeviceClass *klass = USB_DEVICE_GET_CLASS(dev);

    if (klass->free_streams) {

        klass->free_streams(dev, eps, nr_eps);

    }

}



static int usb_qdev_init(DeviceState *qdev)

{

    USBDevice *dev = USB_DEVICE(qdev);

hw/usb/core.c

+22 −0
Original line number Diff line number Diff line
@@ -623,6 +623,7 @@ void usb_ep_reset(USBDevice *dev) 
    dev->ep_ctl.type = USB_ENDPOINT_XFER_CONTROL;

    dev->ep_ctl.ifnum = 0;

    dev->ep_ctl.max_packet_size = 64;

    dev->ep_ctl.max_streams = 0;

    dev->ep_ctl.dev = dev;

    dev->ep_ctl.pipeline = false;

    for (ep = 0; ep < USB_MAX_ENDPOINTS; ep++) {
@@ -636,6 +637,8 @@ void usb_ep_reset(USBDevice *dev) 
        dev->ep_out[ep].ifnum = USB_INTERFACE_INVALID;

        dev->ep_in[ep].max_packet_size = 0;

        dev->ep_out[ep].max_packet_size = 0;

        dev->ep_in[ep].max_streams = 0;

        dev->ep_out[ep].max_streams = 0;

        dev->ep_in[ep].dev = dev;

        dev->ep_out[ep].dev = dev;

        dev->ep_in[ep].pipeline = false;
@@ -764,6 +767,25 @@ int usb_ep_get_max_packet_size(USBDevice *dev, int pid, int ep) 
    return uep->max_packet_size;

}



void usb_ep_set_max_streams(USBDevice *dev, int pid, int ep, uint8_t raw)

{

    struct USBEndpoint *uep = usb_ep_get(dev, pid, ep);

    int MaxStreams;



    MaxStreams = raw & 0x1f;

    if (MaxStreams) {

        uep->max_streams = 1 << MaxStreams;

    } else {

        uep->max_streams = 0;

    }

}



int usb_ep_get_max_streams(USBDevice *dev, int pid, int ep)

{

    struct USBEndpoint *uep = usb_ep_get(dev, pid, ep);

    return uep->max_streams;

}



void usb_ep_set_pipeline(USBDevice *dev, int pid, int ep, bool enabled)

{

    struct USBEndpoint *uep = usb_ep_get(dev, pid, ep);

hw/usb/desc.c

+2 −10
Original line number Diff line number Diff line
@@ -6,16 +6,6 @@ 


/* ------------------------------------------------------------------ */



static uint8_t usb_lo(uint16_t val)

{

    return val & 0xff;

}



static uint8_t usb_hi(uint16_t val)

{

    return (val >> 8) & 0xff;

}



int usb_desc_device(const USBDescID *id, const USBDescDevice *dev,

                    uint8_t *dest, size_t len)

{
@@ -385,6 +375,8 @@ static void usb_desc_ep_init(USBDevice *dev) 
            usb_ep_set_ifnum(dev, pid, ep, iface->bInterfaceNumber);

            usb_ep_set_max_packet_size(dev, pid, ep,

                                       iface->eps[e].wMaxPacketSize);

            usb_ep_set_max_streams(dev, pid, ep,

                                   iface->eps[e].bmAttributes_super);

        }

    }

}

hw/usb/desc.h

+11 −0
Original line number Diff line number Diff line
@@ -194,6 +194,17 @@ struct USBDesc { 


#define USB_DESC_FLAG_SUPER (1 << 1)



/* little helpers */

static inline uint8_t usb_lo(uint16_t val)

{

    return val & 0xff;

}



static inline uint8_t usb_hi(uint16_t val)

{

    return (val >> 8) & 0xff;

}



/* generate usb packages from structs */

int usb_desc_device(const USBDescID *id, const USBDescDevice *dev,

                    uint8_t *dest, size_t len);