From patchwork Fri May 11 22:55:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 158671 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 677A6B701F for ; Sat, 12 May 2012 12:09:39 +1000 (EST) Received: from localhost ([::1]:41568 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ST0T7-0005Yo-6j for incoming@patchwork.ozlabs.org; Fri, 11 May 2012 20:45:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSykx-0001iP-DT for qemu-devel@nongnu.org; Fri, 11 May 2012 18:56:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSykv-00083s-Ff for qemu-devel@nongnu.org; Fri, 11 May 2012 18:56:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7617) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSykv-00083g-7h for qemu-devel@nongnu.org; Fri, 11 May 2012 18:56:13 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4BMtv3L028983 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 11 May 2012 18:55:57 -0400 Received: from bling.home ([10.3.113.8]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q4BMttLu004366; Fri, 11 May 2012 18:55:56 -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:55:55 -0600 Message-ID: <20120511225555.30496.80525.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.67 on 10.5.11.11 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:20 -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 04/13] pci: New pci_dma_quirk() 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 Integrating IOMMU groups more closely into the driver core allows us to more easily work around DMA quirks. The Ricoh multifunction controller is a favorite example of devices that are currently incompatible with IOMMU isolation as all the functions use the requestor ID of function 0 for DMA. Passing this device into pci_dma_quirk returns the PCI device to use for DMA. The IOMMU driver can then construct an IOMMU group including both devices. Signed-off-by: Alex Williamson --- drivers/pci/quirks.c | 22 ++++++++++++++++++++++ include/linux/pci.h | 2 ++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 4bf7102..6f9f7f9 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -3109,3 +3109,25 @@ int pci_dev_specific_reset(struct pci_dev *dev, int probe) return -ENOTTY; } + +struct pci_dev *pci_dma_quirk(struct pci_dev *dev) +{ + struct pci_dev *dma_dev = dev; + + /* + * https://bugzilla.redhat.com/show_bug.cgi?id=605888 + * + * Some Ricoh devices use the function 0 source ID for DMA on + * other functions of a multifunction device. The DMA devices + * is therefore function 0, which will have implications of the + * iommu grouping of these devices. + */ + if (dev->vendor == PCI_VENDOR_ID_RICOH && + (dev->device == 0xe822 || dev->device == 0xe230 || + dev->device == 0xe832 || dev->device == 0xe476)) { + dma_dev = pci_get_slot(dev->bus, + PCI_DEVFN(PCI_SLOT(dev->devfn), 0)); + } + + return dma_dev; +} diff --git a/include/linux/pci.h b/include/linux/pci.h index e444f5b..9910b5c 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1479,9 +1479,11 @@ enum pci_fixup_pass { #ifdef CONFIG_PCI_QUIRKS void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev); +struct pci_dev *pci_dma_quirk(struct pci_dev *dev); #else static inline void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev) {} +struct pci_dev *pci_dma_quirk(struct pci_dev *dev) { return dev } #endif void __iomem *pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen);