From patchwork Wed Aug 9 20:34:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9892617 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 A639D60236 for ; Thu, 10 Aug 2017 02:43:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A36228A08 for ; Thu, 10 Aug 2017 02:43:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7EF2528A06; Thu, 10 Aug 2017 02:43:36 +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 5A722289D6 for ; Thu, 10 Aug 2017 02:43:35 +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 1dfdQ4-0001ft-WE; Thu, 10 Aug 2017 02:41:56 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dfdQ4-0001dh-5C for xen-devel@lists.xen.org; Thu, 10 Aug 2017 02:41:56 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 63/6B-01862-3F7CB895; Thu, 10 Aug 2017 02:41:55 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRWlGSWpSXmKPExsXS1taRovvpeHe kwdsGHYslHxezODB6HN39mymAMYo1My8pvyKBNWN68wLmgndiFX3zZjA2MN4Q6mLk4BASqJT4 2lTdxcjJISHAK3Fk2QxWCDtAoqdhLksXIxdQSQejxKdbO5lBEmwC6hInFk9kBLFFBKQlrn2+z AhSxCxwlVHi9Lb5YEXCAt4S6x/PYAexWQRUJXZue88GYvMKuEq8uHiIGWKDgsSUh+/BbE6g+N QtW5lAbCEBF4l1y6cxTmDkXcDIsIpRvTi1qCy1SNdUL6koMz2jJDcxM0fX0MBYLze1uDgxPTU nMalYLzk/dxMjMBjqGRgYdzBe/up0iFGSg0lJlLejoTtSiC8pP6UyI7E4I76oNCe1+BCjDAeH kgRv9zGgnGBRanpqRVpmDjAsYdISHDxKIrxqwNAU4i0uSMwtzkyHSJ1i1OV4NeH/NyYhlrz8v FQpcd4lIDMEQIoySvPgRsBi5BKjrJQwLyMDA4MQT0FqUW5mCar8K0ZxDkYlYd5PIFN4MvNK4D a9AjqCCeiICN9OkCNKEhFSUg2MWv+d38goXblUxX3MarrvmgTj/S/updYqC8zVc02XuJ09LWp RjcziLScu78ncs25q2QKW3FnvkyKyfPzKRRlVH03QP80jJKUdNL2o6PUFztVODx+tsTlusnpZ tdiBtfdjpxYruTtKefbN0Krcr6n30WPtFGexV1abu/Lq8tawyt15ZdlaUy2hxFKckWioxVxUn AgAdIY9CowCAAA= X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1502332912!105300801!1 X-Originating-IP: [134.134.136.100] 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.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 58890 invoked from network); 10 Aug 2017 02:41:54 -0000 Received: from mga07.intel.com (HELO mga07.intel.com) (134.134.136.100) by server-15.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 10 Aug 2017 02:41:54 -0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP; 09 Aug 2017 19:41:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.41,349,1498546800"; d="scan'208"; a="1180964800" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.141]) by fmsmga001.fm.intel.com with ESMTP; 09 Aug 2017 19:41:48 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Wed, 9 Aug 2017 16:34:19 -0400 Message-Id: <1502310866-10450-19-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1502310866-10450-1-git-send-email-tianyu.lan@intel.com> References: <1502310866-10450-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, julien.grall@arm.com, jbeulich@suse.com, Chao Gao Subject: [Xen-devel] [PATCH V2 18/25] 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/drivers/passthrough/vtd/iommu.h | 3 ++- xen/drivers/passthrough/vtd/vvtd.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index 82bf6bc..e323352 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -192,7 +192,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) diff --git a/xen/drivers/passthrough/vtd/vvtd.c b/xen/drivers/passthrough/vtd/vvtd.c index 470bc56..eae8f11 100644 --- a/xen/drivers/passthrough/vtd/vvtd.c +++ b/xen/drivers/passthrough/vtd/vvtd.c @@ -282,6 +282,25 @@ 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, "%sable Interrupt Remapping.", + (val & DMA_GCMD_IRE) ? "En" : "Dis"); + + 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; @@ -289,6 +308,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); @@ -318,6 +341,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; }