# HG changeset patch
# User dietmar.hahn@xxxxxxxxxxxxxxxxxxx
# Node ID 87ff9310ce082454ae91d4939b888180d7b5b04b
# Parent  3df04f34c4aa7679bf30a7fe6b46d8ccc0a004da

Added the usage of the new hypervisor call HYPERVISOR_opt_feature().

Signed-off-by: Dietmar Hahn <dietmar.hahn@xxxxxxxxxxxxxxxxxxx>

diff -r 3df04f34c4aa -r 87ff9310ce08 arch/ia64/xen/xcom_hcall.c
--- a/arch/ia64/xen/xcom_hcall.c	Mon Jun 18 13:59:27 2007 -0600
+++ b/arch/ia64/xen/xcom_hcall.c	Thu Jun 28 14:30:52 2007 +0200
@@ -397,6 +397,13 @@ xencomm_hypercall_vcpu_op(int cmd, int c
 					      xencomm_create_inline(arg));
 }
 
+long
+xencomm_hypercall_opt_feature(unsigned long cmd, void *arg)
+{
+	return xencomm_arch_hypercall_opt_feature(cmd,
+					      xencomm_create_inline(arg));
+}
+
 int
 xencomm_hypercall_fpswa_revision(unsigned int *revision)
 {
diff -r 3df04f34c4aa -r 87ff9310ce08 drivers/xen/core/features.c
--- a/drivers/xen/core/features.c	Mon Jun 18 13:59:27 2007 -0600
+++ b/drivers/xen/core/features.c	Thu Jun 28 14:30:52 2007 +0200
@@ -8,12 +8,14 @@
 #include <linux/types.h>
 #include <linux/cache.h>
 #include <linux/module.h>
+#include <asm/pgtable.h>
 #include <asm/hypervisor.h>
 #include <xen/features.h>
 
 #ifdef HAVE_XEN_PLATFORM_COMPAT_H
 #include <xen/platform-compat.h>
 #endif
+
 
 u8 xen_features[XENFEAT_NR_SUBMAPS * 32] __read_mostly;
 /* Not a GPL symbol: used in ubiquitous macros, so too restrictive. */
@@ -31,4 +33,11 @@ void setup_xen_features(void)
 		for (j=0; j<32; j++)
 			xen_features[i*32+j] = !!(fi.submap & 1<<j);
 	}
+
+	struct xen_ia64_opt_feature optf;
+	optf.cmd = IA64_OPT_FEATURE_IDENTITY_MAPPING;
+	optf.on = IA64_OPT_FEATURE_ON;
+	optf.pgprot = pgprot_val(PAGE_KERNEL);
+	optf.key = 0;	/* No key on linux. */
+	HYPERVISOR_opt_feature(IA64_OPT_FEATURE_IDENTITY_MAPPING,&optf);
 }
diff -r 3df04f34c4aa -r 87ff9310ce08 include/asm-ia64/hypercall.h
--- a/include/asm-ia64/hypercall.h	Mon Jun 18 13:59:27 2007 -0600
+++ b/include/asm-ia64/hypercall.h	Thu Jun 28 14:30:52 2007 +0200
@@ -227,6 +227,12 @@ xencomm_arch_hypercall_xenoprof_op(int o
 xencomm_arch_hypercall_xenoprof_op(int op, struct xencomm_handle *arg)
 {
 	return _hypercall2(int, xenoprof_op, op, arg);
+}
+
+static inline long
+xencomm_arch_hypercall_opt_feature(unsigned long op, struct xencomm_handle *arg)
+{
+	return _hypercall2(long, opt_feature, op, arg);
 }
 
 extern fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs);
@@ -430,6 +436,7 @@ HYPERVISOR_add_io_space(unsigned long ph
 
 #define HYPERVISOR_suspend xencomm_hypercall_suspend
 #define HYPERVISOR_vcpu_op xencomm_hypercall_vcpu_op
+#define HYPERVISOR_opt_feature xencomm_hypercall_opt_feature
 
 /* to compile gnttab_copy_grant_page() in drivers/xen/core/gnttab.c */
 #define HYPERVISOR_mmu_update(req, count, success_count, domid) ({BUG();0;})
diff -r 3df04f34c4aa -r 87ff9310ce08 include/asm-ia64/xen/xcom_hcall.h
--- a/include/asm-ia64/xen/xcom_hcall.h	Mon Jun 18 13:59:27 2007 -0600
+++ b/include/asm-ia64/xen/xcom_hcall.h	Thu Jun 28 14:30:52 2007 +0200
@@ -53,6 +53,8 @@ extern int xencomm_hypercall_perfmon_op(
 
 extern long xencomm_hypercall_vcpu_op(int cmd, int cpu, void *arg);
 
+extern long xencomm_hypercall_opt_feature(unsigned long, void *arg);
+
 /* Using mini xencomm.  */
 extern int xencomm_mini_hypercall_console_io(int cmd, int count, char *str);
 
diff -r 3df04f34c4aa -r 87ff9310ce08 include/xen/interface/arch-ia64.h
--- a/include/xen/interface/arch-ia64.h	Mon Jun 18 13:59:27 2007 -0600
+++ b/include/xen/interface/arch-ia64.h	Thu Jun 28 14:30:52 2007 +0200
@@ -622,6 +622,39 @@ struct xen_ia64_boot_param {
 #define XENCOMM_INLINE_ADDR(addr) \
   ((unsigned long)(addr) & ~XENCOMM_INLINE_MASK)
 
+#ifndef __ASSEMBLY__
+
+/* Optimization features.
+ * The hypervisor may do some special optimizations for guests. This hypercall
+ * can be used to switch on/of these special optimizations.
+ */
+#define __HYPERVISOR_opt_feature	0x700UL
+
+#define IA64_OPT_FEATURE_OFF		0x0
+#define IA64_OPT_FEATURE_ON		0x1
+
+/* If this feature is switched on, the hypervisor does inserting the
+ * tlb entries without calling the guests traphandler.
+ * This is usable in guests using region 7 for identity mapping like
+ * the linux kernel does.
+ */
+#define IA64_OPT_FEATURE_IDENTITY_MAPPING	0x1UL
+
+struct xen_ia64_opt_feature {
+	unsigned long cmd;		/* Which feature */
+	unsigned char on;		/* Feature on/off */
+	union {
+		struct {
+				/* The page protection bit mask of the pte.
+			 	 * This will be or'ed with the pte. */
+			unsigned long pgprot;
+			unsigned long key;	/* A protection key for itir. */
+		};
+	};
+};
+
+#endif /* __ASSEMBLY__ */
+
 /* xen perfmon */
 #ifdef XEN
 #ifndef __ASSEMBLY__