From patchwork Mon Aug 15 16:32:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Kiarie X-Patchwork-Id: 9281525 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 CE9EC60467 for ; Mon, 15 Aug 2016 16:34:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C011728DDF for ; Mon, 15 Aug 2016 16:34:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B49B128DE5; Mon, 15 Aug 2016 16:34:17 +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 5CC1628DDF for ; Mon, 15 Aug 2016 16:34:17 +0000 (UTC) Received: from localhost ([::1]:37957 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZKq8-0002Qf-Ds for patchwork-qemu-devel@patchwork.kernel.org; Mon, 15 Aug 2016 12:34:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZKpR-0002KS-Ay for qemu-devel@nongnu.org; Mon, 15 Aug 2016 12:33:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bZKpQ-0007xL-A3 for qemu-devel@nongnu.org; Mon, 15 Aug 2016 12:33:33 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:33080) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZKpQ-0007xA-3N for qemu-devel@nongnu.org; Mon, 15 Aug 2016 12:33:32 -0400 Received: by mail-wm0-x242.google.com with SMTP id o80so12005811wme.0 for ; Mon, 15 Aug 2016 09:33:31 -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=CxJAECatis8T/Lyh6QJK7wO1y38orSrc1UkJMA0Qg9XAtv1xb3hZn9phGmqkZsYCIs GNe1hRFIUteH35qJ1sGEviZ2D37aGfujyqd0HtsC9iHoSJ51chXx2RdIn+ijY/tQ6rYK ah3GnGqiKj++zHm/kMkJ6fqB4XOvE+1b6Slf0gsLKKn2W10q+/HnPCRinwW87Vct3koC vo9Q4GwcRsDMHfKNZIHpFLNB0tmiptcaVxtmuymZz3YUTxtv8WiYdI/VrlmmdUwTVtnF kA2fi3hVv+Sd8w19jM/nRgTDU96XPG9Zun4ApqJe9m46bCZsFTCzendNPe7KS9Nyr3ci s7KA== 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=DSIWuJHF7Nh3tHHrv/P+wCT9xioKXsOFkDI0+axEnCpRKfUI/hS74MZfhHW8TQwajI qFh0Qw+bOY5WNfTgsSJ4Nyo3uIXfEetg1uTXup7rXACWd/H0NAo8nPjxfpUXxUQm2KuJ nsGoGz05h9dOez0UPLAF69B/EbrutyCMQA8SJKFHEA7D39syoNF1nTfc0IknCSVthy95 8MFVyvCMKZ1gtHv9G23xFMJU/xGTQyv7dkLYiquDCcgnKtBgGb6keKjDIgo9x5slxFFr 3zCUJQrPwzr/qXnBnLhL5USI+cLQhsTmdoZJBEWbv1rfpfUZy31NOBXKeAyzJL5wmIhH WoqA== X-Gm-Message-State: AEkooutrzI5qvKVwKHjvdlxl6Xd9IwziQHtiiekt6ocV/IVxrEMANFd/t9Y7LtZDjJu7Aw== X-Received: by 10.194.28.5 with SMTP id x5mr31230795wjg.11.1471278811339; Mon, 15 Aug 2016 09:33:31 -0700 (PDT) Received: from debian.flybox.orange ([154.122.75.147]) by smtp.googlemail.com with ESMTPSA id bc10sm22277885wjc.32.2016.08.15.09.33.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Aug 2016 09:33:31 -0700 (PDT) From: David Kiarie To: qemu-devel@nongnu.org Date: Mon, 15 Aug 2016 19:32:46 +0300 Message-Id: <1471278766-25277-7-git-send-email-davidkiarie4@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1471278766-25277-1-git-send-email-davidkiarie4@gmail.com> References: <1471278766-25277-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] [V2 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: rkrcmar@redhat.com, mst@redhat.com, peterx@redhat.com, valentine.sinitsyn@gmail.com, jan.kiszka@web.de, pbonzini@redhat.com, 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)); }