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

Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20140910-1' into staging 



xhci PCIe endpoint migration compatibility fix

# gpg: Signature made Wed 10 Sep 2014 06:35:20 BST using RSA key ID D3E87138
# 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>"

* remotes/kraxel/tags/pull-usb-20140910-1:
  xhci PCIe endpoint migration compatibility fix

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 10601bef e6043e92

hw/usb/hcd-xhci.c

+5 −1
Original line number Diff line number Diff line
@@ -499,6 +499,7 @@ enum xhci_flags { 
    XHCI_FLAG_USE_MSI = 1,

    XHCI_FLAG_USE_MSI_X,

    XHCI_FLAG_SS_FIRST,

    XHCI_FLAG_FORCE_PCIE_ENDCAP,

};



static void xhci_kick_ep(XHCIState *xhci, unsigned int slotid,
@@ -3626,7 +3627,8 @@ static int usb_xhci_initfn(struct PCIDevice *dev) 
                     PCI_BASE_ADDRESS_SPACE_MEMORY|PCI_BASE_ADDRESS_MEM_TYPE_64,

                     &xhci->mem);



    if (pci_bus_is_express(dev->bus)) {

    if (pci_bus_is_express(dev->bus) ||

        xhci_get_flag(xhci, XHCI_FLAG_FORCE_PCIE_ENDCAP)) {

        ret = pcie_endpoint_cap_init(dev, 0xa0);

        assert(ret >= 0);

    }
@@ -3855,6 +3857,8 @@ static Property xhci_properties[] = { 
    DEFINE_PROP_BIT("msix",     XHCIState, flags, XHCI_FLAG_USE_MSI_X, true),

    DEFINE_PROP_BIT("superspeed-ports-first",

                    XHCIState, flags, XHCI_FLAG_SS_FIRST, true),

    DEFINE_PROP_BIT("force-pcie-endcap", XHCIState, flags,

                    XHCI_FLAG_FORCE_PCIE_ENDCAP, false),

    DEFINE_PROP_UINT32("intrs", XHCIState, numintrs, MAXINTRS),

    DEFINE_PROP_UINT32("slots", XHCIState, numslots, MAXSLOTS),

    DEFINE_PROP_UINT32("p2",    XHCIState, numports_2, 4),

include/hw/i386/pc.h

+5 −0
Original line number Diff line number Diff line
@@ -329,6 +329,11 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 
            .property = "superspeed-ports-first",\

            .value    = "off",\

        },\

        {\

            .driver   = "nec-usb-xhci",\

            .property = "force-pcie-endcap",\

            .value    = "on",\

        },\

        {\

            .driver   = "pci-serial",\

            .property = "prog_if",\