From patchwork Fri Oct 19 20:43:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Baron X-Patchwork-Id: 192818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4CFC02C0615 for ; Sat, 20 Oct 2012 08:10:06 +1100 (EST) Received: from localhost ([::1]:58351 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPJRW-00077D-CN for incoming@patchwork.ozlabs.org; Fri, 19 Oct 2012 16:45:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49976) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPJQ3-0005Bm-Pn for qemu-devel@nongnu.org; Fri, 19 Oct 2012 16:43:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TPJPw-0006XG-1Y for qemu-devel@nongnu.org; Fri, 19 Oct 2012 16:43:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2711) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPJPv-0006Wz-MG for qemu-devel@nongnu.org; Fri, 19 Oct 2012 16:43:39 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9JKhbSu010346 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 19 Oct 2012 16:43:37 -0400 Received: from redhat.com (dhcp-185-114.bos.redhat.com [10.16.185.114]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q9JKhbP7020102; Fri, 19 Oct 2012 16:43:37 -0400 Date: Fri, 19 Oct 2012 16:43:37 -0400 From: Jason Baron To: qemu-devel@nongnu.org Message-Id: <707fd29bf6b842cb43ceec3fd81351a24309fb23.1350677362.git.jbaron@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, juzhang@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, armbru@redhat.com, agraf@suse.de, blauwirbel@gmail.com, yamahata@valinux.co.jp, alex.williamson@redhat.com, kevin@koconnor.net, avi@redhat.com, mkletzan@redhat.com, pbonzini@redhat.com, lcapitulino@redhat.com, afaerber@suse.de, kraxel@redhat.com Subject: [Qemu-devel] [PATCH v3 17/26] Add i21154 bridge chip. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jason Baron This adds support for the DECchip 21154 PCI bridge. Signed-off-by: Isaku Yamahata Signed-off-by: Jason Baron --- hw/Makefile.objs | 2 +- hw/i21154.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ hw/i21154.h | 9 ++++ 3 files changed, 123 insertions(+), 1 deletions(-) create mode 100644 hw/i21154.c create mode 100644 hw/i21154.h diff --git a/hw/Makefile.objs b/hw/Makefile.objs index ef444d8..eb18a55 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -9,7 +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-$(CONFIG_PCI) += i82801b11.o i21154.o common-obj-y += watchdog.o common-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o common-obj-$(CONFIG_ECC) += ecc.o diff --git a/hw/i21154.c b/hw/i21154.c new file mode 100644 index 0000000..93faa59 --- /dev/null +++ b/hw/i21154.c @@ -0,0 +1,113 @@ +/* + * 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 i21154 PCI Bridge Emulation + * + * Copyright (c) 2009, 2010, 2011 + * Isaku Yamahata + * VA Linux Systems Japan K.K. + * Copyright (C) 2012 Jason Baron + * + * 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 + */ + +#include "i21154.h" +#include "pci_ids.h" +#include "pci.h" +#include "pci_bridge.h" +#include "pci_internals.h" + +/* i21154 pci bridge*/ + +typedef struct I21154Bridge { + PCIBridge br; +} I21154Bridge; + +static int i21154_bridge_initfn(PCIDevice *d) +{ + int rc; + + rc = pci_bridge_initfn(d); + if (rc < 0) { + return rc; + } + + return 0; +} + +#define I21154_REV 0x05 +#define I21154_PI 0x00 + +static void i21154_bridge_class_init(ObjectClass *klass, void *data) +{ + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + + k->is_bridge = 1; + k->vendor_id = PCI_VENDOR_ID_DEC; + k->device_id = PCI_DEVICE_ID_DEC_21154; + k->revision = I21154_REV; + k->init = i21154_bridge_initfn; +} + +static const TypeInfo i21154_bridge_info = { + .name = "i21154-bridge", + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(I21154Bridge), + .class_init = i21154_bridge_class_init, +}; + +PCIBridge *i21154_init(PCIBus *bus, int devfn, const char *bus_name, + bool multifunction) +{ + PCIDevice *d; + PCIBridge *br; + DeviceState *qdev; + + d = pci_create_multifunction(bus, devfn, multifunction, "i21154-bridge"); + if (!d) { + return NULL; + } + br = DO_UPCAST(PCIBridge, dev, d); + qdev = &br->dev.qdev; + + pci_bridge_map_irq(br, bus_name, pci_swizzle_map_irq_fn); + qdev_init_nofail(qdev); + + return br; +} + +static void i21154_register(void) +{ + type_register_static(&i21154_bridge_info); +} +type_init(i21154_register); diff --git a/hw/i21154.h b/hw/i21154.h new file mode 100644 index 0000000..0cf8753 --- /dev/null +++ b/hw/i21154.h @@ -0,0 +1,9 @@ +#ifndef QEMU_I21154_H +#define QEMU_I21154_H + +#include "pci.h" + +PCIBridge *i21154_init(PCIBus *bus, int devfn, const char *bus_name, + bool multifunction); + +#endif /* QEMU_I21154_H */