From patchwork Fri May 11 22:56:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 158670 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 38704B6FFE for ; Sat, 12 May 2012 12:07:05 +1000 (EST) Received: from localhost ([::1]:41999 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ST0TQ-0005od-UE for incoming@patchwork.ozlabs.org; Fri, 11 May 2012 20:46:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSyl8-0001kX-Ok for qemu-devel@nongnu.org; Fri, 11 May 2012 18:56:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSyl6-00084l-VQ for qemu-devel@nongnu.org; Fri, 11 May 2012 18:56:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41174) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSyl6-00084c-NW for qemu-devel@nongnu.org; Fri, 11 May 2012 18:56:24 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4BMuAis006549 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 11 May 2012 18:56:11 -0400 Received: from bling.home ([10.3.113.8]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q4BMu9kL016345; Fri, 11 May 2012 18:56:09 -0400 From: Alex Williamson To: benh@kernel.crashing.org, aik@ozlabs.ru, david@gibson.dropbear.id.au, joerg.roedel@amd.com, dwmw2@infradead.org Date: Fri, 11 May 2012 16:56:09 -0600 Message-ID: <20120511225609.30496.92191.stgit@bling.home> In-Reply-To: <20120511222148.30496.68571.stgit@bling.home> References: <20120511222148.30496.68571.stgit@bling.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 X-Mailman-Approved-At: Fri, 11 May 2012 20:45:34 -0400 Cc: aafabbri@cisco.com, alex.williamson@redhat.com, kvm@vger.kernel.org, B07421@freescale.com, linux-pci@vger.kernel.org, konrad.wilk@oracle.com, agraf@suse.de, qemu-devel@nongnu.org, chrisw@sous-sol.org, B08248@freescale.com, iommu@lists.linux-foundation.org, avi@redhat.com, gregkh@linuxfoundation.org, bhelgaas@google.com, linux-kernel@vger.kernel.org, benve@cisco.com Subject: [Qemu-devel] [PATCH 06/13] iommu: Make use of DMA quirking and ACS enabled check for groups 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 Incorporate DMA quirking and ACS checking into amd_iommu and intel-iommu. Note that IOMMU groups are not yet used for streaming DMA, so this doesn't immediately solve the problems with broken Ricoh devices. Signed-off-by: Alex Williamson --- drivers/iommu/amd_iommu.c | 3 +++ drivers/iommu/intel-iommu.c | 3 +++ drivers/pci/pci.h | 1 + 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index b7e5ddf..a165311 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -291,6 +291,9 @@ static int iommu_init_device(struct device *dev) dma_pdev = pci_get_slot(pdev->bus, PCI_DEVFN(PCI_SLOT(pdev->devfn), 0)); + dma_pdev = pci_dma_quirk(dma_pdev); + dma_pdev = pci_acs_enabled(dma_pdev); + group = iommu_group_get(&dma_pdev->dev); if (!group) { group = iommu_group_alloc(); diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index e63b33b..5f526c7 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -4113,6 +4113,9 @@ static int intel_iommu_add_device(struct device *dev) dma_pdev = pci_get_slot(pdev->bus, PCI_DEVFN(PCI_SLOT(pdev->devfn), 0)); + dma_pdev = pci_dma_quirk(dma_pdev); + dma_pdev = pci_acs_enabled(dma_pdev); + group = iommu_group_get(&dma_pdev->dev); if (!group) { group = iommu_group_alloc(); diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index e494347..e8f2f8f 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -310,6 +310,7 @@ static inline resource_size_t pci_resource_alignment(struct pci_dev *dev, } extern void pci_enable_acs(struct pci_dev *dev); +extern struct pci_dev *pci_acs_enabled(struct pci_dev *dev); struct pci_dev_reset_methods { u16 vendor;