From patchwork Wed Nov 17 04:50:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 71518 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 BB6CAB7182 for ; Wed, 17 Nov 2010 16:01:13 +1100 (EST) Received: from localhost ([127.0.0.1]:42927 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIa8t-0001Kh-6O for incoming@patchwork.ozlabs.org; Wed, 17 Nov 2010 00:01:11 -0500 Received: from [140.186.70.92] (port=34707 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIZyg-0004Tz-Jj for qemu-devel@nongnu.org; Tue, 16 Nov 2010 23:50:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PIZya-0000lZ-9U for qemu-devel@nongnu.org; Tue, 16 Nov 2010 23:50:38 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:55506) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PIZyZ-0000k9-KB for qemu-devel@nongnu.org; Tue, 16 Nov 2010 23:50:32 -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 F0E6327E5C; Wed, 17 Nov 2010 13:50:27 +0900 (JST) Received: (nullmailer pid 25300 invoked by uid 1000); Wed, 17 Nov 2010 04:50:27 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Wed, 17 Nov 2010 13:50:25 +0900 Message-Id: <7fbd22f342e9b064c43743979fe831ac9d7453fc.1289969012.git.yamahata@valinux.co.jp> X-Mailer: git-send-email 1.7.1.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: skandasa@cisco.com, Anthony Liguori , etmartin@cisco.com, wexu2@cisco.com, mst@redhat.com, yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH 5/7] pci: make use of qdev reset frame work to pci bus reset. 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 Signed-off-by: Isaku Yamahata Signed-off-by: Anthony Liguori --- hw/pci.c | 38 ++++++++++++++++++++++++++++++++++---- hw/pci.h | 3 +++ 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 962886e..b6f58de 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -43,12 +43,14 @@ static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent); static char *pcibus_get_dev_path(DeviceState *dev); +static int pcibus_reset(BusState *qbus); struct BusInfo pci_bus_info = { .name = "PCI", .size = sizeof(PCIBus), .print_dev = pcibus_dev_print, .get_dev_path = pcibus_get_dev_path, + .reset = pcibus_reset, .props = (Property[]) { DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1), DEFINE_PROP_STRING("romfile", PCIDevice, romfile), @@ -133,7 +135,7 @@ static void pci_update_irq_status(PCIDevice *dev) } } -static void pci_device_reset(PCIDevice *dev) +void pci_device_reset_default(PCIDevice *dev) { int r; @@ -161,9 +163,29 @@ static void pci_device_reset(PCIDevice *dev) pci_update_mappings(dev); } -static void pci_bus_reset(void *opaque) +static void pci_device_reset(PCIDevice *dev) +{ + if (!dev->qdev.info) { + /* not all pci devices haven't been qdev'fied yet + TODO: remove this when all pci devices are qdev'fied. */ + pci_device_reset_default(dev); + } else { + /* + * TODO: + * each device should know what to do on RST#. + * move pci_device_reset_default() into each callback. + */ + qdev_reset_all(&dev->qdev); + pci_device_reset_default(dev); + } +} + +/* + * Trigger pci bus reset under a given bus. + * This functions emulates RST#. + */ +void pci_bus_reset(PCIBus *bus) { - PCIBus *bus = opaque; int i; for (i = 0; i < bus->nirq; i++) { @@ -176,6 +198,15 @@ static void pci_bus_reset(void *opaque) } } +static int pcibus_reset(BusState *qbus) +{ + pci_bus_reset(DO_UPCAST(PCIBus, qbus, qbus)); + + /* topology traverse is done by pci_bus_reset(). + Tell qbus/qdev walker not to traverse the tree */ + return 1; +} + static void pci_host_bus_register(int domain, PCIBus *bus) { struct PCIHostBus *host; @@ -230,7 +261,6 @@ void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, pci_host_bus_register(0, bus); /* for now only pci domain 0 is supported */ vmstate_register(NULL, -1, &vmstate_pcibus, bus); - qemu_register_reset(pci_bus_reset, bus); } PCIBus *pci_bus_new(DeviceState *parent, const char *name, int devfn_min) diff --git a/hw/pci.h b/hw/pci.h index 7100804..280a2f8 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -225,6 +225,9 @@ PCIBus *pci_register_bus(DeviceState *parent, const char *name, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, void *irq_opaque, int devfn_min, int nirq); +void pci_bus_reset(PCIBus *bus); +void pci_device_reset_default(PCIDevice *dev); + void pci_bus_set_mem_base(PCIBus *bus, target_phys_addr_t base); PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,