From owner-svn-src-projects@FreeBSD.ORG  Thu Apr 12 00:59:31 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4B2EE106564A;
	Thu, 12 Apr 2012 00:59:31 +0000 (UTC)
	(envelope-from cherry@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 365528FC0A;
	Thu, 12 Apr 2012 00:59:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3C0xVJa003461;
	Thu, 12 Apr 2012 00:59:31 GMT (envelope-from cherry@svn.freebsd.org)
Received: (from cherry@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3C0xVcd003457;
	Thu, 12 Apr 2012 00:59:31 GMT (envelope-from cherry@svn.freebsd.org)
Message-Id: <201204120059.q3C0xVcd003457@svn.freebsd.org>
From: "Cherry G. Mathew" <cherry@FreeBSD.org>
Date: Thu, 12 Apr 2012 00:59:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234162 - in projects/amd64_xen_pv/sys/amd64: include
	xen
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2012 00:59:31 -0000

Author: cherry
Date: Thu Apr 12 00:59:30 2012
New Revision: 234162
URL: http://svn.freebsd.org/changeset/base/234162

Log:
  PV kernels cannot use the cli/sti privileged opcodes to
  mask/unmask interrupts (known as "events" in xenspeak).
  
  We mask/unmask interrupts by notifying the hypervisor via the
  shared_info page.
  
  Approved by:	gibbs (implicit)

Modified:
  projects/amd64_xen_pv/sys/amd64/include/cpufunc.h
  projects/amd64_xen_pv/sys/amd64/xen/machdep.c

Modified: projects/amd64_xen_pv/sys/amd64/include/cpufunc.h
==============================================================================
--- projects/amd64_xen_pv/sys/amd64/include/cpufunc.h	Thu Apr 12 00:45:43 2012	(r234161)
+++ projects/amd64_xen_pv/sys/amd64/include/cpufunc.h	Thu Apr 12 00:59:30 2012	(r234162)
@@ -44,6 +44,8 @@
 #endif
 
 #ifdef XEN
+extern void xen_cli(void);
+extern void xen_sti(void);
 extern void xen_load_cr3(u_int data);
 extern void xen_tlb_flush(void);
 extern void xen_invlpg(vm_offset_t addr);
@@ -138,7 +140,11 @@ cpuid_count(u_int ax, u_int cx, u_int *p
 static __inline void
 enable_intr(void)
 {
+#ifdef XEN
+	xen_sti();
+#else
 	__asm __volatile("sti");
+#endif
 }
 
 #ifdef _KERNEL

Modified: projects/amd64_xen_pv/sys/amd64/xen/machdep.c
==============================================================================
--- projects/amd64_xen_pv/sys/amd64/xen/machdep.c	Thu Apr 12 00:45:43 2012	(r234161)
+++ projects/amd64_xen_pv/sys/amd64/xen/machdep.c	Thu Apr 12 00:59:30 2012	(r234162)
@@ -988,6 +988,20 @@ read_rflags(void)
 	return (rflags);
 }
 
+void
+xen_cli(void)
+{
+	CTR1(KTR_SPARE2, "%x xen_cli disabling interrupts", rrbp());
+	__cli();
+}
+
+void
+xen_sti(void)
+{
+	CTR1(KTR_SPARE2, "%x xen_sti enabling interrupts", rrbp());
+	__sti();
+}
+
 char *console_page;
 #include <machine/tss.h>
 struct amd64tss common_tss[MAXCPU];