From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3OsU-0007iI-23 for qemu-devel@nongnu.org; Wed, 26 Apr 2017 11:29:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3OsQ-0003Yu-Uu for qemu-devel@nongnu.org; Wed, 26 Apr 2017 11:29:14 -0400 Date: Wed, 26 Apr 2017 18:29:05 +0300 From: "Michael S. Tsirkin" Message-ID: <20170426182535-mutt-send-email-mst@kernel.org> References: <20170328021651.19350-1-david@gibson.dropbear.id.au> <20170328021651.19350-3-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170328021651.19350-3-david@gibson.dropbear.id.au> Subject: Re: [Qemu-devel] [RFC for-2.10 2/3] pci: Allow host bridges to override PCI/PCIe hybrid device behaviour List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: ehabkost@redhat.com, aik@ozlabs.ru, marcel@redhat.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, lersek@redhat.com On Tue, Mar 28, 2017 at 01:16:50PM +1100, David Gibson wrote: > Currently PCI/PCIe hybrid devices - that is, devices which can appear as > either plain PCI or PCIe depending on where they're attached - will only > appear in PCIe mode if they're attached to a PCIe bus via a root port or > downstream port. > > This is correct for "standard" PCIe setups, but there are some platforms > which need different behaviour (notably "pseries" whose paravirtualized > PCI host bridges have some idiosyncracies). > > This patch allows the host bridge to override the normal behaviour. > > Signed-off-by: David Gibson > --- > hw/pci/pci.c | 11 +++++++++-- > include/hw/pci/pci_host.h | 1 + > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index 779787b..ac68065 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -392,9 +392,16 @@ bool pci_bus_is_root(PCIBus *bus) > > bool pci_allow_hybrid_pcie(PCIDevice *pci_dev) > { > - PCIBus *bus = pci_dev->bus; > + PCIHostState *host_bridge = PCI_HOST_BRIDGE(pci_device_root_bus(pci_dev)->qbus.parent); > + PCIHostBridgeClass *hc = PCI_HOST_BRIDGE_GET_CLASS(host_bridge); > + > + if (hc->allow_hybrid_pcie) { > + return hc->allow_hybrid_pcie(host_bridge, pci_dev); > + } else { > + PCIBus *bus = pci_dev->bus; > > - return pci_bus_is_express(bus) && !pci_bus_is_root(bus); > + return pci_bus_is_express(bus) && !pci_bus_is_root(bus); > + } > } > > void pci_bus_new_inplace(PCIBus *bus, size_t bus_size, DeviceState *parent, I think I'd prefer adding some flags in PCIBus. While we are at it, is_root can become a flag too. > diff --git a/include/hw/pci/pci_host.h b/include/hw/pci/pci_host.h > index ba31595..ad03cca 100644 > --- a/include/hw/pci/pci_host.h > +++ b/include/hw/pci/pci_host.h > @@ -54,6 +54,7 @@ typedef struct PCIHostBridgeClass { > SysBusDeviceClass parent_class; > > const char *(*root_bus_path)(PCIHostState *, PCIBus *); > + bool (*allow_hybrid_pcie)(PCIHostState *, PCIDevice *); > } PCIHostBridgeClass; > > /* common internal helpers for PCI/PCIe hosts, cut off overflows */ > -- > 2.9.3