mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: misc small fixes.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJZuPo5AAoJEEy22O7T6HE4haMP/0yfIpnYnJ/CzFReJKHoKgk5
 QRL0BEE9V0HpKxTdHnQojbLGVZsCXNO+G34/MneV34GQIyDC5XmE9JFBvLVEx9Si
 I6MKjriSUhxX9e1MGdZOYJVkQNMsooO7S2Ks5wRmQB/eOl0NJM6lZN/AxuY8yPit
 yHdbbQ/st9BnnumICYVGmNvpQxnRhkQkeE1SqldY5TxrQjlp6D3cbVkKYRpwesi6
 PoDus/VKfTgry99JCesKU8S1r0eEWh5yxXfAq6kZfIg1U2uPL4SqzsS/5jHh3y2y
 jUQR9ZWwBTzx3cOfWYE4kV7+IDvcih5lyTqKxjjOV8m4n/BXyiyx2LFbXsSl5Vlo
 RDP4xKPntqVegNFIBasvjChhwohybP9DjM0uMbZYoAvhDPcghx5B5KI/PVvT82xt
 o/4SvM6zKUZuhH4SifufNwCu96HDHlmMX/rGixjMozx/QlXcl0y3PnO2swpkCmjd
 jm620NlMYWFRsIf7zSxUKSL50mSR/p5xGXDWf6Y2zWPnhKwuhroQ+GoQVd7hsVOm
 8LuieSSVwEa55b4kg64jLPj+9ZSVRst24itq37KoUwVxoHmtQoB7NLfvAAfJE2A8
 wRAYDdWs8Lb8iMGyAh6kB+56fKS5IKNoEdQRAzRRn7+k4pELNjTVP7O2ro181PCX
 Yk9pUuCPBS+xBM83260v
 =duMO
 -----END PGP SIGNATURE-----

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

usb: misc small fixes.

# gpg: Signature made Wed 13 Sep 2017 10:28:25 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/usb-20170913-pull-request:
  usb: only build usb-host with CONFIG_USB=y
  usb: drop HOST_USB
  MAINTAINERS: add missing USB entry
  xhci: Avoid DMA when ERSTBA is set to zero

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-09-14 15:49:30 +01:00
commit dae288d7d8
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -999,6 +999,7 @@ F: docs/usb2.txt
F: docs/usb-storage.txt F: docs/usb-storage.txt
F: include/hw/usb.h F: include/hw/usb.h
F: include/hw/usb/ F: include/hw/usb/
F: default-configs/usb.mak
USB (serial adapter) USB (serial adapter)
M: Gerd Hoffmann <kraxel@redhat.com> M: Gerd Hoffmann <kraxel@redhat.com>

7
configure vendored
View File

@ -5935,13 +5935,6 @@ if test "$live_block_migration" = "yes" ; then
echo "CONFIG_LIVE_BLOCK_MIGRATION=y" >> $config_host_mak echo "CONFIG_LIVE_BLOCK_MIGRATION=y" >> $config_host_mak
fi fi
# USB host support
if test "$libusb" = "yes"; then
echo "HOST_USB=libusb legacy" >> $config_host_mak
else
echo "HOST_USB=stub" >> $config_host_mak
fi
# TPM passthrough support? # TPM passthrough support?
if test "$tpm" = "yes"; then if test "$tpm" = "yes"; then
echo 'CONFIG_TPM=$(CONFIG_SOFTMMU)' >> $config_host_mak echo 'CONFIG_TPM=$(CONFIG_SOFTMMU)' >> $config_host_mak

6
hw/usb/Makefile.objs
View File

@ -38,7 +38,11 @@ endif
common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o
# usb pass-through # usb pass-through
common-obj-y += $(patsubst %,host-%.o,$(HOST_USB)) ifeq ($(CONFIG_LIBUSB)$(CONFIG_USB),yy)
common-obj-y += host-libusb.o host-legacy.o
else
common-obj-y += host-stub.o
endif
ifeq ($(CONFIG_USB_LIBUSB),y) ifeq ($(CONFIG_USB_LIBUSB),y)
common-obj-$(CONFIG_XEN) += xen-usb.o common-obj-$(CONFIG_XEN) += xen-usb.o

4
hw/usb/hcd-xhci.c
View File

@ -811,8 +811,9 @@ static void xhci_er_reset(XHCIState *xhci, int v)
{ {
XHCIInterrupter *intr = &xhci->intr[v]; XHCIInterrupter *intr = &xhci->intr[v];
XHCIEvRingSeg seg; XHCIEvRingSeg seg;
dma_addr_t erstba = xhci_addr64(intr->erstba_low, intr->erstba_high);
if (intr->erstsz == 0) { if (intr->erstsz == 0 || erstba == 0) {
/* disabled */ /* disabled */
intr->er_start = 0; intr->er_start = 0;
intr->er_size = 0; intr->er_size = 0;
@ -824,7 +825,6 @@ static void xhci_er_reset(XHCIState *xhci, int v)
xhci_die(xhci); xhci_die(xhci);
return; return;
} }
dma_addr_t erstba = xhci_addr64(intr->erstba_low, intr->erstba_high);
pci_dma_read(PCI_DEVICE(xhci), erstba, &seg, sizeof(seg)); pci_dma_read(PCI_DEVICE(xhci), erstba, &seg, sizeof(seg));
le32_to_cpus(&seg.addr_low); le32_to_cpus(&seg.addr_low);
le32_to_cpus(&seg.addr_high); le32_to_cpus(&seg.addr_high);