From patchwork Fri Mar 17 11:27:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9630445 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 DD9B860249 for ; Fri, 17 Mar 2017 11:37:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5F15284E9 for ; Fri, 17 Mar 2017 11:37:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B776628644; Fri, 17 Mar 2017 11:37:42 +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=-4.2 required=2.0 tests=BAYES_00, 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 660AA284E9 for ; Fri, 17 Mar 2017 11:37:42 +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 1coqAa-0004GV-30; Fri, 17 Mar 2017 11:35:44 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coqAZ-0004FD-Hq for xen-devel@lists.xen.org; Fri, 17 Mar 2017 11:35:43 +0000 Received: from [193.109.254.147] by server-2.bemta-6.messagelabs.com id 6A/21-19731-E0ACBC85; Fri, 17 Mar 2017 11:35:42 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDLMWRWlGSWpSXmKPExsXS1taRost36nS EweT7chZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bilu/sBYvFKi42NjE3ME4W6mLk5BASqJSY /PIDO4gtIcArcWTZDFYI219ixvR1QHEuoJp+RomvD6ezgCTYBNQlTiyeyAhiiwhIS1z7fJkRp IhZoJFRomFvIxtIQljAR6J73QwmEJtFQFWiv/kukM3BwSvgKnHrFCuIKSGgIDFnkg1IBSdQ9G 7bA3aIe1wk7nVdYZnAyLuAkWEVo3pxalFZapGuoV5SUWZ6RkluYmaOrqGBmV5uanFxYnpqTmJ SsV5yfu4mRmAoMADBDsadz50OMUpyMCmJ8r5YcTpCiC8pP6UyI7E4I76oNCe1+BCjDAeHkgTv nRNAOcGi1PTUirTMHGBQwqQlOHiURHjtQNK8xQWJucWZ6RCpU4yKUuK8/SAJAZBERmkeXBssE i4xykoJ8zICHSLEU5BalJtZgir/ilGcg1FJmHcZyBSezLwSuOmvgBYzAS1+++EEyOKSRISUVA MjU7j0miNHzvmLtX3elbhDafrMvKULmUNu7n3y5HmuqSzTgQX+S3w6LGbX6ZV8umazT6Y/Q2L xmcjHYX7LL4plu3g++vXxQJtCVvQK3/m75h1zZtmcfUPzbZHbf//dp96brTj3udt38eTVhuaG evN0s1pTI2av8K5d88V3stGjw73RPAFCf7/WK7EUZyQaajEXFScCAC5H399/AgAA X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1489750540!61800353!1 X-Originating-IP: [134.134.136.100] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31861 invoked from network); 17 Mar 2017 11:35:42 -0000 Received: from mga07.intel.com (HELO mga07.intel.com) (134.134.136.100) by server-11.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 17 Mar 2017 11:35:42 -0000 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP; 17 Mar 2017 04:35:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,176,1486454400"; d="scan'208";a="835822506" Received: from lantianyu-ws.sh.intel.com (HELO localhost) ([10.239.159.159]) by FMSMGA003.fm.intel.com with ESMTP; 17 Mar 2017 04:35:36 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Fri, 17 Mar 2017 19:27:17 +0800 Message-Id: <1489750043-17260-18-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1489750043-17260-1-git-send-email-tianyu.lan@intel.com> References: <1489750043-17260-1-git-send-email-tianyu.lan@intel.com> Cc: Lan Tianyu , andrew.cooper3@citrix.com, kevin.tian@intel.com, jbeulich@suse.com, chao.gao@intel.com Subject: [Xen-devel] [RFC PATCH 17/23] 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 uses 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 ba4d585..a7bba51 100644 --- a/xen/arch/x86/hvm/vvtd.c +++ b/xen/arch/x86/hvm/vvtd.c @@ -274,6 +274,24 @@ static int vvtd_handle_gcmd_qie(struct vvtd *vvtd, unsigned long val) return X86EMUL_OKAY; } +static int vvtd_handle_gcmd_ire(struct vvtd *vvtd, unsigned long 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, unsigned long val) { uint64_t irta; @@ -281,6 +299,10 @@ static int vvtd_handle_gcmd_sirtp(struct vvtd *vvtd, unsigned long 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); @@ -307,6 +329,10 @@ static int vvtd_write_gcmd(struct vvtd *vvtd, unsigned long 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 dd38c39..14fba1e 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)