From patchwork Mon May 9 12:16:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Kiarie X-Patchwork-Id: 9045971 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B50569F1C3 for ; Mon, 9 May 2016 12:24:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 15D9D200ED for ; Mon, 9 May 2016 12:24:35 +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 68CCE200CA for ; Mon, 9 May 2016 12:24:34 +0000 (UTC) Received: from localhost ([::1]:40992 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azkEj-0007HL-Fq for patchwork-qemu-devel@patchwork.kernel.org; Mon, 09 May 2016 08:24:33 -0400 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) 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=2p4gIMnu/sjUGFIMv/+bawi/cBES74h5aIKIoiAkrNw=; b=ienBARHqKqOCcgGpbmjuYJhrf88sKKGyjvdqo5n+7vj0XbQu+FYXF69c6vKRQsjDXM teRrnM51/OPbaWx40m023QT4D7qUxagGCDb2PQNSFBJj53vX5+3uyTjfaWnvmKUQU9+p E7WSyti7ya+JG0hbmUEkSj5N/SWDIxf7/txGlH+6Mm+qiEkyvUGmQ9SCIQbe+0ow+4Ij UOufmaajmE6+b9IyUfOgCIl5HMCLuqJIp2RHgidZAgCkU8DrLot6sKaU6ajvAY3hB2ek KQEF+dsPz1ny3B5bRXkORSOXA6b/R83W5+05lr1GpvWlx3Ze6Fu4z+P+CuZrwhUdPZc3 Rd+w== 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=2p4gIMnu/sjUGFIMv/+bawi/cBES74h5aIKIoiAkrNw=; b=VPQf96R3h5VNsrRK3ypeHRDR6IxEGEdR34xcKVIqYtxAoA1Is+7hh2R9IBBk94y2W6 t5RXSdM5dfBlDa/ggbBKDIPcCUmNiZkFRLXGnPsrHMjD1QfmZvGiW8plpG75AYJZsMzY lhFn5p9LoBnQhOFDHAA6AuFLQMNxjI+Ts6pWw7yr6qOcfAK+YGJ4X8IM116LcHVzuMaf z20J1aQWHOmCumBJcqcyGGrjcOtUjQQ/vbu8Bs8FTeLhYHW4BRPtlETB+M6guUVGzlWD Wz3E/NmJPhgbswuQ/7lfcUTDOie2ZufuDrckGLw63h9PMiB0UXbUdkwdn4pnu0hwL8lv DhWA== X-Gm-Message-State: AOPr4FXMCGIxpYERacUHwgQBQiFhJ7yIsLgTvJ0BfnBBLXsgN5+xzanSdPCcH/x5dKWj9Q== X-Received: by 10.28.178.129 with SMTP id b123mr4133856wmf.2.1462796188087; Mon, 09 May 2016 05:16:28 -0700 (PDT) Received: from debian.flybox.orange ([154.122.80.149]) by smtp.googlemail.com with ESMTPSA id xt9sm30777323wjb.17.2016.05.09.05.16.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 May 2016 05:16:27 -0700 (PDT) From: David Kiarie To: qemu-devel@nongnu.org Date: Mon, 9 May 2016 15:16:02 +0300 Message-Id: <1462796162-13375-5-git-send-email-davidkiarie4@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1462796162-13375-1-git-send-email-davidkiarie4@gmail.com> References: <1462796162-13375-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::231 Subject: [Qemu-devel] [V10 4/4] hw/pci-host: Emulate AMD IOMMU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mst@redhat.com, peterx@redhat.com, valentine.sinitsyn@gmail.com, jan.kiszka@web.de, marcel@redhat.com, David Kiarie Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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 | 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); + } } }