From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1auSHN-0005Nk-Ul for qemu-devel@nongnu.org; Sun, 24 Apr 2016 18:13:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1auSHM-0003Yl-Q1 for qemu-devel@nongnu.org; Sun, 24 Apr 2016 18:13:25 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:36411) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1auSHM-0003Yh-JC for qemu-devel@nongnu.org; Sun, 24 Apr 2016 18:13:24 -0400 Received: by mail-wm0-x244.google.com with SMTP id w143so16848864wmw.3 for ; Sun, 24 Apr 2016 15:13:24 -0700 (PDT) From: David Kiarie Date: Mon, 25 Apr 2016 01:12:57 +0300 Message-Id: <1461535977-331-5-git-send-email-davidkiarie4@gmail.com> In-Reply-To: <1461535977-331-1-git-send-email-davidkiarie4@gmail.com> References: <1461535977-331-1-git-send-email-davidkiarie4@gmail.com> Subject: [Qemu-devel] [V9 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: valentine.sinitsyn@gmail.com, marcel@redhat.com, mst@redhat.com, jan.kizska@web.de, imammedo@redhat.com, David Kiarie Add AMD IOMMU emulation support to q35 chipset Signed-off-by: David Kiarie --- hw/pci-host/q35.c | 21 +++++++++++++++++++-- include/hw/i386/intel_iommu.h | 2 +- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 70f897e..37f8a84 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) +{ + AMDIOMMUState *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_amd_iommu, iommu_state); +} + static void mch_realize(PCIDevice *d, Error **errp) { int i; @@ -506,8 +520,11 @@ 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)) { + + if (object_property_get_bool(qdev_get_machine(), "iommu", NULL) && + MACHINE(qdev_get_machine())->x_iommu_type) { + mch_init_amdvi(mch); + } else if (object_property_get_bool(qdev_get_machine(), "iommu", NULL)) { mch_init_dmar(mch); } } diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index 7e511e1..539530c 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -24,10 +24,10 @@ #include "hw/qdev.h" #include "sysemu/dma.h" -#define INTEL_IOMMU_STR "intel" #define TYPE_INTEL_IOMMU_DEVICE "intel-iommu" #define INTEL_IOMMU_DEVICE(obj) \ OBJECT_CHECK(IntelIOMMUState, (obj), TYPE_INTEL_IOMMU_DEVICE) +#define INTEL_IOMMU_STR "intel" /* DMAR Hardware Unit Definition address (IOMMU unit) */ #define Q35_HOST_BRIDGE_IOMMU_ADDR 0xfed90000ULL -- 2.1.4