From patchwork Wed Feb 10 06:59:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 44992 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 A3BF7B7CE2 for ; Wed, 10 Feb 2010 17:59:58 +1100 (EST) Received: from localhost ([127.0.0.1]:60614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nf6YF-0005YC-26 for incoming@patchwork.ozlabs.org; Wed, 10 Feb 2010 01:59:55 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nf6XN-0005XP-H8 for qemu-devel@nongnu.org; Wed, 10 Feb 2010 01:59:01 -0500 Received: from [199.232.76.173] (port=53610 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nf6XM-0005X8-Rl for qemu-devel@nongnu.org; Wed, 10 Feb 2010 01:59:00 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nf6XL-0007pQ-Eo for qemu-devel@nongnu.org; Wed, 10 Feb 2010 01:59:00 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:51599) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nf6XK-0007oq-Ko for qemu-devel@nongnu.org; Wed, 10 Feb 2010 01:58:59 -0500 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 6C6AF489BB; Wed, 10 Feb 2010 15:58:54 +0900 (JST) Received: (nullmailer pid 1968 invoked by uid 1000); Wed, 10 Feb 2010 06:59:31 -0000 Date: Wed, 10 Feb 2010 15:59:30 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org Message-ID: <20100210065930.GK22624@valinux.co.jp> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Blue Swirl , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH] pci: introduce get_dev_dict callback. 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 This patch fixes 525e05147d5a3bdc08caa422d108c1ef71b584b5 by introducing device specific get_dev_dict callback. pci host bridge doesn't always have header type of bridge. Especially PBM which is emulated doesn't conform to PCI spec at the moment. So by introducing get_dev_dict, allow each pci device to return specific infos. This patch also makes it easier to enhance info pci command in the future. For example returning pcie stuff. Cc: Blue Swirl Cc: "Michael S. Tsirkin" Signed-off-by: Isaku Yamahata --- hw/apb_pci.c | 1 + hw/dec_pci.c | 1 + hw/pci.c | 74 ++++++++++++++++++++++++++++++--------------------------- hw/pci.h | 3 ++ 4 files changed, 44 insertions(+), 35 deletions(-) diff --git a/hw/apb_pci.c b/hw/apb_pci.c index 46d5b0e..693f99e 100644 --- a/hw/apb_pci.c +++ b/hw/apb_pci.c @@ -479,6 +479,7 @@ static PCIDeviceInfo pbm_pci_host_info = { .qdev.name = "pbm", .qdev.size = sizeof(PCIDevice), .init = pbm_pci_host_init, + .get_dev_dict = pci_bridge_get_dev_dict, .header_type = PCI_HEADER_TYPE_BRIDGE, }; diff --git a/hw/dec_pci.c b/hw/dec_pci.c index 8d059f1..824fafc 100644 --- a/hw/dec_pci.c +++ b/hw/dec_pci.c @@ -91,6 +91,7 @@ static PCIDeviceInfo dec_21154_pci_host_info = { .qdev.name = "dec-21154", .qdev.size = sizeof(PCIDevice), .init = dec_21154_pci_host_init, + .get_dev_dict = pci_bridge_get_dev_dict, .header_type = PCI_HEADER_TYPE_BRIDGE, }; diff --git a/hw/pci.c b/hw/pci.c index 9ad63dd..9510aee 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -1271,10 +1271,43 @@ static QObject *pci_get_regions_list(const PCIDevice *dev) static QObject *pci_get_devices_list(PCIBus *bus, int bus_num); +void pci_bridge_get_dev_dict(PCIDevice *dev, PCIBus *bus, QDict *qdict) +{ + QObject *pci_bridge; + + pci_bridge = qobject_from_jsonf("{ 'bus': " + "{ 'number': %d, 'secondary': %d, 'subordinate': %d }, " + "'io_range': { 'base': %" PRId64 ", 'limit': %" PRId64 "}, " + "'memory_range': { 'base': %" PRId64 ", 'limit': %" PRId64 "}, " + "'prefetchable_range': { 'base': %" PRId64 ", 'limit': %" PRId64 "} }", + dev->config[PCI_PRIMARY_BUS], dev->config[PCI_SECONDARY_BUS], + dev->config[PCI_SUBORDINATE_BUS], + pci_bridge_get_base(dev, PCI_BASE_ADDRESS_SPACE_IO), + pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_SPACE_IO), + pci_bridge_get_base(dev, PCI_BASE_ADDRESS_SPACE_MEMORY), + pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_SPACE_MEMORY), + pci_bridge_get_base(dev, PCI_BASE_ADDRESS_SPACE_MEMORY | + PCI_BASE_ADDRESS_MEM_PREFETCH), + pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_SPACE_MEMORY | + PCI_BASE_ADDRESS_MEM_PREFETCH)); + + if (dev->config[PCI_SECONDARY_BUS] != 0) { + PCIBus *child_bus = pci_find_bus(bus, dev->config[PCI_SECONDARY_BUS]); + if (child_bus) { + qdict_put_obj(qobject_to_qdict(pci_bridge), "devices", + pci_get_devices_list(child_bus, + dev->config[PCI_SECONDARY_BUS])); + } + } + + qdict_put_obj(qdict, "pci_bridge", pci_bridge); +} + static QObject *pci_get_dev_dict(PCIDevice *dev, PCIBus *bus, int bus_num) { - int class; + PCIDeviceInfo *info = DO_UPCAST(PCIDeviceInfo, qdev, dev->qdev.info); QObject *obj; + QDict *qdict; obj = qobject_from_jsonf("{ 'bus': %d, 'slot': %d, 'function': %d," "'class_info': %p, 'id': %p, 'regions': %p," " 'qdev_id': %s }", @@ -1283,45 +1316,15 @@ static QObject *pci_get_dev_dict(PCIDevice *dev, PCIBus *bus, int bus_num) pci_get_dev_class(dev), pci_get_dev_id(dev), pci_get_regions_list(dev), dev->qdev.id ? dev->qdev.id : ""); + qdict = qobject_to_qdict(obj); if (dev->config[PCI_INTERRUPT_PIN] != 0) { - QDict *qdict = qobject_to_qdict(obj); qdict_put(qdict, "irq", qint_from_int(dev->config[PCI_INTERRUPT_LINE])); } - class = pci_get_word(dev->config + PCI_CLASS_DEVICE); - if (class == PCI_CLASS_BRIDGE_HOST || class == PCI_CLASS_BRIDGE_PCI) { - QDict *qdict; - QObject *pci_bridge; - - pci_bridge = qobject_from_jsonf("{ 'bus': " - "{ 'number': %d, 'secondary': %d, 'subordinate': %d }, " - "'io_range': { 'base': %" PRId64 ", 'limit': %" PRId64 "}, " - "'memory_range': { 'base': %" PRId64 ", 'limit': %" PRId64 "}, " - "'prefetchable_range': { 'base': %" PRId64 ", 'limit': %" PRId64 "} }", - dev->config[PCI_PRIMARY_BUS], dev->config[PCI_SECONDARY_BUS], - dev->config[PCI_SUBORDINATE_BUS], - pci_bridge_get_base(dev, PCI_BASE_ADDRESS_SPACE_IO), - pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_SPACE_IO), - pci_bridge_get_base(dev, PCI_BASE_ADDRESS_SPACE_MEMORY), - pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_SPACE_MEMORY), - pci_bridge_get_base(dev, PCI_BASE_ADDRESS_SPACE_MEMORY | - PCI_BASE_ADDRESS_MEM_PREFETCH), - pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_SPACE_MEMORY | - PCI_BASE_ADDRESS_MEM_PREFETCH)); - - if (dev->config[PCI_SECONDARY_BUS] != 0) { - PCIBus *child_bus = pci_find_bus(bus, dev->config[PCI_SECONDARY_BUS]); - - if (child_bus) { - qdict = qobject_to_qdict(pci_bridge); - qdict_put_obj(qdict, "devices", - pci_get_devices_list(child_bus, - dev->config[PCI_SECONDARY_BUS])); - } - } - qdict = qobject_to_qdict(obj); - qdict_put_obj(qdict, "pci_bridge", pci_bridge); + if (info /* not all pci device aren't converted qdev yet */ && + info->get_dev_dict) { + info->get_dev_dict(dev, bus, qdict); } return obj; @@ -1880,6 +1883,7 @@ static PCIDeviceInfo bridge_info = { .init = pci_bridge_initfn, .exit = pci_bridge_exitfn, .config_write = pci_bridge_write_config, + .get_dev_dict = pci_bridge_get_dev_dict, .header_type = PCI_HEADER_TYPE_BRIDGE, .qdev.props = (Property[]) { DEFINE_PROP_HEX32("vendorid", PCIBridge, vid, 0), diff --git a/hw/pci.h b/hw/pci.h index 8b511d2..43ddced 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -80,6 +80,7 @@ typedef uint32_t PCIConfigReadFunc(PCIDevice *pci_dev, typedef void PCIMapIORegionFunc(PCIDevice *pci_dev, int region_num, pcibus_t addr, pcibus_t size, int type); typedef int PCIUnregisterFunc(PCIDevice *pci_dev); +typedef void PCIGetDevDictFunc(PCIDevice *pci_dev, PCIBus *bus, QDict *qdict); typedef struct PCIIORegion { pcibus_t addr; /* current PCI mapping address. -1 means not mapped */ @@ -240,6 +241,7 @@ void do_pci_info(Monitor *mon, QObject **ret_data); PCIBus *pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid, uint16_t did, pci_map_irq_fn map_irq, const char *name); PCIDevice *pci_bridge_get_device(PCIBus *bus); +void pci_bridge_get_dev_dict(PCIDevice *dev, PCIBus *bus, QDict *qdict); static inline void pci_set_byte(uint8_t *config, uint8_t val) @@ -314,6 +316,7 @@ typedef struct { PCIUnregisterFunc *exit; PCIConfigReadFunc *config_read; PCIConfigWriteFunc *config_write; + PCIGetDevDictFunc *get_dev_dict; /* pci config header type */ uint8_t header_type;