From patchwork Wed Jun 1 01:38:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduard - Gabriel Munteanu X-Patchwork-Id: 834462 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p511cwfP004742 for ; Wed, 1 Jun 2011 01:38:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758578Ab1FABiy (ORCPT ); Tue, 31 May 2011 21:38:54 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:39474 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933078Ab1FABix (ORCPT ); Tue, 31 May 2011 21:38:53 -0400 Received: by mail-bw0-f46.google.com with SMTP id 15so4139763bwz.19 for ; Tue, 31 May 2011 18:38:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer:in-reply-to:references; bh=SvDYl/D5Z6zd1dh/03vFnxd9/p0qBBysfIju1Q3JVfM=; b=x2Kfm/B30Ip607i2nCOglvteWY28VRE0Kxe1bfbDkA+tn/j6NP1kNon3Y1euU1V58e U7P2wrqu+G7TpjycYg8YXaZOUzO3Jya+r1BocqKVoh71Nv3BvTZkM1rY5kHH7lri0ALl /v4eApBh8bUF3U5mXewlMrX1XgEBbeaHplGvI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=QrrE5+OMbYMLvMHuSYIzM9i/j1QN2BalCD+3JsQNk5Hha38PZZ3RWLOlvzxTTU7lmg T5D9pVvonXKqYwyCtQ5/WSIX+FzhCE77TLQ/G+0YhfNy//wI79a3vEtS9dFdnPCEZFP5 +g6p7XZR7xpOA2/xNsW1gjIXK0Rvi0a+GmtsY= Received: by 10.204.163.130 with SMTP id a2mr4728600bky.108.1306892332293; Tue, 31 May 2011 18:38:52 -0700 (PDT) Received: from localhost.localdomain ([188.25.93.127]) by mx.google.com with ESMTPS id ag6sm453451bkc.18.2011.05.31.18.38.50 (version=SSLv3 cipher=OTHER); Tue, 31 May 2011 18:38:51 -0700 (PDT) From: Eduard - Gabriel Munteanu To: mst@redhat.com Cc: seabios@seabios.org, kevin@koconnor.net, joro@8bytes.org, blauwirbel@gmail.com, paul@codesourcery.com, avi@redhat.com, anthony@codemonkey.ws, av1474@comtv.ru, yamahata@valinux.co.jp, kvm@vger.kernel.org, qemu-devel@nongnu.org, benh@kernel.crashing.org, aik@ozlabs.ru, agraf@suse.de, aliguori@us.ibm.com, dwg@au1.ibm.com, rth@twiddle.net, david@gibson.dropbear.id.au, Eduard - Gabriel Munteanu Subject: [RFC PATCH 02/13] pci: add IOMMU support via the generic DMA layer Date: Wed, 1 Jun 2011 04:38:24 +0300 Message-Id: <1306892315-7306-3-git-send-email-eduard.munteanu@linux360.ro> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1306892315-7306-1-git-send-email-eduard.munteanu@linux360.ro> References: <1306892315-7306-1-git-send-email-eduard.munteanu@linux360.ro> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 01 Jun 2011 01:38:58 +0000 (UTC) IOMMUs can now be hooked onto the PCI bus. This makes use of the generic DMA layer. Signed-off-by: Eduard - Gabriel Munteanu --- hw/pci.c | 7 +++++++ hw/pci.h | 9 +++++++++ hw/pci_internals.h | 1 + 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 0875654..7c8762c 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -745,6 +745,7 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, return NULL; } pci_dev->bus = bus; + pci_dev->dma.mmu = &bus->mmu; pci_dev->devfn = devfn; pstrcpy(pci_dev->name, sizeof(pci_dev->name), name); pci_dev->irq_state = 0; @@ -2161,3 +2162,9 @@ int pci_qdev_find_device(const char *id, PCIDevice **pdev) return rc; } + +void pci_register_iommu(PCIDevice *dev, DMATranslateFunc *translate) +{ + dev->bus->mmu.iommu = &dev->qdev; + dev->bus->mmu.translate = translate; +} diff --git a/hw/pci.h b/hw/pci.h index c6a6eb6..f3b51ec 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -5,6 +5,7 @@ #include "qobject.h" #include "qdev.h" +#include "dma_rw.h" /* PCI includes legacy ISA access. */ #include "isa.h" @@ -129,6 +130,10 @@ enum { struct PCIDevice { DeviceState qdev; + + /* For devices which do DMA. */ + DMADevice dma; + /* PCI config space */ uint8_t *config; @@ -271,6 +276,8 @@ void pci_bridge_update_mappings(PCIBus *b); void pci_device_deassert_intx(PCIDevice *dev); +void pci_register_iommu(PCIDevice *dev, DMATranslateFunc *translate); + static inline void pci_set_byte(uint8_t *config, uint8_t val) { @@ -475,4 +482,6 @@ static inline uint32_t pci_config_size(const PCIDevice *d) return pci_is_express(d) ? PCIE_CONFIG_SPACE_SIZE : PCI_CONFIG_SPACE_SIZE; } +DEFINE_DMA_OPS(pci, PCIDevice, dma) + #endif diff --git a/hw/pci_internals.h b/hw/pci_internals.h index fbe1866..6452e8c 100644 --- a/hw/pci_internals.h +++ b/hw/pci_internals.h @@ -16,6 +16,7 @@ extern struct BusInfo pci_bus_info; struct PCIBus { BusState qbus; + DMAMmu mmu; uint8_t devfn_min; pci_set_irq_fn set_irq; pci_map_irq_fn map_irq;