From patchwork Thu Jun 17 06:15:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 55967 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B01DAB7D86 for ; Thu, 17 Jun 2010 16:22:01 +1000 (EST) Received: from localhost ([127.0.0.1]:34123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OP8UA-0008Dn-Bj for incoming@patchwork.ozlabs.org; Thu, 17 Jun 2010 02:21:58 -0400 Received: from [140.186.70.92] (port=38385 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OP8Rx-00086u-Tm for qemu-devel@nongnu.org; Thu, 17 Jun 2010 02:19:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OP8Rw-0002jG-9v for qemu-devel@nongnu.org; Thu, 17 Jun 2010 02:19:41 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:36609) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OP8Rv-0002iK-O6 for qemu-devel@nongnu.org; Thu, 17 Jun 2010 02:19:40 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 517E71072B8; Thu, 17 Jun 2010 15:19:37 +0900 (JST) Received: (nullmailer pid 29421 invoked by uid 1000); Thu, 17 Jun 2010 06:15:52 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Thu, 17 Jun 2010 15:15:50 +0900 Message-Id: X-Mailer: git-send-email 1.6.6.1 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: jan.kiszka@siemens.com, mst@redhat.com, allen.m.kay@intel.com, blauwirbel@gmail.com, yamahata@valinux.co.jp, kraxel@redhat.com, stefano.stabellini@eu.citrix.com, jean.guyader@gmail.com Subject: [Qemu-devel] [PATCH 08/10] pci: remove PCIDeviceInfo::header_type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org replace PCIDeviceInfo::header_type with is_bridge as suggested by Michael S. Tsirkin Signed-off-by: Isaku Yamahata --- hw/apb_pci.c | 2 +- hw/dec_pci.c | 2 +- hw/pci.c | 9 ++++----- hw/pci.h | 8 ++++++-- hw/pci_bridge.c | 6 +++++- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/hw/apb_pci.c b/hw/apb_pci.c index cb9051b..a1c17b9 100644 --- a/hw/apb_pci.c +++ b/hw/apb_pci.c @@ -440,7 +440,7 @@ static PCIDeviceInfo pbm_pci_host_info = { .qdev.name = "pbm", .qdev.size = sizeof(PCIDevice), .init = pbm_pci_host_init, - .header_type = PCI_HEADER_TYPE_BRIDGE, + .is_bridge = true, }; static SysBusDeviceInfo pbm_host_info = { diff --git a/hw/dec_pci.c b/hw/dec_pci.c index 45b5c28..9311c6f 100644 --- a/hw/dec_pci.c +++ b/hw/dec_pci.c @@ -100,7 +100,7 @@ static PCIDeviceInfo dec_21154_pci_host_info = { .qdev.name = "dec-21154", .qdev.size = sizeof(PCIDevice), .init = dec_21154_pci_host_init, - .header_type = PCI_HEADER_TYPE_BRIDGE, + .is_bridge = true, }; static void dec_register_devices(void) diff --git a/hw/pci.c b/hw/pci.c index 162dcd4..5316aa5 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -630,7 +630,7 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, const char *name, int devfn, PCIConfigReadFunc *config_read, PCIConfigWriteFunc *config_write, - uint8_t header_type) + bool is_bridge) { if (devfn < 0) { for(devfn = bus->devfn_min ; devfn < ARRAY_SIZE(bus->devices); @@ -652,13 +652,12 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, pci_dev->irq_state = 0; pci_config_alloc(pci_dev); - header_type &= ~PCI_HEADER_TYPE_MULTI_FUNCTION; - if (header_type == PCI_HEADER_TYPE_NORMAL) { + if (!is_bridge) { pci_set_default_subsystem_id(pci_dev); } pci_init_cmask(pci_dev); pci_init_wmask(pci_dev); - if (header_type == PCI_HEADER_TYPE_BRIDGE) { + if (is_bridge) { pci_init_wmask_bridge(pci_dev); } @@ -1575,7 +1574,7 @@ static int pci_qdev_init(DeviceState *qdev, DeviceInfo *base) devfn = pci_dev->devfn; pci_dev = do_pci_register_device(pci_dev, bus, base->name, devfn, info->config_read, info->config_write, - info->header_type); + info->is_bridge); if (pci_dev == NULL) return -1; rc = info->init(pci_dev); diff --git a/hw/pci.h b/hw/pci.h index 10a63e8..ef06b27 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -334,8 +334,12 @@ typedef struct { PCIConfigReadFunc *config_read; PCIConfigWriteFunc *config_write; - /* pci config header type */ - uint8_t header_type; + /* + * pci-to-pci bridge or normal device. + * This doesn't mean pci host switch. + * When card bus bridge is supported, this would be enhanced. + */ + int is_bridge; /* pcie stuff */ int is_express; /* is this device pci express? */ diff --git a/hw/pci_bridge.c b/hw/pci_bridge.c index 1397a11..736a3db 100644 --- a/hw/pci_bridge.c +++ b/hw/pci_bridge.c @@ -113,6 +113,10 @@ static int pci_bridge_initfn(PCIDevice *dev) PCIBridgeInfo *info = DO_UPCAST(PCIBridgeInfo, pci, pci_info); int rc = 0; + dev->config[PCI_HEADER_TYPE] = + (dev->config[PCI_HEADER_TYPE] & PCI_HEADER_TYPE_MULTI_FUNCTION) | + PCI_HEADER_TYPE_BRIDGE; + pci_set_word(dev->config + PCI_STATUS, PCI_STATUS_66MHZ | PCI_STATUS_FAST_BACK); pci_config_set_class(dev->config, PCI_CLASS_BRIDGE_PCI); @@ -153,7 +157,7 @@ void pci_bridge_qdev_register(PCIBridgeInfo *info) } info->pci.init = pci_bridge_initfn; info->pci.exit = pci_bridge_exitfn; - info->pci.header_type = PCI_HEADER_TYPE_BRIDGE; + info->pci.is_bridge = true; if (!info->pci.config_write) { info->pci.config_write = pci_bridge_write_config; }