From patchwork Thu May 18 05:34:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9733851 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 40C2F601BC for ; Thu, 18 May 2017 11:42:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FD2C20952 for ; Thu, 18 May 2017 11:42:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 24AF725404; Thu, 18 May 2017 11:42:29 +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=-2.7 required=2.0 tests=BAYES_00, DATE_IN_PAST_06_12, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C107520952 for ; Thu, 18 May 2017 11:42:28 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBJnX-0004pr-I9; Thu, 18 May 2017 11:40:51 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBJnW-0004ns-N1 for xen-devel@lists.xen.org; Thu, 18 May 2017 11:40:50 +0000 Received: from [85.158.143.35] by server-11.bemta-6.messagelabs.com id DE/32-03587-2488D195; Thu, 18 May 2017 11:40:50 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsXS1tbhqOvYIRt p8PmemsWSj4tZHBg9ju7+zRTAGMWamZeUX5HAmjHx8g3mgh6xiinb1RsYG4W6GLk4hASmMUpc mXCXuYuRk0NCgFfiyLIZrBB2gMSU7pdsEEUdjBJNCz8ygSTYBNQlTiyeyAhiiwhIS1z7fBnMZ hbYxyjx5rkqiC0s4C9xfu0UsEEsAqoSb+f/AavhFXCVmH/pJNQyBYkpD9+D2ZxA8W1bb7GA2E ICLhKNC3tZJzDyLmBkWMWoXpxaVJZapGusl1SUmZ5RkpuYmaNraGCml5taXJyYnpqTmFSsl5y fu4kRGAwMQLCDseOf0yFGSQ4mJVHewwWykUJ8SfkplRmJxRnxRaU5qcWHGGU4OJQkePnagXKC RanpqRVpmTnAsIRJS3DwKInwpoCkeYsLEnOLM9MhUqcYFaXEeb1AEgIgiYzSPLg2WCxcYpSVE uZlBDpEiKcgtSg3swRV/hWjOAejkjBvFcgUnsy8Erjpr4AWMwEtbn4gDbK4JBEhJdXAKKt221 4w/UZE6ToetrKYvar7pmyes1JD+fIe9yUKTxJY5PskLvguOGKz7ojYPMmlIUeP3X42e91ia1W 1fS84FnD9W5H0kT1i1xWL2EVpETMt963b6p0q3iY2f16yHfM51x0z4h/8uHpab8e67dN32op9 OHzlYeyCmNjVV19u35Cj3n5I0c1o5zIlluKMREMt5qLiRAC79rKxgAIAAA== X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1495107644!63462880!2 X-Originating-IP: [134.134.136.65] X-SpamReason: No, hits=0.8 required=7.0 tests=DATE_IN_PAST_06_12, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28441 invoked from network); 18 May 2017 11:40:49 -0000 Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by server-13.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 18 May 2017 11:40:49 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 May 2017 04:40:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.38,358,1491289200"; d="scan'208"; a="1132037146" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.124]) by orsmga001.jf.intel.com with ESMTP; 18 May 2017 04:40:47 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Thu, 18 May 2017 01:34:48 -0400 Message-Id: <1495085696-10819-19-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1495085696-10819-1-git-send-email-tianyu.lan@intel.com> References: <1495085696-10819-1-git-send-email-tianyu.lan@intel.com> Cc: Lan Tianyu , kevin.tian@intel.com, wei.liu2@citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, jbeulich@suse.com, Chao Gao Subject: [Xen-devel] [RFC PATCH V2 18/26] X86/vvtd: Enable Interrupt Remapping through GCMD X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Chao Gao Software writes this field to enable/disable interrupt reampping. This patch emulate IRES field of GCMD. Signed-off-by: Chao Gao Signed-off-by: Lan Tianyu --- xen/arch/x86/hvm/vvtd.c | 26 ++++++++++++++++++++++++++ xen/drivers/passthrough/vtd/iommu.h | 3 ++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vvtd.c b/xen/arch/x86/hvm/vvtd.c index be3acd5..10b0cd0 100644 --- a/xen/arch/x86/hvm/vvtd.c +++ b/xen/arch/x86/hvm/vvtd.c @@ -278,6 +278,24 @@ static int vvtd_handle_gcmd_qie(struct vvtd *vvtd, uint32_t val) return X86EMUL_OKAY; } +static int vvtd_handle_gcmd_ire(struct vvtd *vvtd, uint32_t val) +{ + VVTD_DEBUG(VVTD_DBG_RW, "Enable Interrupt Remapping."); + + if ( val & DMA_GCMD_IRE ) + { + vvtd->status |= VIOMMU_STATUS_IRQ_REMAPPING_ENABLED; + __vvtd_set_bit(vvtd, DMAR_GSTS_REG, DMA_GSTS_IRES_BIT); + } + else + { + vvtd->status |= ~VIOMMU_STATUS_IRQ_REMAPPING_ENABLED; + __vvtd_clear_bit(vvtd, DMAR_GSTS_REG, DMA_GSTS_IRES_BIT); + } + + return X86EMUL_OKAY; +} + static int vvtd_handle_gcmd_sirtp(struct vvtd *vvtd, uint32_t val) { uint64_t irta; @@ -285,6 +303,10 @@ static int vvtd_handle_gcmd_sirtp(struct vvtd *vvtd, uint32_t val) if ( !(val & DMA_GCMD_SIRTP) ) return X86EMUL_OKAY; + if ( vvtd_irq_remapping_enabled(vvtd) ) + VVTD_DEBUG(VVTD_DBG_RW, "Update Interrupt Remapping Table when " + "active." ); + vvtd_get_reg_quad(vvtd, DMAR_IRTA_REG, irta); vvtd->irt = DMA_IRTA_ADDR(irta) >> PAGE_SHIFT; vvtd->irt_max_entry = DMA_IRTA_SIZE(irta); @@ -311,6 +333,10 @@ static int vvtd_write_gcmd(struct vvtd *vvtd, uint32_t val) vvtd_handle_gcmd_sirtp(vvtd, val); if ( changed & DMA_GCMD_QIE ) vvtd_handle_gcmd_qie(vvtd, val); + if ( changed & DMA_GCMD_IRE ) + vvtd_handle_gcmd_ire(vvtd, val); + if ( changed & ~(DMA_GCMD_QIE | DMA_GCMD_SIRTP | DMA_GCMD_IRE) ) + gdprintk(XENLOG_INFO, "Only QIE,SIRTP,IRE in GCMD_REG are handled.\n"); return X86EMUL_OKAY; } diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index 2d60df6..03361c0 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -195,7 +195,8 @@ #define DMA_GSTS_WBFS (((u64)1) << 27) #define DMA_GSTS_QIES_BIT 26 #define DMA_GSTS_QIES (((u64)1) << DMA_GSTS_QIES_BIT) -#define DMA_GSTS_IRES (((u64)1) <<25) +#define DMA_GSTS_IRES_BIT 25 +#define DMA_GSTS_IRES (((u64)1) << DMA_GSTS_IRES_BIT) #define DMA_GSTS_SIRTPS_BIT 24 #define DMA_GSTS_SIRTPS (((u64)1) << DMA_GSTS_SIRTPS_BIT) #define DMA_GSTS_CFIS (((u64)1) <<23)