From patchwork Mon Sep 12 10:08:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Kiarie X-Patchwork-Id: 9326093 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 4F7916048B for ; Mon, 12 Sep 2016 10:10:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F52C28CD6 for ; Mon, 12 Sep 2016 10:10:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E74328CD8; Mon, 12 Sep 2016 10:10:40 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 CB02928CD6 for ; Mon, 12 Sep 2016 10:10:39 +0000 (UTC) Received: from localhost ([::1]:41430 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjOCE-0002b3-PM for patchwork-qemu-devel@patchwork.kernel.org; Mon, 12 Sep 2016 06:10:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjOBd-0002WH-2y for qemu-devel@nongnu.org; Mon, 12 Sep 2016 06:10:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bjOBW-0004c9-Uu for qemu-devel@nongnu.org; Mon, 12 Sep 2016 06:09:59 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36091) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjOBW-0004by-OU for qemu-devel@nongnu.org; Mon, 12 Sep 2016 06:09:54 -0400 Received: by mail-wm0-f66.google.com with SMTP id z194so513456wmd.3 for ; Mon, 12 Sep 2016 03:09:54 -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=kjlA/BxTXMQ8I5wHUSyfm3YfjjL6veYBAsFiQmTzWP7GuUESQeu+CCoewV37k3IkSZ CvQFrC666tVA0WJUCmA4hbZDS9eOT42j4URcDQGoajpGg/cEvtOlpyhBiIupWvhvu0sM 6QFTfjrmbV7FaJBy/pnE5Yopp3VY7ncpbDU2wPz80JDoeyq50ES1+64Jv6cMQWE5M3A3 a1U7yvZZgkqW0LJjRKrT3TyMwy6m1mTRGPBJmVu8egXK/ZJv7ctn7mu611eHctnNrzYX ZQsCKEEowuuIhdE/JlRGuXmX5NOVaaDY3+oiV6wGlBet1wQZiCOBVCMvL66lqn70DL1o DywQ== 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=IgfaNEoKOceVmlzAAYGvso+5BvrJf2GHgMr6cXAMa5CtPfUTG0KhiBeoXT2plawM41 yxom//ysEAVZD9HiyBd5+TL7aaqzlsHXd2gEFwShKE5GEFYq92x9mK4j0YSuM5P5Tig+ 0HahnDAF9PKqkIMBmiIGeoN6uAykLx0QWbtwRxZtiuvr0Oo8rkpCYgDviNQYJMSK/9Fw rPG/eA5AsLrlDblw90ADBrVOPBm4HMTEeCXsN0EUWsDWXUG8jbmVQaeGXm7Ivv3iuNke sfgXC7stKO2R+3QUD+8zf7sGPRzSec9PRmntH3wA+ontpJJEJgFgt/SR9zkqYUYd6NQy 4gvw== X-Gm-Message-State: AE9vXwO1VnzvAr0e0EikoIvhFxOrQOIGdmXITb2q/NS+Ry9WQSYMIXL92yZescm6k5SX1w== X-Received: by 10.28.25.71 with SMTP id 68mr10671561wmz.91.1473674934083; Mon, 12 Sep 2016 03:08:54 -0700 (PDT) Received: from debian.ameoba ([154.122.106.143]) by smtp.googlemail.com with ESMTPSA id gg10sm17153603wjd.4.2016.09.12.03.08.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Sep 2016 03:08:53 -0700 (PDT) From: David Kiarie To: qemu-devel@nongnu.org Date: Mon, 12 Sep 2016 13:08:09 +0300 Message-Id: <1473674889-2727-7-git-send-email-davidkiarie4@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1473674889-2727-1-git-send-email-davidkiarie4@gmail.com> References: <1473674889-2727-1-git-send-email-davidkiarie4@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.66 Subject: [Qemu-devel] [v4 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, rkrcmar@redhat.com, mst@redhat.com, peterx@redhat.com, alex.williamson@redhat.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)); }