From patchwork Fri Mar 17 11:27:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9630427 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 353E660249 for ; Fri, 17 Mar 2017 11:37:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F6A8284E9 for ; Fri, 17 Mar 2017 11:37:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1432B2864B; Fri, 17 Mar 2017 11:37:31 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 BBCC5284E9 for ; Fri, 17 Mar 2017 11:37:30 +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 1coqAV-00049o-Q7; Fri, 17 Mar 2017 11:35:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coqAU-00042j-Jj for xen-devel@lists.xen.org; Fri, 17 Mar 2017 11:35:38 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 84/06-06437-A0ACBC85; Fri, 17 Mar 2017 11:35:38 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRWlGSWpSXmKPExsVywNwkQpfz1Ok Ig8aF1hZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8aZn91MBcuFK+7NfcXUwPiRv4uRi4NF4BaT xK77W9lBHCGBaYwSF1/sZe5i5OSQEOCVOLJsBiuE7S+xcWkPK0RRP6PE65efmEASbALqEicWT 2QEsUUEpCWufb7MCFLELNDIKNGwt5ENJCEs4CNxcdJzsCIWAVWJJf0/wTbwCrhKdM9eCrSaA2 iDgsScSTYgYU6g8N22B+wgtpCAi8S9rissExj5FjAyrGLUKE4tKkst0jU01EsqykzPKMlNzMz RNTQw1stNLS5OTE/NSUwq1kvOz93ECAwVBiDYwbj6t9MhRkkOJiVR3uvnTkQI8SXlp1RmJBZn xBeV5qQWH2KU4eBQkuC1eg6UEyxKTU+tSMvMAQYtTFqCg0dJhNcIJM1bXJCYW5yZDpE6xagoJ c776RlQQgAkkVGaB9cGi5RLjLJSwryMQIcI8RSkFuVmlqDKv2IU52BUEuZ1BRnPk5lXAjf9Fd BiJqDFiT+PgCwuSURISTUwrpRI3MwbcTUtckXXlZrj9s92lZZNv9Ze4Mn9slD+oMwUpU3372T fUvGr3xe4hi+u2yhY+GoQr9q+y+0r6ufuujvFpuDiiy/HJuwKvGYempeyxFal7NCXuL9XTB6z iEyrcbgu2/VgyeKzX9yl3ReZ7/oqI5hr/MvDifEGX9P9tfU1Rd0B14TZlFiKMxINtZiLihMBx 5k4q48CAAA= X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1489750534!90139755!2 X-Originating-IP: [192.55.52.88] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjg4ID0+IDM3NDcyNQ==\n X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6573 invoked from network); 17 Mar 2017 11:35:37 -0000 Received: from mga01.intel.com (HELO mga01.intel.com) (192.55.52.88) by server-13.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 17 Mar 2017 11:35:37 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1489750537; x=1521286537; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=XBXOEVM/dWGVU4JUPfOuP8xfva/lbAujtROTYdqcAhk=; b=k4vBly93EfTqX2hDDzb19jSST8nRCjnOusnBlIAXifrUBpT0ayq8zaUV MR7WVbozyjbw2D/4u+yoLpNI12i2Yw==; Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Mar 2017 04:35:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,176,1486454400"; d="scan'208";a="945414244" Received: from lantianyu-ws.sh.intel.com (HELO localhost) ([10.239.159.159]) by orsmga003.jf.intel.com with ESMTP; 17 Mar 2017 04:35:34 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Fri, 17 Mar 2017 19:27:16 +0800 Message-Id: <1489750043-17260-17-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 16/23] 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 fields of GCMD to enable or disable queued invalidations. This patch emulates QIE fields of GCMD. Signed-off-by: Chao Gao Signed-off-by: Lan Tianyu --- xen/arch/x86/hvm/vvtd.c | 18 ++++++++++++++++++ xen/drivers/passthrough/vtd/iommu.h | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vvtd.c b/xen/arch/x86/hvm/vvtd.c index 0c49294..ba4d585 100644 --- a/xen/arch/x86/hvm/vvtd.c +++ b/xen/arch/x86/hvm/vvtd.c @@ -100,6 +100,11 @@ static inline void __vvtd_set_bit(struct vvtd *vvtd, uint32_t reg, int nr) return __set_bit(nr, (uint32_t *)&vvtd->regs->data[reg]); } +static inline void __vvtd_clear_bit(struct vvtd *vvtd, uint32_t reg, int nr) +{ + return __clear_bit(nr, (uint32_t *)&vvtd->regs->data[reg]); +} + static inline void vvtd_set_reg(struct vvtd *vtd, uint32_t reg, uint32_t value) { @@ -258,6 +263,17 @@ static int vvtd_log_fault(struct vvtd *vvtd, struct irq_remapping_request *irq, return 0; } +static int vvtd_handle_gcmd_qie(struct vvtd *vvtd, unsigned long val) +{ + VVTD_DEBUG(VVTD_DBG_RW, "Enable Queue Invalidation."); + + if ( val & DMA_GCMD_QIE ) + __vvtd_set_bit(vvtd, DMAR_GSTS_REG, DMA_GSTS_QIES_BIT); + else + __vvtd_clear_bit(vvtd, DMAR_GSTS_REG, DMA_GSTS_QIES_BIT); + return X86EMUL_OKAY; +} + static int vvtd_handle_gcmd_sirtp(struct vvtd *vvtd, unsigned long val) { uint64_t irta; @@ -289,6 +305,8 @@ static int vvtd_write_gcmd(struct vvtd *vvtd, unsigned long val) if ( changed & DMA_GCMD_SIRTP ) vvtd_handle_gcmd_sirtp(vvtd, val); + if ( changed & DMA_GCMD_QIE ) + vvtd_handle_gcmd_qie(vvtd, val); return X86EMUL_OKAY; } diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index aa1f1a6..dd38c39 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -193,7 +193,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_BIT 26 +#define DMA_GSTS_QIES (((u64)1) << DMA_GSTS_QIES_BIT) #define DMA_GSTS_IRES (((u64)1) <<25) #define DMA_GSTS_SIRTPS_BIT 24 #define DMA_GSTS_SIRTPS (((u64)1) << DMA_GSTS_SIRTPS_BIT)