Commit 560c30b1 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'kraxel/usb.75' into staging 



* kraxel/usb.75: (32 commits)
  uhci: stop using portio lists
  usbredir: Add support for buffered bulk input (v2)
  exynos4210: Add EHCI support
  usb/ehci: Add SysBus EHCI device for Exynos4210
  usb/ehci: Move capsbase and opregbase into SysBus EHCI class
  usb/ehci: Clean up SysBus and PCI EHCI split
  xhci: call set-address with dummy usbpacket
  usb-redir: Add debugging to bufpq save / restore
  usbredir: Add usbredir_init_endpoints() helper
  usbredir: Verify we have 32 bits bulk length cap when redirecting to xhci
  usbredir: Add ep_stopped USBDevice method
  usbredir: Add USBEP2I and I2USBEP helper macros
  usbredir: Add an usbredir_stop_ep helper function
  usb: Add an usb_device_ep_stopped USBDevice method
  usb: Fix usb_ep_find_packet_by_id
  hid: Change idle handling to use a timer
  uhci: Maximize how many frames we catch up when behind
  uhci: Limit amount of frames processed in one go
  uhci: Add a QH_VALID define
  uhci: Fix pending interrupts getting lost on migration
  ...

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents c3dd94b1 89eb147c

configure

+1 −1
Original line number Diff line number Diff line
@@ -2851,7 +2851,7 @@ fi 


# check for usbredirparser for usb network redirection support

if test "$usb_redir" != "no" ; then

    if $pkg_config --atleast-version=0.5.3 libusbredirparser-0.5 >/dev/null 2>&1 ; then

    if $pkg_config --atleast-version=0.6 libusbredirparser-0.5 >/dev/null 2>&1 ; then

        usb_redir="yes"

        usb_redir_cflags=$($pkg_config --cflags libusbredirparser-0.5 2>/dev/null)

        usb_redir_libs=$($pkg_config --libs libusbredirparser-0.5 2>/dev/null)

hw/exynos4210.c

+7 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "arm-misc.h"

#include "loader.h"

#include "exynos4210.h"

#include "usb/hcd-ehci.h"



#define EXYNOS4210_CHIPID_ADDR         0x10000000
@@ -72,6 +73,9 @@ 
/* Display controllers (FIMD) */

#define EXYNOS4210_FIMD0_BASE_ADDR          0x11C00000



/* EHCI */

#define EXYNOS4210_EHCI_BASE_ADDR           0x12580000



static uint8_t chipid_and_omr[] = { 0x11, 0x02, 0x21, 0x43,

                                    0x09, 0x00, 0x00, 0x00 };
@@ -338,5 +342,8 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, 
            s->irq_table[exynos4210_get_irq(11, 2)],

            NULL);



    sysbus_create_simple(TYPE_EXYNOS4210_EHCI, EXYNOS4210_EHCI_BASE_ADDR,

            s->irq_table[exynos4210_get_irq(28, 3)]);



    return s;

}

hw/exynos4210_gic.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ combiner_grp_to_gic_id[64-EXYNOS4210_MAX_EXT_COMBINER_OUT_IRQ][8] = { 
            EXT_GIC_ID_I2C4, EXT_GIC_ID_I2C5, EXT_GIC_ID_I2C6,

            EXT_GIC_ID_I2C7 },

    /* int combiner group 28 */

    { EXT_GIC_ID_SPI0, EXT_GIC_ID_SPI1, EXT_GIC_ID_SPI2 },

    { EXT_GIC_ID_SPI0, EXT_GIC_ID_SPI1, EXT_GIC_ID_SPI2 , EXT_GIC_ID_USB_HOST},

    /* int combiner group 29 */

    { EXT_GIC_ID_HSMMC0, EXT_GIC_ID_HSMMC1, EXT_GIC_ID_HSMMC2,

     EXT_GIC_ID_HSMMC3, EXT_GIC_ID_SDMMC },

hw/hid.c

+37 −6
Original line number Diff line number Diff line
@@ -71,12 +71,38 @@ static const uint8_t hid_usage_keys[0x100] = { 


bool hid_has_events(HIDState *hs)

{

    return hs->n > 0;

    return hs->n > 0 || hs->idle_pending;

}



void hid_set_next_idle(HIDState *hs, int64_t curtime)

static void hid_idle_timer(void *opaque)

{

    hs->next_idle_clock = curtime + (get_ticks_per_sec() * hs->idle * 4) / 1000;

    HIDState *hs = opaque;



    hs->idle_pending = true;

    hs->event(hs);

}



static void hid_del_idle_timer(HIDState *hs)

{

    if (hs->idle_timer) {

        qemu_del_timer(hs->idle_timer);

        qemu_free_timer(hs->idle_timer);

        hs->idle_timer = NULL;

    }

}



void hid_set_next_idle(HIDState *hs)

{

    if (hs->idle) {

        uint64_t expire_time = qemu_get_clock_ns(vm_clock) +

                               get_ticks_per_sec() * hs->idle * 4 / 1000;

        if (!hs->idle_timer) {

            hs->idle_timer = qemu_new_timer_ns(vm_clock, hid_idle_timer, hs);

        }

        qemu_mod_timer_ns(hs->idle_timer, expire_time);

    } else {

        hid_del_idle_timer(hs);

    }

}



static void hid_pointer_event_clear(HIDPointerEvent *e, int buttons)
@@ -232,6 +258,8 @@ int hid_pointer_poll(HIDState *hs, uint8_t *buf, int len) 
    int index;

    HIDPointerEvent *e;



    hs->idle_pending = false;



    hid_pointer_activate(hs);



    /* When the buffer is empty, return the last event.  Relative
@@ -319,6 +347,8 @@ int hid_pointer_poll(HIDState *hs, uint8_t *buf, int len) 


int hid_keyboard_poll(HIDState *hs, uint8_t *buf, int len)

{

    hs->idle_pending = false;



    if (len < 2) {

        return 0;

    }
@@ -377,6 +407,8 @@ void hid_reset(HIDState *hs) 
    hs->n = 0;

    hs->protocol = 1;

    hs->idle = 0;

    hs->idle_pending = false;

    hid_del_idle_timer(hs);

}



void hid_free(HIDState *hs)
@@ -390,6 +422,7 @@ void hid_free(HIDState *hs) 
        qemu_remove_mouse_event_handler(hs->ptr.eh_entry);

        break;

    }

    hid_del_idle_timer(hs);

}



void hid_init(HIDState *hs, int kind, HIDEventFunc event)
@@ -412,9 +445,7 @@ static int hid_post_load(void *opaque, int version_id) 
{

    HIDState *s = opaque;



    if (s->idle) {

        hid_set_next_idle(s, qemu_get_clock_ns(vm_clock));

    }

    hid_set_next_idle(s);

    return 0;

}

hw/hid.h

+3 −2
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ struct HIDState { 
    int kind;

    int32_t protocol;

    uint8_t idle;

    int64_t next_idle_clock;

    bool idle_pending;

    QEMUTimer *idle_timer;

    HIDEventFunc event;

};
@@ -52,7 +53,7 @@ void hid_reset(HIDState *hs); 
void hid_free(HIDState *hs);



bool hid_has_events(HIDState *hs);

void hid_set_next_idle(HIDState *hs, int64_t curtime);

void hid_set_next_idle(HIDState *hs);

void hid_pointer_activate(HIDState *hs);

int hid_pointer_poll(HIDState *hs, uint8_t *buf, int len);

int hid_keyboard_poll(HIDState *hs, uint8_t *buf, int len);