From owner-svn-src-all@FreeBSD.ORG  Fri Jun  5 08:23:34 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7BBAC2CD;
 Fri,  5 Jun 2015 08:23:34 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 68B5416E2;
 Fri,  5 Jun 2015 08:23:34 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t558NYJa057232;
 Fri, 5 Jun 2015 08:23:34 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t558NYMA057231;
 Fri, 5 Jun 2015 08:23:34 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201506050823.t558NYMA057231@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Fri, 5 Jun 2015 08:23:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r284019 - stable/10/sys/x86/iommu
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jun 2015 08:23:34 -0000

Author: kib
Date: Fri Jun  5 08:23:33 2015
New Revision: 284019
URL: https://svnweb.freebsd.org/changeset/base/284019

Log:
  MFC r283692:
  Explicitely enable queued invalidation completion interrupt.

Modified:
  stable/10/sys/x86/iommu/intel_qi.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/x86/iommu/intel_qi.c
==============================================================================
--- stable/10/sys/x86/iommu/intel_qi.c	Fri Jun  5 08:10:08 2015	(r284018)
+++ stable/10/sys/x86/iommu/intel_qi.c	Fri Jun  5 08:23:33 2015	(r284019)
@@ -356,6 +356,7 @@ dmar_init_qi(struct dmar_unit *unit)
 		ics = DMAR_ICS_IWC;
 		dmar_write4(unit, DMAR_ICS_REG, ics);
 	}
+	dmar_enable_qi_intr(unit);
 	DMAR_UNLOCK(unit);
 
 	return (0);
@@ -379,6 +380,7 @@ dmar_fini_qi(struct dmar_unit *unit)
 	dmar_qi_advance_tail(unit);
 	dmar_qi_wait_for_seq(unit, &gseq);
 	/* only after the quisce, disable queue */
+	dmar_disable_qi_intr(unit);
 	dmar_disable_qi(unit);
 	KASSERT(unit->inv_seq_waiters == 0,
 	    ("dmar%d: waiters on disabled queue", unit->unit));