From patchwork Wed Feb 17 10:43:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cao jin X-Patchwork-Id: 584019 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C61814033B for ; Wed, 17 Feb 2016 21:49:27 +1100 (AEDT) Received: from localhost ([::1]:56251 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVzfh-0004Xh-GA for incoming@patchwork.ozlabs.org; Wed, 17 Feb 2016 05:49:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVzaL-0003xZ-Gr for qemu-devel@nongnu.org; Wed, 17 Feb 2016 05:43:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVzaK-0003oK-4Q for qemu-devel@nongnu.org; Wed, 17 Feb 2016 05:43:53 -0500 Received: from [59.151.112.132] (port=24637 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVzaJ-0003lT-9W for qemu-devel@nongnu.org; Wed, 17 Feb 2016 05:43:52 -0500 X-IronPort-AV: E=Sophos;i="5.20,346,1444665600"; d="scan'208";a="3636116" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 17 Feb 2016 18:43:41 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 3603D42AC842; Wed, 17 Feb 2016 18:42:02 +0800 (CST) Received: from G08FNSTD140223.g08.fujitsu.local (10.167.226.69) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Wed, 17 Feb 2016 18:43:38 +0800 From: Cao jin To: Date: Wed, 17 Feb 2016 18:43:51 +0800 Message-ID: <1455705833-17682-8-git-send-email-caoj.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1455705833-17682-1-git-send-email-caoj.fnst@cn.fujitsu.com> References: <1455705833-17682-1-git-send-email-caoj.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.69] X-yoursite-MailScanner-ID: 3603D42AC842.A8B9C X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: caoj.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: chen.fan.fnst@cn.fujitsu.com, izumi.taku@jp.fujitsu.com, alex.williamson@redhat.com, mst@redhat.com Subject: [Qemu-devel] [PATCH 07/10] pci: introduce pci bus pre reset 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: Chen Fan avoid repeat bus reset, here introduce a sequence ID for each time bus hot reset, so each vfio device could know whether they've already been reset for that sequence ID. Signed-off-by: Chen Fan --- hw/core/qdev.c | 4 ++-- hw/pci/pci.c | 25 +++++++++++++++++++++++++ hw/pci/pci_bridge.c | 5 ++++- include/hw/pci/pci_bus.h | 4 ++++ include/hw/qdev-core.h | 3 +++ 5 files changed, 38 insertions(+), 3 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 779de2b..e36fa07 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -304,14 +304,14 @@ void qdev_unplug(DeviceState *dev, Error **errp) } } -static int qdev_reset_one(DeviceState *dev, void *opaque) +int qdev_reset_one(DeviceState *dev, void *opaque) { device_reset(dev); return 0; } -static int qbus_reset_one(BusState *bus, void *opaque) +int qbus_reset_one(BusState *bus, void *opaque) { BusClass *bc = BUS_GET_CLASS(bus); if (bc->reset) { diff --git a/hw/pci/pci.c b/hw/pci/pci.c index e41925e..ff978bc 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -258,6 +258,29 @@ void pci_device_reset(PCIDevice *dev) pci_do_device_reset(dev); } +int pcibus_pre_reset(BusState *qbus, void *opaque) +{ + BusState *bus = (BusState *)opaque; + PCIBus *pci_bus = DO_UPCAST(PCIBus, qbus, qbus); + static unsigned int reset_seqid; + + /* + * To distinguish the different reset times, we + * recalculate the global reset seqid with a given bus. + */ + if (qbus == bus) { + reset_seqid++; + if (!reset_seqid) { + reset_seqid = 1; + } + } + + pci_bus->bus_in_reset = true; + pci_bus->reset_seqid = reset_seqid; + + return 0; +} + /* * Trigger pci bus reset under a given bus. * Called via qbus_reset_all on RST# assert, after the devices @@ -277,6 +300,8 @@ static void pcibus_reset(BusState *qbus) for (i = 0; i < bus->nirq; i++) { assert(bus->irq_count[i] == 0); } + + bus->bus_in_reset = false; } static void pci_host_bus_register(PCIBus *bus, DeviceState *parent) diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c index 7eab9d5..6c35171 100644 --- a/hw/pci/pci_bridge.c +++ b/hw/pci/pci_bridge.c @@ -269,7 +269,10 @@ void pci_bridge_write_config(PCIDevice *d, newctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL); if (~oldctl & newctl & PCI_BRIDGE_CTL_BUS_RESET) { /* Trigger hot reset on 0->1 transition. */ - qbus_reset_all(&s->sec_bus.qbus); + qbus_walk_children(&s->sec_bus.qbus, NULL, + pcibus_pre_reset, + qdev_reset_one, + qbus_reset_one, &s->sec_bus.qbus); } } diff --git a/include/hw/pci/pci_bus.h b/include/hw/pci/pci_bus.h index 7812fa9..9dd2d6c 100644 --- a/include/hw/pci/pci_bus.h +++ b/include/hw/pci/pci_bus.h @@ -40,11 +40,15 @@ struct PCIBus { int nirq; int *irq_count; + bool bus_in_reset; + uint32_t reset_seqid; + NotifierWithReturnList hotplug_notifiers; }; void pci_bus_add_hotplug_notifier(PCIBus *bus, NotifierWithReturn *notify); void pci_bus_remove_hotplug_notifier(NotifierWithReturn *notify); +int pcibus_pre_reset(BusState *qbus, void *opaque); typedef struct PCIBridgeWindows PCIBridgeWindows; diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index abcdee8..3d71c17 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -401,4 +401,7 @@ static inline bool qbus_is_hotpluggable(BusState *bus) void device_listener_register(DeviceListener *listener); void device_listener_unregister(DeviceListener *listener); +int qdev_reset_one(DeviceState *dev, void *opaque); +int qbus_reset_one(BusState *bus, void *opaque); + #endif