1. 05 7月, 2011 10 次提交
  2. 23 6月, 2011 2 次提交
    • G
      ehci: switch to nanoseconds · adddecb1
      Gerd Hoffmann 提交于
      Make ehci use nanoseconds everywhere.
      Simplifies time calculations.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      adddecb1
    • G
      ehci: add freq + maxframes properties · 16a2dee6
      Gerd Hoffmann 提交于
      Add properties for the wakeup rate and the max number of frames ehci
      will process at once.
      
      The wakeup rate defaults to 1000 which equals the usb frame rate.  This
      can be reduced to make qemu wake up less often when ehci is active.
      
      In case the wakeup rate is reduced or the ehci timer is delayed due to
      latency issues elsewhere in qemu ehci will process multiple frames at
      once.  The maxframes property specifies the upper limit for this.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      16a2dee6
  3. 15 6月, 2011 1 次提交
  4. 14 6月, 2011 15 次提交
    • B
      4001f22f
    • G
      025b168c
    • G
      usb-ehci: itd handling fixes. · e654887f
      Gerd Hoffmann 提交于
      This patch fixes a bunch of issues in the itd descriptor handling.
      Most important fix is to handle transfers which cross page borders
      correctly by looking up the address of the next page.  Luckily the
      linux uses physically contigous memory so the data used to hits the
      correct location even with this bug instead of corrupting guest
      memory.  Also the transfer length updates for outgoing transfers wasn't
      correct.
      
      While being at it DPRINTFs have been replaced by tracepoints.
      
      The isoch_pause logic has been disabled.  Not clear to me which propose
      this serves and I think it is incorrect too as we just skip processing
      itds.  Even when no xfer happens we have to clear the active bit.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      e654887f
    • G
      usb-ehci: drop EXECUTING checks. · d0539307
      Gerd Hoffmann 提交于
      The state machine doesn't stop in EXECUTING state any more when async
      packets are in flight, so the checks are not needed any more and can
      be dropped.
      
      Also kick out the check for the frame timer.  As we don't stop & sleep
      any more on async packets this is obsolete.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      d0539307
    • G
      usb: cancel async packets on unplug · 07771f6f
      Gerd Hoffmann 提交于
      This patch adds USBBusOps struct with (for now) only a single callback
      which is called when a device is about to be destroyed.  The USB Host
      adapters are implementing this callback and use it to cancel any async
      requests which might be in flight before the device actually goes away.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      07771f6f
    • H
    • G
      usb-ehci: fix error handling. · d2bd525f
      Gerd Hoffmann 提交于
      Set the correct bits for nodev, stall and babble errors.
      Raise errint irq.  Fix state transition from WRITEBACK
      to the next state.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      d2bd525f
    • G
      usb-ehci: fix offset writeback in ehci_buffer_rw · ba7cb5a8
      Gerd Hoffmann 提交于
      Two bugs at once:
      
      First the mask is backwards, so the it used to keeps the offset and
      clears the page address, which is not what we need when we update the
      offset.
      
      Second the offset calculation is wrong in case head isn't page aligned.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      ba7cb5a8
    • G
      usb-ehci: multiqueue support · 8ac6d699
      Gerd Hoffmann 提交于
      This patch adds support for keeping multiple queues going at the same
      time.  One slow device will not affect other devices any more.
      
      The patch adds code to manage EHCIQueue structs.  It also does a number
      of changes to the state machine:
      
       * The state machine will never ever stop in EXECUTING any more.
         Instead it will continue with the next queue (aka HORIZONTALQH) when
         the usb device returns USB_RET_ASYNC.
       * The state machine will stop processing when it figures it walks in
         circles (easy to figure now that we have a EHCIQueue struct for each
         QH we've processed).  The bailout logic should not be needed any
         more.  For now it is still in, but will assert() in case it triggers.
       * The state machine will just skip queues with a async USBPacket in
         flight.
       * The state machine will resume processing as soon as the async
         USBPacket is finished.
      
      The patch also takes care to flush the QH struct back to guest memory
      when needed, so we don't get stale data when (re-)loading it from guest
      memory in FETCHQH state.
      
      It also makes the writeback code to not touch the first three dwords of
      the QH struct as the EHCI must not write them.  This actually fixes a
      bug where QH chaining changes (next ptr) by the linux ehci driver where
      overwritten by the emulated EHCI.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      8ac6d699
    • G
      usb-ehci: add queue data struct · 0122f472
      Gerd Hoffmann 提交于
      Add EHCIQueue struct, move the fields needed to track the queue state
      into that struct.  Pass the new struct instead of ehci state down to
      functions which handle the queue state.  Lot of variable references have
      changed due to that without an actual functional change.
      
      Replace fetch_addr with two variables, one for async and one for
      periodic schedule.  Add functions to get and set the fetch address.
      
      Use EHCIQueue->usb_status (old name: EHCIState->exec_status) directly in
      ehci_execute_complete instead of passing around the status using a
      parameters and the return value.
      
      ehci_state_fetchqh returns a EHCIQueue struct now.
      
      No change in behavior.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      0122f472
    • G
      usb-ehci: trace buffer copy · f2c88dc1
      Gerd Hoffmann 提交于
      Add a trace point for buffer copies and drop the DPRINTF's.
      
      No change in behavior.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      f2c88dc1
    • G
      usb-ehci: improve mmio tracing · c4f8e211
      Gerd Hoffmann 提交于
      Add a separate tracepoint to log how register values change in response
      to a mmio write.  Especially useful for registers which have read-only
      or clear-on-write bits in them.
      
      No change in behavior.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      c4f8e211
    • G
      usb-ehci: trace port state · dcbd0b5c
      Gerd Hoffmann 提交于
      Trace usb port operations (attach, detach, reset),
      drop a few obsolete DPRINTF's.
      
      No change in behavior.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      dcbd0b5c
    • G
      usb-ehci: trace state machine changes · 26d53979
      Gerd Hoffmann 提交于
      Add functions to get and set the current state of the state machine,
      add tracepoints there to trace state transitions.  Add support for
      traceing the queue heads and transfer descriptors as we look at them.
      
      Drop a few DPRINTFs and all DPRINTF_ST lines, they are obsolete now.
      
      No change in behavior.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      26d53979
    • G
      usb-ehci: trace mmio and usbsts · 439a97cc
      Gerd Hoffmann 提交于
      This patch starts adding trace support to ehci.  It traces
      updates of the status register (USBSTS), mmio access and
      controller reset.
      
      It also adds functions to set and clear status register bits
      and puts them in use everywhere.
      
      Some DPRINTF's are dropped in favor of the new tracepoints.
      
      No change in behavior.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      439a97cc
  5. 26 5月, 2011 1 次提交
    • G
      usb: add ehci adapter · 94527ead
      Gerd Hoffmann 提交于
      This patch finally merges the EHCI host adapter aka USB 2.0 support.
      
      Based on the ehci bits collected @ git://git.kiszka.org/qemu.git ehci
      
      EHCI has a long out-of-tree history.  Project was started by Mark
      Burkley, with contributions by Niels de Vos.  David S. Ahern continued
      working on it.  Kevin Wolf, Jan Kiszka and Vincent Palatin contributed
      bugfixes.
      
      /me (Gerd Hoffmann) picked it up where it left off, prepared the code
      for merge, fixed a few bugs and added basic user docs.
      
      Cc: David S. Ahern <daahern@cisco.com>
      Cc: Jan Kiszka <jan.kiszka@web.de>
      Cc: Kevin Wolf <mail@kevin-wolf.de>
      Cc: Vincent Palatin <vincent.palatin_qemu@m4x.org>
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      94527ead