qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 830cd5: usb: Fix bootindex for portnr > 9


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 830cd5: usb: Fix bootindex for portnr > 9
Date: Fri, 29 Aug 2014 06:30:06 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 830cd54fca126f5dab9b34b48a61304f2401e982
      
https://github.com/qemu/qemu/commit/830cd54fca126f5dab9b34b48a61304f2401e982
  Author: Markus Armbruster <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M hw/usb/bus.c

  Log Message:
  -----------
  usb: Fix bootindex for portnr > 9

We identify devices by their Open Firmware device paths.  The encoding
of the host controller and hub port numbers is incorrect:
usb_get_fw_dev_path() formats them in decimal, while SeaBIOS uses
hexadecimal.  When some port number > 9, SeaBIOS will miss the
bootindex (lucky case), or apply it to another device (unlucky case).

The relevant spec[*] agrees with SeaBIOS (and OVMF, for that matter).
Change %d to %x.

Bug can bite only with host controllers or hubs sporting more than ten
ports.  I'm not aware of any.

[*] Open Firmware Recommended Practice: Universal Serial Bus,
Version 1, Section 3.2.1 Device Node Address Representation
http://www.openfirmware.org/1275/bindings/usb/usb-1_0.ps

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>

Note: xhci can be configured with up to 15 ports (default is 4 ports).

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 8c244210d842b71e838c8fc5219b6ab3e4063d71
      
https://github.com/qemu/qemu/commit/8c244210d842b71e838c8fc5219b6ab3e4063d71
  Author: Gonglei <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M hw/usb/hcd-xhci.c

  Log Message:
  -----------
  xhci: fix debug print compiling error

after commit 003e15a180373048f0c1f4df0bfe303746eb2676
the DPRINTF will broke compiling, adjust its location.

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: cae7f29c47dee0bd0474fa7f1dda28b115a34d33
      
https://github.com/qemu/qemu/commit/cae7f29c47dee0bd0474fa7f1dda28b115a34d33
  Author: Jack Un <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M hw/usb/hcd-ohci.c

  Log Message:
  -----------
  Fix OHCI ISO TD state never being written back.

There appears to be typo in OHCI with isochronous transfers
resulting in isoch. transfer descriptor state never being written back.
The'put_words' function is in a OR statement hence it is never called.

Signed-off-by: Jack Un <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 3d80365b5558eb1b0a8374362c41570c37a4aba9
      
https://github.com/qemu/qemu/commit/3d80365b5558eb1b0a8374362c41570c37a4aba9
  Author: Gerd Hoffmann <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M hw/usb/hcd-xhci.c

  Log Message:
  -----------
  xhci: use (1u << i)

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>


  Commit: f90e160b502fb5c464eb9417ac075a78f13e9801
      
https://github.com/qemu/qemu/commit/f90e160b502fb5c464eb9417ac075a78f13e9801
  Author: Gerd Hoffmann <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M hw/usb/hcd-xhci.c

  Log Message:
  -----------
  Revert "xhci: Fix number of streams allocated when using streams"

This reverts commit d063c3112c4cd23a479ee18720c2bd119da2d315.

"2 << x" is the same as "2 ^ (x + 1)", so the old code is correct.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: e5a9bece9b5064d0cb0fda68ff68b9361085f400
      
https://github.com/qemu/qemu/commit/e5a9bece9b5064d0cb0fda68ff68b9361085f400
  Author: Gonglei <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M hw/usb/bus.c
    M include/hw/usb.h

  Log Message:
  -----------
  usb: add usb_bus_release function

add global variables releasing logic when the usb buses
were removed or hot-unpluged.

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 80be63df5a19816629343f704345b71e83e6d960
      
https://github.com/qemu/qemu/commit/80be63df5a19816629343f704345b71e83e6d960
  Author: Gonglei <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M hw/usb/hcd-ohci.c

  Log Message:
  -----------
  usb-ohci: Fix memory leak for ohci timer

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 07832c38d3c359f909609c4ab68ccc0d3282d7ee
      
https://github.com/qemu/qemu/commit/07832c38d3c359f909609c4ab68ccc0d3282d7ee
  Author: Gonglei <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M hw/usb/hcd-ohci.c

  Log Message:
  -----------
  usb-ohci: add exit function

clean up ohci resource when ohci pci device exit.

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 3a3464b000776c21d0b650036cbdfdc45e9eb172
      
https://github.com/qemu/qemu/commit/3a3464b000776c21d0b650036cbdfdc45e9eb172
  Author: Gonglei <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M hw/usb/hcd-uhci.c

  Log Message:
  -----------
  usb-uhci: clean up uhci resource when pci-uhci exit

clean up uhci resource when uhci pci device exit.

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 05a36991c54e32a95d096337fa008938340878d3
      
https://github.com/qemu/qemu/commit/05a36991c54e32a95d096337fa008938340878d3
  Author: Gonglei <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M hw/usb/hcd-ehci.c
    M hw/usb/hcd-ehci.h

  Log Message:
  -----------
  usb-ehci: add vmstate properity for EHCIState

