From patchwork Thu Jul 16 04:00:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen HanXiao X-Patchwork-Id: 496547 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 0476B14076D for ; Thu, 16 Jul 2015 14:14:27 +1000 (AEST) Received: from localhost ([::1]:38284 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFaYy-00062c-Sm for incoming@patchwork.ozlabs.org; Thu, 16 Jul 2015 00:14:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFaUv-0006we-B8 for qemu-devel@nongnu.org; Thu, 16 Jul 2015 00:10:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZFaUr-0005Us-EH for qemu-devel@nongnu.org; Thu, 16 Jul 2015 00:10:13 -0400 Received: from [59.151.112.132] (port=4208 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFaUo-00057f-MH for qemu-devel@nongnu.org; Thu, 16 Jul 2015 00:10:09 -0400 X-IronPort-AV: E=Sophos;i="5.13,665,1427731200"; d="scan'208";a="98504039" Received: from bogon (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 16 Jul 2015 12:13:11 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t6G47eOD003884; Thu, 16 Jul 2015 12:07:40 +0800 Received: from localhost.local (10.167.225.26) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Thu, 16 Jul 2015 12:09:25 +0800 From: Chen Hanxiao To: Alex Williamson , Date: Thu, 16 Jul 2015 12:00:50 +0800 Message-ID: <1437019253-17630-13-git-send-email-chenhanxiao@cn.fujitsu.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1437019253-17630-1-git-send-email-chenhanxiao@cn.fujitsu.com> References: <1437019253-17630-1-git-send-email-chenhanxiao@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.225.26] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: Chen Fan Subject: [Qemu-devel] [PATCH v12 12/15] vfio: do hot bus reset when do virtual secondary bus 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 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 Signed-off-by: Chen Hanxiao --- 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)) {