From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40973) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azk75-0002Al-44 for qemu-devel@nongnu.org; Mon, 09 May 2016 08:16:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1azk6u-0006CE-Qz for qemu-devel@nongnu.org; Mon, 09 May 2016 08:16:37 -0400 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:36332) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azk6u-0006CA-KA for qemu-devel@nongnu.org; Mon, 09 May 2016 08:16:28 -0400 Received: by mail-wm0-x231.google.com with SMTP id n129so135147049wmn.1 for ; Mon, 09 May 2016 05:16:28 -0700 (PDT) From: David Kiarie Date: Mon, 9 May 2016 15:16:02 +0300 Message-Id: <1462796162-13375-5-git-send-email-davidkiarie4@gmail.com> In-Reply-To: <1462796162-13375-1-git-send-email-davidkiarie4@gmail.com> References: <1462796162-13375-1-git-send-email-davidkiarie4@gmail.com> Subject: [Qemu-devel] [V10 4/4] hw/pci-host: Emulate AMD IOMMU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@web.de, valentine.sinitsyn@gmail.com, peterx@redhat.com, marcel@redhat.com, mst@redhat.com, David Kiarie Add AMD IOMMU emulation support to q35 chipset Signed-off-by: David Kiarie --- hw/pci-host/q35.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 70f897e..26fea0e 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -32,6 +32,7 @@ #include "hw/pci-host/q35.h" #include "qapi/error.h" #include "qapi/visitor.h" +#include "hw/i386/amd_iommu.h" /**************************************************************************** * Q35 host @@ -448,6 +449,19 @@ static void mch_init_dmar(MCHPCIState *mch) pci_setup_iommu(pci_bus, q35_host_dma_iommu, mch->iommu); } +static void mch_init_amdvi(MCHPCIState *mch) +{ + AMDVIState *iommu_state; + PCIBus *bus = PCI_BUS(qdev_get_parent_bus(DEVICE(mch))); + PCIDevice *iommu; + + iommu = pci_create_simple(bus, 0x20, TYPE_AMD_IOMMU_DEVICE); + + iommu_state = AMD_IOMMU_DEVICE(iommu); + + pci_setup_iommu(bus, bridge_host_amdvi, iommu_state); +} + static void mch_realize(PCIDevice *d, Error **errp) { int i; @@ -506,9 +520,14 @@ static void mch_realize(PCIDevice *d, Error **errp) mch->pci_address_space, &mch->pam_regions[i+1], PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, PAM_EXPAN_SIZE); } - /* Intel IOMMU (VT-d) */ - if (object_property_get_bool(qdev_get_machine(), "iommu", NULL)) { - mch_init_dmar(mch); + + MachineState *machine = MACHINE(qdev_get_machine()); + if (machine->iommu) { + if (machine->iommu_type == TYPE_AMD) { + mch_init_amdvi(mch); + } else { + mch_init_dmar(mch); + } } } -- 2.1.4