since hotunplug the ehci host adapter, we should
delete vm_change_state_handler also, so the
VMChangeStateEntry should be saved in EHCIState.

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 4e130cf6a83193218e357e6db49a7ade24ab9675
      
https://github.com/qemu/qemu/commit/4e130cf6a83193218e357e6db49a7ade24ab9675
  Author: Gonglei <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M hw/usb/hcd-ehci.c
    M hw/usb/hcd-ehci.h

  Log Message:
  -----------
  usb-ehci: add ehci unrealize funciton

cleanup ehci controller resource, both pci and sysbus
if they're necessary.

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 96e14926c66dc7da99bea80d639a30cce0772991
      
https://github.com/qemu/qemu/commit/96e14926c66dc7da99bea80d639a30cce0772991
  Author: Gonglei <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M hw/usb/hcd-ehci-pci.c

  Log Message:
  -----------
  usb-ehci: add ehci-pci device exit function

clean up ehci resource when ehci pci device exit.

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 53c30545fb34c43c84d62ea1c2b0dc6b53303c34
      
https://github.com/qemu/qemu/commit/53c30545fb34c43c84d62ea1c2b0dc6b53303c34
  Author: Gonglei <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M hw/usb/hcd-xhci.c

  Log Message:
  -----------
  usb-xhci: add exit function

clean up xhci resource when xhci pci device exit.

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: d733f74c333184179770e4d5017366da4b449cce
      
https://github.com/qemu/qemu/commit/d733f74c333184179770e4d5017366da4b449cce
  Author: Gonglei <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M hw/usb/hcd-ehci.c
    M hw/usb/hcd-uhci.c
    M hw/usb/hcd-xhci.c
    M trace-events

  Log Message:
  -----------
  usb: add usb host adapters exit trace

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 28edfce0f3e8536b30573343618635f8713d6326
      
https://github.com/qemu/qemu/commit/28edfce0f3e8536b30573343618635f8713d6326
  Author: Gonglei <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M MAINTAINERS
    M tests/Makefile
    A tests/usb-hcd-ohci-test.c

  Log Message:
  -----------
  tests: add OHCI qtest

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 44ced58e3adf1bb16cac9d5b7bb178f75405902f
      
https://github.com/qemu/qemu/commit/44ced58e3adf1bb16cac9d5b7bb178f75405902f
  Author: Gonglei <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M tests/Makefile
    A tests/usb-hcd-uhci-test.c

  Log Message:
  -----------
  tests: add UHCI qtest

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 25e89ec5d2c7f8d953cb1ca558afa74974ff8930
      
https://github.com/qemu/qemu/commit/25e89ec5d2c7f8d953cb1ca558afa74974ff8930
  Author: Gonglei <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M tests/Makefile
    A tests/usb-hcd-xhci-test.c

  Log Message:
  -----------
  tests: add xHCI qtest

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: d9aa68855724752a5684c6acfb17d8db15cec2f8
      
https://github.com/qemu/qemu/commit/d9aa68855724752a5684c6acfb17d8db15cec2f8
  Author: Peter Maydell <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M MAINTAINERS
    M hw/usb/bus.c
    M hw/usb/hcd-ehci-pci.c
    M hw/usb/hcd-ehci.c
    M hw/usb/hcd-ehci.h
    M hw/usb/hcd-ohci.c
    M hw/usb/hcd-uhci.c
    M hw/usb/hcd-xhci.c
    M include/hw/usb.h
    M tests/Makefile
    A tests/usb-hcd-ohci-test.c
    A tests/usb-hcd-uhci-test.c
    A tests/usb-hcd-xhci-test.c
    M trace-events

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20140829-1' into 
staging

usb: bugfix collection.
usb: add cleanup functions for host adapters,
     in preparation for hotplug support.
usb: add simple qtests for uhci,ohci,xhci.

# gpg: Signature made Fri 29 Aug 2014 12:56:20 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"

* remotes/kraxel/tags/pull-usb-20140829-1:
  tests: add xHCI qtest
  tests: add UHCI qtest
  tests: add OHCI qtest
  usb: add usb host adapters exit trace
  usb-xhci: add exit function
  usb-ehci: add ehci-pci device exit function
  usb-ehci: add ehci unrealize funciton
  usb-ehci: add vmstate properity for EHCIState
  usb-uhci: clean up uhci resource when pci-uhci exit
  usb-ohci: add exit function
  usb-ohci: Fix memory leak for ohci timer
  usb: add usb_bus_release function
  Revert "xhci: Fix number of streams allocated when using streams"
  xhci: use (1u << i)
  Fix OHCI ISO TD state never being written back.
  xhci: fix debug print compiling error
  usb: Fix bootindex for portnr > 9

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/a6aebb38ba46...d9aa68855724

reply via email to

[Prev in Thread] Current Thread [Next in Thread]