From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zk9m3-0008CT-6C for qemu-devel@nongnu.org; Thu, 08 Oct 2015 07:55:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zk9lm-0007zu-9D for qemu-devel@nongnu.org; Thu, 08 Oct 2015 07:54:12 -0400 Received: from mail-wi0-x229.google.com ([2a00:1450:400c:c05::229]:36841) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zk9ll-0007xY-Im for qemu-devel@nongnu.org; Thu, 08 Oct 2015 07:53:57 -0400 Received: by wicgb1 with SMTP id gb1so21939637wic.1 for ; Thu, 08 Oct 2015 04:53:57 -0700 (PDT) From: David Kiarie Date: Fri, 9 Oct 2015 05:53:55 +0300 Message-Id: <1444359237-27224-3-git-send-email-davidkiarie4@gmail.com> In-Reply-To: <1444359237-27224-1-git-send-email-davidkiarie4@gmail.com> References: <1444359237-27224-1-git-send-email-davidkiarie4@gmail.com> Subject: [Qemu-devel] [PATCH 2/4] hw/pci-host: Add AMD IOMMU to PIIX and Q35 pcs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, jan.kiszka@web.de, valentine.sinitsyn@gmail.com, mst@redhat.com Cc: David From: David Emulate AMD IOMMU on PIIX and Q35 controlled by a command line switch Signed-off-by: David Kiarie --- hw/pci-host/piix.c | 10 ++++++++++ hw/pci-host/q35.c | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 1fb71c8..a4b07d2 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -31,6 +31,7 @@ #include "qemu/range.h" #include "hw/xen/xen.h" #include "hw/pci-host/pam.h" +#include "hw/i386/amd_iommu.h" #include "sysemu/sysemu.h" #include "hw/i386/ioapic.h" #include "qapi/visitor.h" @@ -290,12 +291,21 @@ static void i440fx_pcihost_realize(DeviceState *dev, Error **errp) { PCIHostState *s = PCI_HOST_BRIDGE(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev); + AMDIOMMUState *iommu_state; + PCIDevice *iommu; sysbus_add_io(sbd, 0xcf8, &s->conf_mem); sysbus_init_ioports(sbd, 0xcf8, 4); sysbus_add_io(sbd, 0xcfc, &s->data_mem); sysbus_init_ioports(sbd, 0xcfc, 4); + + /* AMD IOMMU (AMD-Vi) */ + if(machine_amd_iommu(current_machine)){ + iommu = pci_create_simple(s->bus, 0x20, TYPE_AMD_IOMMU_DEVICE); + iommu_state = AMD_IOMMU_DEVICE(iommu); + pci_setup_iommu(s->bus, bridge_host_amd_iommu, iommu_state); + } } static void i440fx_realize(PCIDevice *dev, Error **errp) diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index bd74094..cef84ff 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -30,6 +30,7 @@ #include "hw/hw.h" #include "hw/pci-host/q35.h" #include "qapi/visitor.h" +#include "hw/i386/amd_iommu.h" /**************************************************************************** * Q35 host @@ -470,6 +471,8 @@ static void mch_realize(PCIDevice *d, Error **errp) { int i; MCHPCIState *mch = MCH_PCI_DEVICE(d); + AMDIOMMUState *iommu_state; + PCIDevice *iommu; /* setup pci memory mapping */ pc_pci_as_mapping_init(OBJECT(mch), mch->system_memory, @@ -528,6 +531,13 @@ static void mch_realize(PCIDevice *d, Error **errp) if (machine_iommu(current_machine)) { mch_init_dmar(mch); } + /* AMD IOMMU (AMD-Vi) */ + if (machine_amd_iommu(current_machine)){ + PCIBus *bus = PCI_BUS(qdev_get_parent_bus(DEVICE(mch))); + iommu = pci_create_simple(bus, 0x20, TYPE_AMD_IOMMU_DEVICE); + iommu_state = AMD_IOMMU_DEVICE(iommu); + pci_setup_iommu(bus, bridge_host_amd_iommu, iommu_state); + } } uint64_t mch_mcfg_base(void) -- 2.1.4