From patchwork Fri May 25 07:35:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Kardashevskiy X-Patchwork-Id: 161247 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7639DB6F13 for ; Fri, 25 May 2012 17:35:41 +1000 (EST) Received: from localhost ([::1]:33279 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXp3h-00059R-M1 for incoming@patchwork.ozlabs.org; Fri, 25 May 2012 03:35:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXp3L-0004Sb-HA for qemu-devel@nongnu.org; Fri, 25 May 2012 03:35:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SXp3J-0003nL-Ij for qemu-devel@nongnu.org; Fri, 25 May 2012 03:35:15 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:62343) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXp3J-0003mQ-DE for qemu-devel@nongnu.org; Fri, 25 May 2012 03:35:13 -0400 Received: by pbbro12 with SMTP id ro12so1566202pbb.4 for ; Fri, 25 May 2012 00:35:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding:x-gm-message-state; bh=9s5AyfSHI3IIRGNWyPhiS5/0HEJMmJEHwxIknS0YZ4s=; b=b2ZIOq/w6FC9wezzpdQqc8awMLPT5U11+UtusmTtOKvoi58tG/BKONLEMO9Mpykhw5 Kl4L/6ibPQpiIVCL8x659iJ6tobEf0jCn4ZCQw0FR9PuKyMQLESDfftJPPjKqOLjj2Yz Lg9mQVDuuSh9pw4OZbiVM0IGmUDpWvnWMiiSFxCUYAa4TBdleAR5b1sDx7bFvTFjy1PO P1+jnPY7Mzgyy5z8yZNK2C7frtHO2beA8AKVkeNU5d543yS928DI5ONoGfoe0VfcA0OM u4eA+22ntsIrn0NysjTq3zNgcUj5EAWOn+SWjmsN6o1QmidQv/UoI67qRtBrZzRFMEw+ 3DPw== Received: by 10.68.234.69 with SMTP id uc5mr30203008pbc.50.1337931310020; Fri, 25 May 2012 00:35:10 -0700 (PDT) Received: from [10.61.2.175] (ibmaus65.lnk.telstra.net. [165.228.126.9]) by mx.google.com with ESMTPS id ql3sm8177868pbc.72.2012.05.25.00.35.07 (version=SSLv3 cipher=OTHER); Fri, 25 May 2012 00:35:09 -0700 (PDT) Message-ID: <4FBF3627.3030504@ozlabs.ru> Date: Fri, 25 May 2012 17:35:03 +1000 From: Alexey Kardashevskiy User-Agent: Mozilla/5.0 (X11; Linux i686; rv:11.0) Gecko/20120327 Thunderbird/11.0.1 MIME-Version: 1.0 To: Alex Williamson X-Gm-Message-State: ALoCoQlpO0m5XZxJlJ03EoCnKuY9zXfcA4zTaOWUh8W6Cx6W3St5S0vA6YAI32YwmM5+AMsvFNTC X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, Alex Graf , Alex Williamson , David Gibson Subject: [Qemu-devel] [RFC PATCH] vfio: add fixup for broken PCI devices 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 Some adapters (like NEC PCI USB controller) do not flush their config on a sioftware reset and remember DMA config, etc. If we use such an adapter with QEMU, then crash QEMU (stop it with ctrl-A ctrl-X), and try to use it in QEMU again, it may start working immediately with previous config when pci_enable_device() is called on that PCI function. To eliminate such effect, some quirk should be called. The proposed pci_fixup_final does its job well for mentioned NEC PCI USB but not sure if it is 100% correct. Signed-off-by: Alexey Kardashevskiy --- drivers/vfio/pci/vfio_pci.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index 1e5315c..6e7c12d 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -88,6 +88,8 @@ static void vfio_pci_disable(struct vfio_pci_device *vdev) { int bar; + pci_fixup_device(pci_fixup_final, vdev->pdev); + pci_disable_device(vdev->pdev); vfio_pci_set_irqs_ioctl(vdev, VFIO_IRQ_SET_DATA_NONE |