qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
To: Alex Williamson <alex.williamson@redhat.com>, qemu-devel@nongnu.org
Cc: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
Subject: [Qemu-devel] [PATCH v12 12/15] vfio: do hot bus reset when do virtual secondary bus reset
Date: Thu, 16 Jul 2015 12:00:50 +0800	[thread overview]
Message-ID: <1437019253-17630-13-git-send-email-chenhanxiao@cn.fujitsu.com> (raw)
In-Reply-To: <1437019253-17630-1-git-send-email-chenhanxiao@cn.fujitsu.com>

From: Chen Fan <chen.fan.fnst@cn.fujitsu.com>

when do virtual secondary bus reset, the vfio device under
this bus need to do host bus reset to reset the device.
so add this case.

Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
---
 hw/vfio/pci.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index c52456b..bd67608 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -4134,6 +4134,27 @@ static void vfio_exitfn(PCIDevice *pdev)
     vfio_unregister_bars(vdev);
 }
 
+static int vfio_pci_is_single_function(VFIOPCIDevice *vdev)
+{
+    struct vfio_pci_hot_reset_info *info = NULL;
+    int ret;
+
+    ret = vfio_get_hot_reset_info(vdev, &info);
+    if (ret) {
+        goto out;
+    }
+
+    if (info->count > 1) {
+        ret = 0;
+        goto out;
+    }
+
+    ret = 1;
+out:
+    g_free(info);
+    return ret;
+}
+
 static void vfio_pci_reset(DeviceState *dev)
 {
     PCIDevice *pdev = DO_UPCAST(PCIDevice, qdev, dev);
@@ -4141,6 +4162,16 @@ static void vfio_pci_reset(DeviceState *dev)
 
     trace_vfio_pci_reset(vdev->vbasedev.name);
 
+    if (vdev->needs_bus_reset) {
+        vdev->needs_bus_reset = false;
+        /* Avoid duplicate bus reset */
+        if (vdev->vbasedev.needs_reset) {
+            vfio_pci_hot_reset(vdev,
+                vfio_pci_is_single_function(vdev) ? true : false);
+        }
+        return;
+    }
+
     vfio_pci_pre_reset(vdev);
 
     if (vdev->resetfn && !vdev->resetfn(vdev)) {
-- 
2.1.0

  parent reply	other threads:[~2015-07-16  4:10 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-16  4:00 [Qemu-devel] [PATCH v12 00/15] vfio-pci: pass the aer error to guest Chen Hanxiao
2015-07-16  4:00 ` [Qemu-devel] [PATCH v12 01/15] vfio: extract vfio_get_hot_reset_info as a single function Chen Hanxiao
2015-07-16  4:00 ` [Qemu-devel] [PATCH v12 02/15] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset Chen Hanxiao
2015-07-16  4:00 ` [Qemu-devel] [PATCH v12 03/15] pcie: modify the capability size assert Chen Hanxiao
2015-07-16  4:00 ` [Qemu-devel] [PATCH v12 04/15] vfio: make the 4 bytes aligned for capability size Chen Hanxiao
2015-07-16  4:00 ` [Qemu-devel] [PATCH v12 05/15] vfio: add pcie extanded capability support Chen Hanxiao
2015-07-16  4:00 ` [Qemu-devel] [PATCH v12 06/15] aer: impove pcie_aer_init to support vfio device Chen Hanxiao
2015-07-16  4:00 ` [Qemu-devel] [PATCH v12 07/15] vfio: add aer support for " Chen Hanxiao
2015-07-16  4:00 ` [Qemu-devel] [PATCH v12 08/15] vfio: add check host bus reset is support or not Chen Hanxiao
2015-07-16  4:00 ` [Qemu-devel] [PATCH v12 09/15] pci: add bus reset_notifiers callbacks for host bus reset Chen Hanxiao
2015-07-16  4:00 ` [Qemu-devel] [PATCH v12 10/15] vfio: add sec_bus_reset notifier to notify physical bus reset is needed Chen Hanxiao
2015-07-16  4:00 ` [Qemu-devel] [PATCH v12 11/15] vfio: modify vfio_pci_hot_reset to support bus reset Chen Hanxiao
2015-07-16  4:00 ` Chen Hanxiao [this message]
2015-07-16  4:00 ` [Qemu-devel] [PATCH v12 13/15] pcie_aer: expose pcie_aer_msg() interface Chen Hanxiao
2015-07-16  4:00 ` [Qemu-devel] [PATCH v12 14/15] vfio-pci: pass the aer error to guest Chen Hanxiao
2015-07-16  4:00 ` [Qemu-devel] [PATCH v12 15/15] vfio: add 'aer' property to expose aercap Chen Hanxiao
2015-07-16  4:21 ` [Qemu-devel] [PATCH v12 00/15] vfio-pci: pass the aer error to guest Alex Williamson
2015-07-28  7:48   ` Chen, Hanxiao
2015-07-28 15:35     ` Alex Williamson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1437019253-17630-13-git-send-email-chenhanxiao@cn.fujitsu.com \
    --to=chenhanxiao@cn.fujitsu.com \
    --cc=alex.williamson@redhat.com \
    --cc=chen.fan.fnst@cn.fujitsu.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).