On Fri, Oct 19, 2012 at 04:43:36PM -0400, Jason Baron wrote: > From: Jason Baron <jba...@redhat.com> > > Add the dmi-to-pci i82801b11 bridge chip. This is the pci bridge chip > that q35 uses on its host bus for PCI bus arbitration. > > Signed-off-by: Isaku Yamahata <yamah...@valinux.co.jp> > Signed-off-by: Jason Baron <jba...@redhat.com>
Applied, after removing the use of the PCI_CLASS_BRDIGE_PCI_INF_SUB. I also note that subtractive decoding isn't really supported. Added a comment to this end. > --- > hw/Makefile.objs | 1 + > hw/i82801b11.c | 125 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 126 insertions(+), 0 deletions(-) > create mode 100644 hw/i82801b11.c > > diff --git a/hw/Makefile.objs b/hw/Makefile.objs > index 854faa9..ef444d8 100644 > --- a/hw/Makefile.objs > +++ b/hw/Makefile.objs > @@ -9,6 +9,7 @@ common-obj-$(CONFIG_PCI) += shpc.o > common-obj-$(CONFIG_PCI) += slotid_cap.o > common-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o > common-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o > +common-obj-$(CONFIG_PCI) += i82801b11.o > common-obj-y += watchdog.o > common-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o > common-obj-$(CONFIG_ECC) += ecc.o > diff --git a/hw/i82801b11.c b/hw/i82801b11.c > new file mode 100644 > index 0000000..3d1f996 > --- /dev/null > +++ b/hw/i82801b11.c > @@ -0,0 +1,125 @@ > +/* > + * Copyright (c) 2006 Fabrice Bellard > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > copy > + * of this software and associated documentation files (the "Software"), to > deal > + * in the Software without restriction, including without limitation the > rights > + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > + * copies of the Software, and to permit persons to whom the Software is > + * furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > FROM, > + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > + * THE SOFTWARE. > + */ > +/* > + * QEMU i82801b11 dmi-to-pci Bridge Emulation > + * > + * Copyright (c) 2009, 2010, 2011 > + * Isaku Yamahata <yamahata at valinux co jp> > + * VA Linux Systems Japan K.K. > + * Copyright (C) 2012 Jason Baron <jba...@redhat.com> > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, see > <http://www.gnu.org/licenses/> > + */ > + > +#include "pci.h" > +#include "ich9.h" > + > + > +/*****************************************************************************/ > +/* ICH9 DMI-to-PCI bridge */ > +#define I82801ba_SSVID_OFFSET 0x50 > +#define I82801ba_SSVID_SVID 0 > +#define I82801ba_SSVID_SSID 0 > + > +typedef struct I82801b11Bridge { > + PCIBridge br; > +} I82801b11Bridge; > + > +static int i82801b11_bridge_initfn(PCIDevice *d) > +{ > + int rc; > + > + rc = pci_bridge_initfn(d); > + if (rc < 0) { > + return rc; > + } > + > + rc = pci_bridge_ssvid_init(d, I82801ba_SSVID_OFFSET, > + I82801ba_SSVID_SVID, I82801ba_SSVID_SSID); > + if (rc < 0) { > + goto err_bridge; > + } > + pci_config_set_prog_interface(d->config, PCI_CLASS_BRDIGE_PCI_INF_SUB); > + return 0; > + > +err_bridge: > + pci_bridge_exitfn(d); > + > + return rc; > +} > + > +static void i82801b11_bridge_class_init(ObjectClass *klass, void *data) > +{ > + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); > + > + k->is_bridge = 1; > + k->vendor_id = PCI_VENDOR_ID_INTEL; > + k->device_id = PCI_DEVICE_ID_INTEL_82801BA_11; > + k->revision = ICH9_D2P_A2_REVISION; > + k->init = i82801b11_bridge_initfn; > +} > + > +static const TypeInfo i82801b11_bridge_info = { > + .name = "i82801b11-bridge", > + .parent = TYPE_PCI_DEVICE, > + .instance_size = sizeof(I82801b11Bridge), > + .class_init = i82801b11_bridge_class_init, > +}; > + > +PCIBus *ich9_d2pbr_init(PCIBus *bus, int devfn, int sec_bus) > +{ > + PCIDevice *d; > + PCIBridge *br; > + char buf[16]; > + DeviceState *qdev; > + > + d = pci_create_multifunction(bus, devfn, true, "i82801b11-bridge"); > + if (!d) { > + return NULL; > + } > + br = DO_UPCAST(PCIBridge, dev, d); > + qdev = &br->dev.qdev; > + > + snprintf(buf, sizeof(buf), "pci.%d", sec_bus); > + pci_bridge_map_irq(br, buf, pci_swizzle_map_irq_fn); > + qdev_init_nofail(qdev); > + > + return pci_bridge_get_sec_bus(br); > +} > + > +static void d2pbr_register(void) > +{ > + type_register_static(&i82801b11_bridge_info); > +} > + > +type_init(d2pbr_register); > -- > 1.7.1