Commit dae288d7 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9d81b2d2 2041649f

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -999,6 +999,7 @@ F: docs/usb2.txt 
F: docs/usb-storage.txt

F: include/hw/usb.h

F: include/hw/usb/

F: default-configs/usb.mak



USB (serial adapter)

M: Gerd Hoffmann <kraxel@redhat.com>

configure

+0 −7
Original line number Diff line number Diff line
@@ -5935,13 +5935,6 @@ if test "$live_block_migration" = "yes" ; then 
  echo "CONFIG_LIVE_BLOCK_MIGRATION=y" >> $config_host_mak

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?

if test "$tpm" = "yes"; then

  echo 'CONFIG_TPM=$(CONFIG_SOFTMMU)' >> $config_host_mak

hw/usb/Makefile.objs

+5 −1
Original line number Diff line number Diff line
@@ -38,7 +38,11 @@ endif 
common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o



# 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)

common-obj-$(CONFIG_XEN) += xen-usb.o

hw/usb/hcd-xhci.c

+2 −2
Original line number Diff line number Diff line
@@ -811,8 +811,9 @@ static void xhci_er_reset(XHCIState *xhci, int v) 
{

    XHCIInterrupter *intr = &xhci->intr[v];

    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 */

        intr->er_start = 0;

        intr->er_size = 0;
@@ -824,7 +825,6 @@ static void xhci_er_reset(XHCIState *xhci, int v) 
        xhci_die(xhci);

        return;

    }

    dma_addr_t erstba = xhci_addr64(intr->erstba_low, intr->erstba_high);

    pci_dma_read(PCI_DEVICE(xhci), erstba, &seg, sizeof(seg));

    le32_to_cpus(&seg.addr_low);

    le32_to_cpus(&seg.addr_high);