From patchwork Thu Sep 2 09:25:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 63456 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 9CB9CB7171 for ; Thu, 2 Sep 2010 19:14:30 +1000 (EST) Received: from localhost ([127.0.0.1]:41116 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Or5sJ-0006m5-9i for incoming@patchwork.ozlabs.org; Thu, 02 Sep 2010 05:14:27 -0400 Received: from [140.186.70.92] (port=45601 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Or5qa-0006kp-MC for qemu-devel@nongnu.org; Thu, 02 Sep 2010 05:12:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Or5qX-0002Ev-NL for qemu-devel@nongnu.org; Thu, 02 Sep 2010 05:12:40 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:44583) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Or5qX-0002EU-2O for qemu-devel@nongnu.org; Thu, 02 Sep 2010 05:12:37 -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 E73C6107A89; Thu, 2 Sep 2010 18:12:33 +0900 (JST) Received: (nullmailer pid 18575 invoked by uid 1000); Thu, 02 Sep 2010 09:25:09 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Thu, 2 Sep 2010 18:25:07 +0900 Message-Id: <6ff94c08e949b01730c7babbe72e13844e24f29e.1283417726.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: gleb@redhat.com, glommer@redhat.com, blauwirbel@gmail.com, yamahata@valinux.co.jp, alex.williamson@redhat.com, avi@redhat.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 4/6] pci: make pci reset use qdev reset frame work. 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 make pci reset use qdev reset frame work. Signed-off-by: Isaku Yamahata --- hw/pci.c | 38 ++++++++++++++++++++++++++++++++++---- hw/pci.h | 2 ++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 655fead..4c99390 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -62,6 +62,7 @@ struct PCIBus { static char *pcibus_get_dev_path(DeviceState *dev); static int pcibus_add_dev(BusState *qbus, DeviceState *qdev); static int pcibus_del_dev(BusState *qbus, DeviceState *qdev); +static int pcibus_reset(BusState *qbus); static struct BusInfo pci_bus_info = { .name = "PCI", @@ -69,6 +70,7 @@ static struct BusInfo pci_bus_info = { .get_dev_path = pcibus_get_dev_path, .add_dev = pcibus_add_dev, .del_dev = pcibus_del_dev, + .reset = pcibus_reset, .props = (Property[]) { DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1), DEFINE_PROP_STRING("romfile", PCIDevice, romfile), @@ -153,7 +155,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; @@ -181,9 +183,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#. + */ +static void pci_bus_reset(PCIBus *bus) { - PCIBus *bus = opaque; int i; for (i = 0; i < bus->nirq; i++) { @@ -196,6 +218,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; @@ -250,7 +281,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 51ba8b6..8e72d78 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -214,6 +214,8 @@ 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_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,