From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60864) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrUux-000166-Uv for qemu-devel@nongnu.org; Wed, 28 Oct 2015 13:53:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZrUuu-0002E9-Nu for qemu-devel@nongnu.org; Wed, 28 Oct 2015 13:53:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35467) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrUuu-0002Dz-Hw for qemu-devel@nongnu.org; Wed, 28 Oct 2015 13:53:44 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 11EE0C0A848A for ; Wed, 28 Oct 2015 17:53:43 +0000 (UTC) References: <1446052566-27241-1-git-send-email-marcel@redhat.com> <20151028193222-mutt-send-email-mst@redhat.com> From: Marcel Apfelbaum Message-ID: <56310BA4.1050902@redhat.com> Date: Wed, 28 Oct 2015 19:53:40 +0200 MIME-Version: 1.0 In-Reply-To: <20151028193222-mutt-send-email-mst@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH V2] hw/virtio: Add PCIe capability to virtio devices List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: qemu-devel@nongnu.org, kraxel@redhat.com On 10/28/2015 07:34 PM, Michael S. Tsirkin wrote: > On Wed, Oct 28, 2015 at 07:16:06PM +0200, Marcel Apfelbaum wrote: >> The virtio devices are converted to PCI-Express >> if they are plugged into a PCI-Express bus and >> the 'modern' protocol is enabled. >> >> Devices plugged directly into the Root Complex as >> Integrated Endpoints remain PCI. >> >> Signed-off-by: Marcel Apfelbaum >> --- >> >> v1 -> v2: >> - Addressed Michael S. Tsirkin's comments: >> - Added the minimum required capabilities for PCIe devices >> - Integrated Endpoints remain PCI >> >> - Use pcie_endpoint_cap_init instead of manually creating the pcie capability. >> >> - Regarding Gerd Hoffman's comments: >> - Creating virtio-pcie devices: >> For the moment I prefer to not duplicate the virtio definitions, >> at least until we don't have a consensus (Personally I don't like it) >> - Removing the IO bar: >> This would be my next patch on the "virtio to express" series, I plan >> to remove it only for "modern" devices. >> >> Any comments would be appreciated, >> Thanks, >> Marcel >> >> hw/virtio/virtio-pci.c | 19 +++++++++++++++++++ >> 1 file changed, 19 insertions(+) > > Looks good to me. One minor point: need to make this conditional on 2.5 > machine type. Hi Michael, Makes sense to make this for 2.5+ machines. Thanks for the review, Marcel > >> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c >> index f55dd2b..12d0ebb 100644 >> --- a/hw/virtio/virtio-pci.c >> +++ b/hw/virtio/virtio-pci.c >> @@ -1592,6 +1592,25 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp) >> >> address_space_init(&proxy->modern_as, &proxy->modern_cfg, "virtio-pci-cfg-as"); >> >> + if (!(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_MODERN) >> + && pci_bus_is_express(pci_dev->bus) >> + && !pci_bus_is_root(pci_dev->bus)) { >> + int pos; >> + >> + pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; >> + pos = pcie_endpoint_cap_init(pci_dev, 0); >> + assert(pos > 0); >> + >> + pos = pci_add_capability(pci_dev, PCI_CAP_ID_PM, 0, PCI_PM_SIZEOF); >> + assert(pos > 0); >> + >> + /* >> + * Indicates that this function complies with revision 1.2 of the >> + * PCI Power Management Interface Specification. >> + */ >> + pci_set_word(pci_dev->config + pos + PCI_PM_PMC, 0x3); >> + } >> + >> virtio_pci_bus_new(&proxy->bus, sizeof(proxy->bus), proxy); >> if (k->realize) { >> k->realize(proxy, errp); >> -- >> 2.1.0