From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGGDT-0002Af-CG for qemu-devel@nongnu.org; Thu, 14 Mar 2013 18:01:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGGDS-0001tf-01 for qemu-devel@nongnu.org; Thu, 14 Mar 2013 18:01:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52130) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGGDR-0001ta-OF for qemu-devel@nongnu.org; Thu, 14 Mar 2013 18:01:37 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2EM1bD9000367 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 14 Mar 2013 18:01:37 -0400 From: Alex Williamson Date: Thu, 14 Mar 2013 16:01:35 -0600 Message-ID: <20130314220135.10566.6582.stgit@bling.home> In-Reply-To: <20130314215150.10566.37912.stgit@bling.home> References: <20130314215150.10566.37912.stgit@bling.home> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 7/7] pcie: Mangle types to match topology List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com Cc: qemu-devel@nongnu.org Windows will fail to start drivers for devices with an Endpoint type PCIe capability attached to a Root Complex (code 10 - Device cannot start). The proper type for such a device is Root Complex Integrated Endpoint. Devices don't care which they are, so do this conversion automatically. This allows the Windows driver to load for nec-usb-xhci when attached to pcie.0 of a q35 machine. Signed-off-by: Alex Williamson --- hw/pci/pcie.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index 485c94c..bcfbae4 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -48,6 +48,19 @@ int pcie_cap_init(PCIDevice *dev, uint8_t offset, uint8_t type, uint8_t port) assert(pci_is_express(dev)); + /* + * Mangle type to convert Endpoints to Root Complex Integrated Endpoints. + * Windows will report Code 10 (device cannot start) for regular Endpoints + * on the Root Complex. + */ + if (pci_bus_is_express(dev->bus) && pci_bus_is_root(dev->bus)) { + switch (type) { + case PCI_EXP_TYPE_ENDPOINT: + type = PCI_EXP_TYPE_RC_END; + break; + } + } + pos = pci_add_capability(dev, PCI_CAP_ID_EXP, offset, PCI_EXP_VER2_SIZEOF); if (pos < 0) {