From patchwork Wed Aug 31 16:25:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Kiarie X-Patchwork-Id: 9307545 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 32C1860487 for ; Wed, 31 Aug 2016 16:34:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A8D328FBF for ; Wed, 31 Aug 2016 16:34:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0EFE928FCD; Wed, 31 Aug 2016 16:34:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id A2A2128FBF for ; Wed, 31 Aug 2016 16:34:02 +0000 (UTC) Received: from localhost ([::1]:55005 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bf8Sf-0005WV-RU for patchwork-qemu-devel@patchwork.kernel.org; Wed, 31 Aug 2016 12:34:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bf8Kx-0006h2-UC for qemu-devel@nongnu.org; Wed, 31 Aug 2016 12:26:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bf8Kv-0000hB-T9 for qemu-devel@nongnu.org; Wed, 31 Aug 2016 12:26:02 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:34193) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bf8Kv-0000h7-MY for qemu-devel@nongnu.org; Wed, 31 Aug 2016 12:26:01 -0400 Received: by mail-wm0-x242.google.com with SMTP id d196so4279949wmd.1 for ; Wed, 31 Aug 2016 09:26:01 -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=qEEGJlMzz4c1VkUSuPkKsHfZkrzNpSjiVz2ea24Pf0c=; b=EYztJgJMhXEIW00G32JOsjLY7TeEjL5gSp7Hw7uzmmGHrjK5MOsn9iXT5a++PB/Jfm p6c/95X91nIdGI9cWf+m+PpM2IfjP61xjyymZ+Mx8AEHwymP9CiStNYRrlk0jH/1R2nh SFeL02z0LL2xaxHI3oWFpZxzuFBpBjH6t2DEblb374aMB3Fq12v5NhDDSffLNUeqOLJN fBfasBOjXVtzX6W2+CS7s/zNzLXhBljs/A5LAAxL0f7wazRvhMMkbeE4hufcRNDBmipq cIjGF9d+0JJA00jHJyNQApRoFnpSdkT7BgidS/zcRU4mCk32aUaf6ouptGPjcVb6vMVJ ysUg== 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=qEEGJlMzz4c1VkUSuPkKsHfZkrzNpSjiVz2ea24Pf0c=; b=Yc3Bu/wGlyPKtKuH1J+V3CshBnzPTGEq2K53iDZ8+D0Ap2lo5jKuWzILLkge/L1rGw OI+X7djF3pfji1hHnHWI4tLA2JP4FXQeyl3dLPT6ID61+K8HIzyMqOCYwzBu+Yg7PaEh OvNj81Gp1cQGmv6wP5gxDm2G0Agbp6JtRuHh+u2i+PzoGYxD3vqPFiEbqAHS8AlvNB3o OFpzGkXPNsxnxY1TflAiN616XtJAhnkpz+DvWUEEcHWLfaSkGEzeQtvwRigJuNdVqbbd rLDpB8Ux6iIvOONxpIRX3kwOaW7sH5s42GCX7Z9JjwKaLkHMcd+CwLibM8D3KQMOPH2x MmpA== X-Gm-Message-State: AE9vXwNa1BJ055jzh/am3HZxpjkb2I0Ozd7YIv8MfFLfe5R47LM0tTcGLU9CQ43OOVPL8A== X-Received: by 10.194.43.9 with SMTP id s9mr10585809wjl.46.1472660761005; Wed, 31 Aug 2016 09:26:01 -0700 (PDT) Received: from debian.ameoba ([154.122.39.14]) by smtp.googlemail.com with ESMTPSA id pm1sm584468wjb.40.2016.08.31.09.25.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Aug 2016 09:26:00 -0700 (PDT) From: David Kiarie To: qemu-devel@nongnu.org Date: Wed, 31 Aug 2016 19:25:17 +0300 Message-Id: <1472660717-4646-7-git-send-email-davidkiarie4@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1472660717-4646-1-git-send-email-davidkiarie4@gmail.com> References: <1472660717-4646-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::242 Subject: [Qemu-devel] [v3 6/6] hw/iommu: share common code between IOMMUs 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: ehabkost@redhat.com, mst@redhat.com, rkrcmar@redhat.com, peterx@redhat.com, valentine.sinitsyn@gmail.com, jan.kiszka@web.de, David Kiarie Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Enabling interrupt remapping with kernel_irqchip=on should result in an error for both VT-d and AMD-Vi Signed-off-by: David Kiarie --- hw/i386/intel_iommu.c | 9 --------- hw/i386/x86-iommu.c | 8 ++++++++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index e4bad6a..bf86dcc 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -30,7 +30,6 @@ #include "hw/boards.h" #include "hw/i386/x86-iommu.h" #include "hw/pci-host/q35.h" -#include "sysemu/kvm.h" /*#define DEBUG_INTEL_IOMMU*/ #ifdef DEBUG_INTEL_IOMMU @@ -2472,14 +2471,6 @@ static void vtd_realize(DeviceState *dev, Error **errp) Q35_PSEUDO_DEVFN_IOAPIC); /* Pseudo address space under root PCI bus. */ pcms->ioapic_as = vtd_host_dma_iommu(bus, s, Q35_PSEUDO_DEVFN_IOAPIC); - - /* Currently Intel IOMMU IR only support "kernel-irqchip={off|split}" */ - if (x86_iommu->intr_supported && kvm_irqchip_in_kernel() && - !kvm_irqchip_is_split()) { - error_report("Intel Interrupt Remapping cannot work with " - "kernel-irqchip=on, please use 'split|off'."); - exit(1); - } } static void vtd_class_init(ObjectClass *klass, void *data) diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index 2278af7..66510f7 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -21,6 +21,7 @@ #include "hw/sysbus.h" #include "hw/boards.h" #include "hw/i386/x86-iommu.h" +#include "sysemu/kvm.h" #include "qemu/error-report.h" #include "trace.h" @@ -84,6 +85,13 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp) if (x86_class->realize) { x86_class->realize(dev, errp); } + /* Currently IOMMU IR only support "kernel-irqchip={off|split}" */ + if (x86_iommu->intr_supported && kvm_irqchip_in_kernel() && + !kvm_irqchip_is_split()) { + error_report("Interrupt Remapping cannot work with " + "kernel-irqchip=on, please use 'split|off'."); + exit(1); + } x86_iommu_set_default(X86_IOMMU_DEVICE(dev)); }