From patchwork Fri Apr 1 18:39:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Kiarie X-Patchwork-Id: 8727031 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4DD7AC0553 for ; Fri, 1 Apr 2016 18:41:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A1859203A0 for ; Fri, 1 Apr 2016 18:41:39 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 059C92034E for ; Fri, 1 Apr 2016 18:41:39 +0000 (UTC) Received: from localhost ([::1]:45883 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1am40o-0007OI-Cf for patchwork-qemu-devel@patchwork.kernel.org; Fri, 01 Apr 2016 14:41:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1am40W-0007G9-6U for qemu-devel@nongnu.org; Fri, 01 Apr 2016 14:41:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1am40V-0007k1-9W for qemu-devel@nongnu.org; Fri, 01 Apr 2016 14:41:20 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:32844) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1am40V-0007jx-2k for qemu-devel@nongnu.org; Fri, 01 Apr 2016 14:41:19 -0400 Received: by mail-wm0-x243.google.com with SMTP id i204so362992wmd.0 for ; Fri, 01 Apr 2016 11:41:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tFJwWiZMT/iOyshNTlSUA0XZSIFfjt1V0esryG5p4vQ=; b=U56RGMgy6oF+1i19JPHAUe/9A5l1YIZOXlsKxLRwbqxB4f/Op1SVw4DDzqXMLttC7J NUhRgkPABXC19ZU/tsWtbkq02pSdad0Xleww3Y1GFVCxBmVSFsUrrrTT954NZwYf0joV mvzG+pa3fBzeX+qF97CyG3mze7wAGIsB6tqpRZ3WyyH/1Ow2C86inbrJUVZHAVOM/4dB DaNu4FhoCPP9aUe/HWygVG0dNMxcnvwMGrG4ZEH+CnkvKoFDyqxPNgUe2/X3xOVNnn3e Lc72nMlvfhWh/DISfS3SKDD5DDsBNkoAupV8FHgDX2JYfkXsUPSO3/7OVykDy700C74s bCfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tFJwWiZMT/iOyshNTlSUA0XZSIFfjt1V0esryG5p4vQ=; b=WqZCl62KC+veGYAV5iMr5uvfePB+j/2OHA4WeT7eZDxfP8XtDHaVMOrIeUvOAIrpA4 bOBJOD8Cu7b4aK9uYl9w5oCJzW7RNd1TaPNFlDgFGR7rPydDuIarHvjbCBYZh2kjj6nb D0u5/LdbvX5eAueqdJ/mm//fF9u9iQlyN33HzisCTdhpcqRvpS8V1EnWw2mRFB2yHb6A hUE1emfV5/ql/RoNgrkBpgvhp4DZscen4DhMMykwJOATfcrjOi2arfYehKs41GZW1n0e 1mML9wKptO9yaz7sR2SUHkCikk47VuwQmOQ9Nrjkure8fvfB2RZ3A56AF+cK7RPXky51 O1rg== X-Gm-Message-State: AD7BkJJq7K2Zj5RtQJ2oSpcKIYwunDAQuunGtC1Yy3CiNO3VlFYKqtB5e6T4gCbna/YQQw== X-Received: by 10.194.71.46 with SMTP id r14mr7256998wju.100.1459536078422; Fri, 01 Apr 2016 11:41:18 -0700 (PDT) Received: from debian.flybox.orange ([154.122.176.211]) by smtp.googlemail.com with ESMTPSA id w184sm233275wmb.1.2016.04.01.11.41.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Apr 2016 11:41:17 -0700 (PDT) From: David Kiarie To: qemu-devel@nongnu.org Date: Fri, 1 Apr 2016 21:39:54 +0300 Message-Id: <1459535994-18523-5-git-send-email-davidkiarie4@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1459535994-18523-1-git-send-email-davidkiarie4@gmail.com> References: <1459535994-18523-1-git-send-email-davidkiarie4@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::243 Cc: marcel@redhat.com, valentine.sinitsyn@gmail.com, David Kiarie , jan.kizska@web.de, mst@redhat.com Subject: [Qemu-devel] [V8 4/4] hw/pci-host: Emulate AMD IOMMU 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 | 1 + 2 files changed, 20 insertions(+), 2 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..5a520f3 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -28,6 +28,7 @@ #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