From patchwork Fri Sep 22 03:01:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9965605 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 10B06600C5 for ; Fri, 22 Sep 2017 09:12:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B9FD28501 for ; Fri, 22 Sep 2017 09:12:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0043B2885F; Fri, 22 Sep 2017 09:12:27 +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 9650D28501 for ; Fri, 22 Sep 2017 09:12:27 +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 1dvJyb-0004Jk-RM; Fri, 22 Sep 2017 09:10:25 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dvJya-0004HT-2r for xen-devel@lists.xen.org; Fri, 22 Sep 2017 09:10:24 +0000 Received: from [85.158.143.35] by server-11.bemta-6.messagelabs.com id 29/F0-03616-F73D4C95; Fri, 22 Sep 2017 09:10:23 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRWlGSWpSXmKPExsVywNykQrf68pF Ig7YpNhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8a/FS3sBa+kKub/72JqYJwh1sXIxSEkMI1R 4tr/2+xdjJwcEgK8EkeWzWDtYuQAsv0ljp5PhqjpYJT4t/IjI0gNm4C6xInFE8FsEQFpiWufL zOCFDELbGaSmLtmFgtIQljAW6J17RywIhYBVYmnGz+A2bwCrhJ3Nk+CWqYgMeXhe2YQmxMo/q tvOxOILSTgItG6dD/TBEbeBYwMqxg1ilOLylKLdA2N9JKKMtMzSnITM3N0DQ3M9HJTi4sT01N zEpOK9ZLzczcxAgOCAQh2MF7eGHCIUZKDSUmU9/35I5FCfEn5KZUZicUZ8UWlOanFhxhlODiU JHj9LgHlBItS01Mr0jJzgKEJk5bg4FES4VUDSfMWFyTmFmemQ6ROMepydNy8+4dJiCUvPy9VS pxXD6RIAKQoozQPbgQsTi4xykoJ8zICHSXEU5BalJtZgir/ilGcg1FJmNcAZApPZl4J3KZXQE cwAR1RvhrsiJJEhJRUAyOD066Njg25B7b8K401eHPD4eZ+VT9eX9Env9b8YHySu3lHxJQSrSU PHpYseWPZ6nZZXb4/PERYhpVpl2Kz29Tf/4oX1FzZfO0gyza9iVp9VnzSfEfyd55zEdP88Z9/ ve3VWSlW16f9lHx5/Ip2gXziuZ1HBOx+72oxv9qvw7DaMUg4VEMq3UOJpTgj0VCLuag4EQDEO MbvjgIAAA== X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1506071417!80979364!1 X-Originating-IP: [192.55.52.120] X-SpamReason: No, hits=0.8 required=7.0 tests=DATE_IN_PAST_06_12 X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4140 invoked from network); 22 Sep 2017 09:10:19 -0000 Received: from mga04.intel.com (HELO mga04.intel.com) (192.55.52.120) by server-11.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 22 Sep 2017 09:10:19 -0000 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Sep 2017 02:10:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,427,1500966000"; d="scan'208";a="152151054" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.141]) by orsmga005.jf.intel.com with ESMTP; 22 Sep 2017 02:10:14 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Thu, 21 Sep 2017 23:01:55 -0400 Message-Id: <1506049330-11196-15-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1506049330-11196-1-git-send-email-tianyu.lan@intel.com> References: <1506049330-11196-1-git-send-email-tianyu.lan@intel.com> Cc: Lan Tianyu , kevin.tian@intel.com, sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, jbeulich@suse.com, roger.pau@citrix.com, Chao Gao Subject: [Xen-devel] [PATCH V3 14/29] 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 | 30 +++++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index a0d5ec8..703726f 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -163,7 +163,8 @@ #define DMA_GSTS_AFLS (((u64)1) << 28) #define DMA_GSTS_WBFS (((u64)1) << 27) #define DMA_GSTS_QIES (((u64)1) <<26) -#define DMA_GSTS_IRES (((u64)1) <<25) +#define DMA_GSTS_IRES_SHIFT 25 +#define DMA_GSTS_IRES (((u64)1) << DMA_GSTS_IRES_SHIFT) #define DMA_GSTS_SIRTPS_SHIFT 24 #define DMA_GSTS_SIRTPS (((u64)1) << DMA_GSTS_SIRTPS_SHIFT) #define DMA_GSTS_CFIS (((u64)1) <<23) diff --git a/xen/drivers/passthrough/vtd/vvtd.c b/xen/drivers/passthrough/vtd/vvtd.c index 6736956..a0f63e9 100644 --- a/xen/drivers/passthrough/vtd/vvtd.c +++ b/xen/drivers/passthrough/vtd/vvtd.c @@ -33,7 +33,8 @@ unsigned int vvtd_caps = VIOMMU_CAP_IRQ_REMAPPING; struct hvm_hw_vvtd_status { - uint32_t eim_enabled : 1; + uint32_t eim_enabled : 1, + intremap_enabled : 1; uint32_t irt_max_entry; /* Interrupt remapping table base gfn */ uint64_t irt; @@ -84,6 +85,11 @@ static inline void vvtd_set_bit(struct vvtd *vvtd, uint32_t reg, int nr) __set_bit(nr, &vvtd->regs->data32[reg/sizeof(uint32_t)]); } +static inline void vvtd_clear_bit(struct vvtd *vvtd, uint32_t reg, int nr) +{ + __clear_bit(nr, &vvtd->regs->data32[reg/sizeof(uint32_t)]); +} + static inline void vvtd_set_reg(struct vvtd *vtd, uint32_t reg, uint32_t value) { vtd->regs->data32[reg/sizeof(uint32_t)] = value; @@ -105,6 +111,23 @@ static inline uint64_t vvtd_get_reg_quad(struct vvtd *vtd, uint32_t reg) return vtd->regs->data64[reg/sizeof(uint64_t)]; } +static void vvtd_handle_gcmd_ire(struct vvtd *vvtd, uint32_t val) +{ + vvtd_info("%sable Interrupt Remapping", + (val & DMA_GCMD_IRE) ? "En" : "Dis"); + + if ( val & DMA_GCMD_IRE ) + { + vvtd->status.intremap_enabled = true; + vvtd_set_bit(vvtd, DMAR_GSTS_REG, DMA_GSTS_IRES_SHIFT); + } + else + { + vvtd->status.intremap_enabled = false; + vvtd_clear_bit(vvtd, DMAR_GSTS_REG, DMA_GSTS_IRES_SHIFT); + } +} + static void vvtd_handle_gcmd_sirtp(struct vvtd *vvtd, uint32_t val) { uint64_t irta = vvtd_get_reg_quad(vvtd, DMAR_IRTA_REG); @@ -112,6 +135,9 @@ static void vvtd_handle_gcmd_sirtp(struct vvtd *vvtd, uint32_t val) if ( !(val & DMA_GCMD_SIRTP) ) return; + if ( vvtd->status.intremap_enabled ) + vvtd_info("Update Interrupt Remapping Table when active\n"); + vvtd->status.irt = DMA_IRTA_ADDR(irta) >> PAGE_SHIFT; vvtd->status.irt_max_entry = DMA_IRTA_SIZE(irta); vvtd->status.eim_enabled = !!(irta & IRTA_EIME); @@ -139,6 +165,8 @@ static int vvtd_write_gcmd(struct vvtd *vvtd, uint32_t val) if ( changed & DMA_GCMD_SIRTP ) vvtd_handle_gcmd_sirtp(vvtd, val); + if ( changed & DMA_GCMD_IRE ) + vvtd_handle_gcmd_ire(vvtd, val); return X86EMUL_OKAY; }