# HG changeset patch
# User dietmar.hahn@xxxxxxxxxxxxxxxxxxx
# Node ID 51a42f8c2b4848e731895ed5ad42e5512ec8cd86
# Parent  a5e457ce35b118081ca879153bdef780de67513a
Added new declarations for protection keys and the define
XEN_IA64_NPKRS representing number of pkr's for PV domains.

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

diff -r a5e457ce35b1 -r 51a42f8c2b48 xen/arch/ia64/xen/fw_emul.c
--- a/xen/arch/ia64/xen/fw_emul.c	Fri Jul 27 07:17:08 2007 +0200
+++ b/xen/arch/ia64/xen/fw_emul.c	Fri Jul 27 07:45:05 2007 +0200
@@ -669,7 +669,7 @@ xen_pal_emulator(unsigned long index, u6
 				 { .vw = 1,
 				   .phys_add_size = 44,
 				   .key_size = 16,
-				   .max_pkr = 15,
+				   .max_pkr = XEN_IA64_NPKRS,
 				   .hash_tag_id = 0x30,
 				   .max_dtr_entry = NDTRS - 1,
 				   .max_itr_entry = NITRS - 1,
diff -r a5e457ce35b1 -r 51a42f8c2b48 xen/include/asm-ia64/xenkregs.h
--- a/xen/include/asm-ia64/xenkregs.h	Fri Jul 27 07:17:08 2007 +0200
+++ b/xen/include/asm-ia64/xenkregs.h	Fri Jul 27 07:45:05 2007 +0200
@@ -38,13 +38,29 @@
 /* Some cr.itir declarations. */
 #define	IA64_ITIR_PS		2
 #define	IA64_ITIR_PS_LEN	6
-#define IA64_ITIR_PS_MASK	(((__IA64_UL(1) << IA64_ITIR_PS_LEN) - 1) \
-							<< IA64_ITIR_PS)
+#define	IA64_ITIR_PS_MASK	(((__IA64_UL(1) << IA64_ITIR_PS_LEN) - 1) \
+ 							<< IA64_ITIR_PS)
 #define	IA64_ITIR_KEY		8
 #define	IA64_ITIR_KEY_LEN	24
-#define	IA64_ITIR_KEY_MASK	(((__IA64_UL(1) << IA64_ITIR_KEY_LEN) - 1) \
-							<< IA64_ITIR_KEY)
-#define IA64_ITIR_PS_KEY(_ps, _key)	(((_ps) << IA64_ITIR_PS) | \
-					(((_key) << IA64_ITIR_KEY)))
+#define	IA64_ITIR_KEY_MASK	(((__IA64_UL(1)<<IA64_ITIR_KEY_LEN)-1) \
+							<<IA64_ITIR_KEY)
+#define	IA64_ITIR_PS_KEY(_ps, _key)	(((_ps)<<IA64_ITIR_PS)|(((_key) \
+							<<IA64_ITIR_KEY)))
+
+/* Define Protection Key Register (PKR) */
+#define	IA64_PKR_V		0
+#define	IA64_PKR_WD		1
+#define	IA64_PKR_RD		2
+#define	IA64_PKR_XD		3
+#define	IA64_PKR_MBZ0		4
+#define	IA64_PKR_KEY		8
+#define	IA64_PKR_KEY_LEN	24
+#define	IA64_PKR_MBZ1		32
+
+#define	IA64_PKR_VALID		(1 << IA64_PKR_V)
+#define	IA64_PKR_KEY_MASK	(((__IA64_UL(1)<<IA64_PKR_KEY_LEN)-1) \
+								<<IA64_PKR_KEY)
+
+#define	XEN_IA64_NPKRS		15	/* Number of pkr's in PV */
 
 #endif /* _ASM_IA64_XENKREGS_H */
diff -r a5e457ce35b1 -r 51a42f8c2b48 xen/include/asm-ia64/xenprocessor.h
--- a/xen/include/asm-ia64/xenprocessor.h	Fri Jul 27 07:17:08 2007 +0200
+++ b/xen/include/asm-ia64/xenprocessor.h	Fri Jul 27 07:45:05 2007 +0200
@@ -237,6 +237,19 @@ typedef union {
     u64 itir;
 } ia64_itir_t;
 
+typedef union {
+	u64 val;
+	struct {
+		u64 v  : 1;
+		u64 wd : 1;
+		u64 rd : 1;
+		u64 xd : 1;
+		u64 reserved1 : 4;
+		u64 key : 24;
+		u64 reserved2 : 32;
+	};
+} ia64_pkr_t;
+
 #define dump_execution_state() printk("FIXME: implement ia64 dump_execution_state()\n");
 
 #endif // _ASM_IA64_XENPROCESSOR_H