From patchwork Fri Sep 22 03:02:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9965615 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 74B07600C5 for ; Fri, 22 Sep 2017 09:13:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70AA7297BA for ; Fri, 22 Sep 2017 09:13:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 658F32980B; Fri, 22 Sep 2017 09:13:03 +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 1D050297BA for ; Fri, 22 Sep 2017 09:13:02 +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 1dvJzH-0005K1-IB; Fri, 22 Sep 2017 09:11:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dvJzG-0005H9-Ed for xen-devel@lists.xen.org; Fri, 22 Sep 2017 09:11:06 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 81/87-02208-9A3D4C95; Fri, 22 Sep 2017 09:11:05 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRWlGSWpSXmKPExsXS1tYhr7vy8pF IgwkrOCyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oxTTy6yFrQKVVx/t5e1gbGdv4uRk0NIoEJi 7u0vTCC2hACvxJFlM1ghbH+JBw0rmSFqOhglelbygthsAuoSJxZPZASxRQSkJa59vgxkc3EwC yxmlHjecpAdJCEs4C1xYdYHsGYWAVWJHZMOs4DYvAKuEh03L7BALFCQmPLwPVgNJ1D8V992Jo hlLhKtS/czTWDkXcDIsIpRozi1qCy1SNfQRC+pKDM9oyQ3MTNH19DAVC83tbg4MT01JzGpWC8 5P3cTIzAcGIBgB+PZ056HGCU5mJREed+fPxIpxJeUn1KZkVicEV9UmpNafIhRhoNDSYK3/RJQ TrAoNT21Ii0zBxiYMGkJDh4lEd5EkDRvcUFibnFmOkTqFKMuR8fNu3+YhFjy8vNSpcR59UCKB ECKMkrz4EbAouQSo6yUMC8j0FFCPAWpRbmZJajyrxjFORiVhHmzQabwZOaVwG16BXQEE9AR5a vBjihJREhJNTCmhPmoP4m+xlnUwb7pyaupHxf4scxWqm72Ou/EsPm7Y5jmr+WZx49Uum7esbz WWTBkb/CEl+02srFqgWabNK65LuWKu7AwzKiJ/+z3S82ex5/ufzD3m1yPgHXKUZlQocSPb4Kr Pj4QZxTLrXrXNOWgVFV6f0lFvLHR4z2qa65e486QdprtMlmJpTgj0VCLuag4EQDNGH6ujQIAA A== X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1506071463!91636614!1 X-Originating-IP: [134.134.136.31] 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 54915 invoked from network); 22 Sep 2017 09:11:04 -0000 Received: from mga06.intel.com (HELO mga06.intel.com) (134.134.136.31) by server-11.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 22 Sep 2017 09:11:04 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP; 22 Sep 2017 02:11:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,427,1500966000"; d="scan'208";a="138241532" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.141]) by orsmga002.jf.intel.com with ESMTP; 22 Sep 2017 02:11:00 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Thu, 21 Sep 2017 23:02:08 -0400 Message-Id: <1506049330-11196-28-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, andrew.cooper3@citrix.com, jbeulich@suse.com, Chao Gao , roger.pau@citrix.com Subject: [Xen-devel] [PATCH V3 27/29] x86/vvtd: Enable Queued Invalidation 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 to QIE field of GCMD to enable or disable queued invalidations. This patch emulates QIE 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 | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index e19b045..c69cd21 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -162,7 +162,8 @@ #define DMA_GSTS_FLS (((u64)1) << 29) #define DMA_GSTS_AFLS (((u64)1) << 28) #define DMA_GSTS_WBFS (((u64)1) << 27) -#define DMA_GSTS_QIES (((u64)1) <<26) +#define DMA_GSTS_QIES_SHIFT 26 +#define DMA_GSTS_QIES (((u64)1) << DMA_GSTS_QIES_SHIFT) #define DMA_GSTS_IRES_SHIFT 25 #define DMA_GSTS_IRES (((u64)1) << DMA_GSTS_IRES_SHIFT) #define DMA_GSTS_SIRTPS_SHIFT 24 diff --git a/xen/drivers/passthrough/vtd/vvtd.c b/xen/drivers/passthrough/vtd/vvtd.c index 745941c..55f7a46 100644 --- a/xen/drivers/passthrough/vtd/vvtd.c +++ b/xen/drivers/passthrough/vtd/vvtd.c @@ -496,6 +496,19 @@ static void vvtd_handle_gcmd_ire(struct vvtd *vvtd, uint32_t val) } } +static void vvtd_handle_gcmd_qie(struct vvtd *vvtd, uint32_t val) +{ + vvtd_info("%sable Queue Invalidation", (val & DMA_GCMD_QIE) ? "En" : "Dis"); + + if ( val & DMA_GCMD_QIE ) + vvtd_set_bit(vvtd, DMAR_GSTS_REG, DMA_GSTS_QIES_SHIFT); + else + { + vvtd_set_reg_quad(vvtd, DMAR_IQH_REG, 0); + vvtd_clear_bit(vvtd, DMAR_GSTS_REG, DMA_GSTS_QIES_SHIFT); + } +} + static void vvtd_handle_gcmd_sirtp(struct vvtd *vvtd, uint32_t val) { uint64_t irta = vvtd_get_reg_quad(vvtd, DMAR_IRTA_REG); @@ -535,6 +548,10 @@ static int vvtd_write_gcmd(struct vvtd *vvtd, uint32_t val) vvtd_handle_gcmd_sirtp(vvtd, val); if ( changed & DMA_GCMD_IRE ) vvtd_handle_gcmd_ire(vvtd, val); + if ( changed & DMA_GCMD_QIE ) + vvtd_handle_gcmd_qie(vvtd, val); + if ( changed & ~(DMA_GCMD_SIRTP | DMA_GCMD_IRE | DMA_GCMD_QIE) ) + vvtd_info("Only SIRTP, IRE, QIE in GCMD are handled"); return X86EMUL_OKAY; }