From patchwork Thu Jun 29 05:50:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9816527 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 419E46020A for ; Thu, 29 Jun 2017 12:00:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B48A1283BB for ; Thu, 29 Jun 2017 12:00:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A6F5F2853A; Thu, 29 Jun 2017 12:00:01 +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 4B1E62851A for ; Thu, 29 Jun 2017 12:00:01 +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 1dQY5e-0006iX-G9; Thu, 29 Jun 2017 11:58:30 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQY5c-0006fF-UT for xen-devel@lists.xen.org; Thu, 29 Jun 2017 11:58:29 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id 75/67-02962-46BE4595; Thu, 29 Jun 2017 11:58:28 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsXS1tYhoZv8OiT S4MpLY4slHxezODB6HN39mymAMYo1My8pvyKBNWP+3UmsBe/EKnoepDcw3hDqYuTiEBKYxijx /8RXpi5GTg4JAV6JI8tmsELY/hLz1j5lgihqZ5S4/WESO0iCTUBd4sTiiYwgtoiAtMS1z5fBb GaBfYwSb56rdjFycAgLeEicnRYGEmYRUJU4MO832ExeAVeJzz9a2SHmK0hMefieGcTmBIo33N zCBmILCbhIfOrZyTyBkXcBI8MqRo3i1KKy1CJdQxO9pKLM9IyS3MTMHF1DAzO93NTi4sT01Jz EpGK95PzcTYzAYGAAgh2M1zcGHGKU5GBSEuU1fB4SKcSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mC 1/kVUE6wKDU9tSItMwcYljBpCQ4eJRHePpBW3uKCxNzizHSI1ClGRSlx3hqQPgGQREZpHlwbL BYuMcpKCfMyAh0ixFOQWpSbWYIq/4pRnINRSZg3GmQKT2ZeCdz0V0CLmYAWC88AW1ySiJCSam CcPTPbau6D//cXhU15bZZeda1uVVP2rFfu/5rOJJTU214TO7ldTVFgH7tbpbJxp7DlvzVsi47 M87snpn7b5OBJh+vOuRe03D4cmhm6qblZ/rLTh7yy2vmOi6sK/trUfuG+/ddWaNvDlz3XJu7L 4tkuemJ31Wu2w+reAWd39fJ9LPvOWCpb8q1YiaU4I9FQi7moOBEAvUVpH4ACAAA= X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1498737505!45219431!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzkwOTcx\n X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47789 invoked from network); 29 Jun 2017 11:58:27 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-2.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 29 Jun 2017 11:58:27 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jun 2017 04:58:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,280,1496127600"; d="scan'208";a="105111923" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.74]) by orsmga002.jf.intel.com with ESMTP; 29 Jun 2017 04:58:23 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Thu, 29 Jun 2017 01:50:50 -0400 Message-Id: <1498715457-16565-19-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1498715457-16565-1-git-send-email-tianyu.lan@intel.com> References: <1498715457-16565-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] [PATCH 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 0954aa2..f8e5499 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; }