Hi,
this patch fixes a FIXME: hyperprivop numbers are now defined only in
arch-ia64.h.
Tested by boot+halt of dom0+domU.
Tristan.
# HG changeset patch
# User [EMAIL PROTECTED]
# Node ID 1dffa15ab582ceecdf419587ab0cfcbd9dee2410
# Parent adb151aaf3f800e9a34b19aa94a93513a0a59e9f
Move hyperprivop definitions into arch-ia64.h
Signed-off-by: Tristan Gingold <[EMAIL PROTECTED]>
diff -r adb151aaf3f8 -r 1dffa15ab582 linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h Thu Apr 27 02:55:42 2006
+++ b/linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h Fri May 5 07:05:32 2006
@@ -11,33 +11,34 @@
#include <asm/xen/asm-xsi-offsets.h>
+#include <xen/interface/arch-ia64.h>
#define IA64_PARAVIRTUALIZED
#ifdef __ASSEMBLY__
-#define XEN_HYPER_RFI break 0x1
-#define XEN_HYPER_RSM_PSR_DT break 0x2
-#define XEN_HYPER_SSM_PSR_DT break 0x3
-#define XEN_HYPER_COVER break 0x4
-#define XEN_HYPER_ITC_D break 0x5
-#define XEN_HYPER_ITC_I break 0x6
-#define XEN_HYPER_SSM_I break 0x7
-#define XEN_HYPER_GET_IVR break 0x8
-#define XEN_HYPER_GET_TPR break 0x9
-#define XEN_HYPER_SET_TPR break 0xa
-#define XEN_HYPER_EOI break 0xb
-#define XEN_HYPER_SET_ITM break 0xc
-#define XEN_HYPER_THASH break 0xd
-#define XEN_HYPER_PTC_GA break 0xe
-#define XEN_HYPER_ITR_D break 0xf
-#define XEN_HYPER_GET_RR break 0x10
-#define XEN_HYPER_SET_RR break 0x11
-#define XEN_HYPER_SET_KR break 0x12
-#define XEN_HYPER_FC break 0x13
-#define XEN_HYPER_GET_CPUID break 0x14
-#define XEN_HYPER_GET_PMD break 0x15
-#define XEN_HYPER_GET_EFLAG break 0x16
-#define XEN_HYPER_SET_EFLAG break 0x17
+#define XEN_HYPER_RFI break HYPERPRIVOP_RFI
+#define XEN_HYPER_RSM_PSR_DT break HYPERPRIVOP_RSM_DT
+#define XEN_HYPER_SSM_PSR_DT break HYPERPRIVOP_SSM_DT
+#define XEN_HYPER_COVER break HYPERPRIVOP_COVER
+#define XEN_HYPER_ITC_D break HYPERPRIVOP_ITC_D
+#define XEN_HYPER_ITC_I break HYPERPRIVOP_ITC_I
+#define XEN_HYPER_SSM_I break HYPERPRIVOP_SSM_I
+#define XEN_HYPER_GET_IVR break HYPERPRIVOP_GET_IVR
+#define XEN_HYPER_GET_TPR break HYPERPRIVOP_GET_TPR
+#define XEN_HYPER_SET_TPR break HYPERPRIVOP_SET_TPR
+#define XEN_HYPER_EOI break HYPERPRIVOP_EOI
+#define XEN_HYPER_SET_ITM break HYPERPRIVOP_SET_ITM
+#define XEN_HYPER_THASH break HYPERPRIVOP_THASH
+#define XEN_HYPER_PTC_GA break HYPERPRIVOP_PTC_GA
+#define XEN_HYPER_ITR_D break HYPERPRIVOP_ITR_D
+#define XEN_HYPER_GET_RR break HYPERPRIVOP_GET_RR
+#define XEN_HYPER_SET_RR break HYPERPRIVOP_SET_RR
+#define XEN_HYPER_SET_KR break HYPERPRIVOP_SET_KR
+#define XEN_HYPER_FC break HYPERPRIVOP_FC
+#define XEN_HYPER_GET_CPUID break HYPERPRIVOP_GET_CPUID
+#define XEN_HYPER_GET_PMD break HYPERPRIVOP_GET_PMD
+#define XEN_HYPER_GET_EFLAG break HYPERPRIVOP_GET_EFLAG
+#define XEN_HYPER_SET_EFLAG break HYPERPRIVOP_SET_EFLAG
#endif
#ifndef __ASSEMBLY__
@@ -48,8 +49,8 @@
extern int running_on_xen;
#endif
-#define XEN_HYPER_SSM_I asm("break 0x7");
-#define XEN_HYPER_GET_IVR asm("break 0x8");
+#define XEN_HYPER_SSM_I asm("break %0" : : "i" (HYPERPRIVOP_SSM_I))
+#define XEN_HYPER_GET_IVR asm("break %0" : : "i" (HYPERPRIVOP_GET_IVR))
/************************************************/
/* Instructions paravirtualized for correctness */
diff -r adb151aaf3f8 -r 1dffa15ab582 xen/arch/ia64/xen/hyperprivop.S
--- a/xen/arch/ia64/xen/hyperprivop.S Thu Apr 27 02:55:42 2006
+++ b/xen/arch/ia64/xen/hyperprivop.S Fri May 5 07:05:32 2006
@@ -46,25 +46,6 @@
#undef RFI_TO_INTERRUPT // not working yet
#endif
-#define XEN_HYPER_RFI 0x1
-#define XEN_HYPER_RSM_DT 0x2
-#define XEN_HYPER_SSM_DT 0x3
-#define XEN_HYPER_COVER 0x4
-#define XEN_HYPER_ITC_D 0x5
-#define XEN_HYPER_ITC_I 0x6
-#define XEN_HYPER_SSM_I 0x7
-#define XEN_HYPER_GET_IVR 0x8
-#define XEN_HYPER_GET_TPR 0x9
-#define XEN_HYPER_SET_TPR 0xa
-#define XEN_HYPER_EOI 0xb
-#define XEN_HYPER_SET_ITM 0xc
-#define XEN_HYPER_THASH 0xd
-#define XEN_HYPER_PTC_GA 0xe
-#define XEN_HYPER_ITR_D 0xf
-#define XEN_HYPER_GET_RR 0x10
-#define XEN_HYPER_SET_RR 0x11
-#define XEN_HYPER_SET_KR 0x12
-
#ifdef CONFIG_SMP
#warning "FIXME: ptc.ga instruction requires spinlock for SMP"
#undef FAST_PTC_GA
@@ -106,7 +87,7 @@
#endif
// HYPERPRIVOP_SSM_I?
// assumes domain interrupts pending, so just do it
- cmp.eq p7,p6=XEN_HYPER_SSM_I,r17
+ cmp.eq p7,p6=HYPERPRIVOP_SSM_I,r17
(p7) br.sptk.many hyper_ssm_i;;
// FIXME. This algorithm gives up (goes to the slow path) if there
@@ -127,70 +108,70 @@
1: // when we get to here r20=~=interrupts pending
// HYPERPRIVOP_RFI?
- cmp.eq p7,p6=XEN_HYPER_RFI,r17
+ cmp.eq p7,p6=HYPERPRIVOP_RFI,r17
(p7) br.sptk.many hyper_rfi;;
// HYPERPRIVOP_GET_IVR?
- cmp.eq p7,p6=XEN_HYPER_GET_IVR,r17
+ cmp.eq p7,p6=HYPERPRIVOP_GET_IVR,r17
(p7) br.sptk.many hyper_get_ivr;;
cmp.ne p7,p0=r20,r0
(p7) br.spnt.many dispatch_break_fault ;;
// HYPERPRIVOP_COVER?
- cmp.eq p7,p6=XEN_HYPER_COVER,r17
+ cmp.eq p7,p6=HYPERPRIVOP_COVER,r17
(p7) br.sptk.many hyper_cover;;
// HYPERPRIVOP_SSM_DT?
- cmp.eq p7,p6=XEN_HYPER_SSM_DT,r17
+ cmp.eq p7,p6=HYPERPRIVOP_SSM_DT,r17
(p7) br.sptk.many hyper_ssm_dt;;
// HYPERPRIVOP_RSM_DT?
- cmp.eq p7,p6=XEN_HYPER_RSM_DT,r17
+ cmp.eq p7,p6=HYPERPRIVOP_RSM_DT,r17
(p7) br.sptk.many hyper_rsm_dt;;
// HYPERPRIVOP_GET_TPR?
- cmp.eq p7,p6=XEN_HYPER_GET_TPR,r17
+ cmp.eq p7,p6=HYPERPRIVOP_GET_TPR,r17
(p7) br.sptk.many hyper_get_tpr;;
// HYPERPRIVOP_SET_TPR?
- cmp.eq p7,p6=XEN_HYPER_SET_TPR,r17
+ cmp.eq p7,p6=HYPERPRIVOP_SET_TPR,r17
(p7) br.sptk.many hyper_set_tpr;;
// HYPERPRIVOP_EOI?
- cmp.eq p7,p6=XEN_HYPER_EOI,r17
+ cmp.eq p7,p6=HYPERPRIVOP_EOI,r17
(p7) br.sptk.many hyper_eoi;;
// HYPERPRIVOP_SET_ITM?
- cmp.eq p7,p6=XEN_HYPER_SET_ITM,r17
+ cmp.eq p7,p6=HYPERPRIVOP_SET_ITM,r17
(p7) br.sptk.many hyper_set_itm;;
// HYPERPRIVOP_SET_RR?
- cmp.eq p7,p6=XEN_HYPER_SET_RR,r17
+ cmp.eq p7,p6=HYPERPRIVOP_SET_RR,r17
(p7) br.sptk.many hyper_set_rr;;
// HYPERPRIVOP_GET_RR?
- cmp.eq p7,p6=XEN_HYPER_GET_RR,r17
+ cmp.eq p7,p6=HYPERPRIVOP_GET_RR,r17
(p7) br.sptk.many hyper_get_rr;;
// HYPERPRIVOP_PTC_GA?
- cmp.eq p7,p6=XEN_HYPER_PTC_GA,r17
+ cmp.eq p7,p6=HYPERPRIVOP_PTC_GA,r17
(p7) br.sptk.many hyper_ptc_ga;;
// HYPERPRIVOP_ITC_D?
- cmp.eq p7,p6=XEN_HYPER_ITC_D,r17
+ cmp.eq p7,p6=HYPERPRIVOP_ITC_D,r17
(p7) br.sptk.many hyper_itc_d;;
// HYPERPRIVOP_ITC_I?
- cmp.eq p7,p6=XEN_HYPER_ITC_I,r17
+ cmp.eq p7,p6=HYPERPRIVOP_ITC_I,r17
(p7) br.sptk.many hyper_itc_i;;
// HYPERPRIVOP_THASH?
- cmp.eq p7,p6=XEN_HYPER_THASH,r17
+ cmp.eq p7,p6=HYPERPRIVOP_THASH,r17
(p7) br.sptk.many hyper_thash;;
// HYPERPRIVOP_SET_KR?
- cmp.eq p7,p6=XEN_HYPER_SET_KR,r17
+ cmp.eq p7,p6=HYPERPRIVOP_SET_KR,r17
(p7) br.sptk.many hyper_set_kr;;
// if not one of the above, give up for now and do it the slow way
@@ -250,7 +231,7 @@
cmp.ne p7,p0=r21,r0
(p7) br.sptk.many dispatch_break_fault ;;
#ifdef FAST_HYPERPRIVOP_CNT
- movl r20=fast_hyperpriv_cnt+(8*XEN_HYPER_SSM_I);;
+ movl r20=fast_hyperpriv_cnt+(8*HYPERPRIVOP_SSM_I);;
ld8 r21=[r20];;
adds r21=1,r21;;
st8 [r20]=r21;;
@@ -1065,7 +1046,7 @@
1: // OK now, let's do an rfi.
#ifdef FAST_HYPERPRIVOP_CNT
- movl r20=fast_hyperpriv_cnt+(8*XEN_HYPER_RFI);;
+ movl r20=fast_hyperpriv_cnt+(8*HYPERPRIVOP_RFI);;
ld8 r23=[r20];;
adds r23=1,r23;;
st8 [r20]=r23;;
@@ -1317,7 +1298,7 @@
ENTRY(hyper_cover)
#ifdef FAST_HYPERPRIVOP_CNT
- movl r20=fast_hyperpriv_cnt+(8*XEN_HYPER_COVER);;
+ movl r20=fast_hyperpriv_cnt+(8*HYPERPRIVOP_COVER);;
ld8 r21=[r20];;
adds r21=1,r21;;
st8 [r20]=r21;;
@@ -1352,7 +1333,7 @@
// return from metaphysical mode (meta=1) to virtual mode (meta=0)
ENTRY(hyper_ssm_dt)
#ifdef FAST_HYPERPRIVOP_CNT
- movl r20=fast_hyperpriv_cnt+(8*XEN_HYPER_SSM_DT);;
+ movl r20=fast_hyperpriv_cnt+(8*HYPERPRIVOP_SSM_DT);;
ld8 r21=[r20];;
adds r21=1,r21;;
st8 [r20]=r21;;
@@ -1388,7 +1369,7 @@
// go to metaphysical mode (meta=1) from virtual mode (meta=0)
ENTRY(hyper_rsm_dt)
#ifdef FAST_HYPERPRIVOP_CNT
- movl r20=fast_hyperpriv_cnt+(8*XEN_HYPER_RSM_DT);;
+ movl r20=fast_hyperpriv_cnt+(8*HYPERPRIVOP_RSM_DT);;
ld8 r21=[r20];;
adds r21=1,r21;;
st8 [r20]=r21;;
@@ -1424,7 +1405,7 @@
ENTRY(hyper_get_tpr)
#ifdef FAST_HYPERPRIVOP_CNT
- movl r20=fast_hyperpriv_cnt+(8*XEN_HYPER_GET_TPR);;
+ movl r20=fast_hyperpriv_cnt+(8*HYPERPRIVOP_GET_TPR);;
ld8 r21=[r20];;
adds r21=1,r21;;
st8 [r20]=r21;;
@@ -1453,7 +1434,7 @@
// (or accidentally missing) delivering an interrupt
ENTRY(hyper_set_tpr)
#ifdef FAST_HYPERPRIVOP_CNT
- movl r20=fast_hyperpriv_cnt+(8*XEN_HYPER_SET_TPR);;
+ movl r20=fast_hyperpriv_cnt+(8*HYPERPRIVOP_SET_TPR);;
ld8 r21=[r20];;
adds r21=1,r21;;
st8 [r20]=r21;;
@@ -1481,7 +1462,7 @@
ENTRY(hyper_get_ivr)
#ifdef FAST_HYPERPRIVOP_CNT
- movl r22=fast_hyperpriv_cnt+(8*XEN_HYPER_GET_IVR);;
+ movl r22=fast_hyperpriv_cnt+(8*HYPERPRIVOP_GET_IVR);;
ld8 r21=[r22];;
adds r21=1,r21;;
st8 [r22]=r21;;
@@ -1593,7 +1574,7 @@
cmp.ne p7,p0=r20,r0
(p7) br.spnt.many dispatch_break_fault ;;
#ifdef FAST_HYPERPRIVOP_CNT
- movl r20=fast_hyperpriv_cnt+(8*XEN_HYPER_EOI);;
+ movl r20=fast_hyperpriv_cnt+(8*HYPERPRIVOP_EOI);;
ld8 r21=[r20];;
adds r21=1,r21;;
st8 [r20]=r21;;
@@ -1657,7 +1638,7 @@
cmp.ne p7,p0=r20,r0
(p7) br.spnt.many dispatch_break_fault ;;
#ifdef FAST_HYPERPRIVOP_CNT
- movl r20=fast_hyperpriv_cnt+(8*XEN_HYPER_SET_ITM);;
+ movl r20=fast_hyperpriv_cnt+(8*HYPERPRIVOP_SET_ITM);;
ld8 r21=[r20];;
adds r21=1,r21;;
st8 [r20]=r21;;
@@ -1698,7 +1679,7 @@
ENTRY(hyper_get_rr)
#ifdef FAST_HYPERPRIVOP_CNT
- movl r20=fast_hyperpriv_cnt+(8*XEN_HYPER_GET_RR);;
+ movl r20=fast_hyperpriv_cnt+(8*HYPERPRIVOP_GET_RR);;
ld8 r21=[r20];;
adds r21=1,r21;;
st8 [r20]=r21;;
@@ -1730,7 +1711,7 @@
cmp.leu p7,p0=7,r25 // punt on setting rr7
(p7) br.spnt.many dispatch_break_fault ;;
#ifdef FAST_HYPERPRIVOP_CNT
- movl r20=fast_hyperpriv_cnt+(8*XEN_HYPER_SET_RR);;
+ movl r20=fast_hyperpriv_cnt+(8*HYPERPRIVOP_SET_RR);;
ld8 r21=[r20];;
adds r21=1,r21;;
st8 [r20]=r21;;
@@ -1788,7 +1769,7 @@
cmp.ne p7,p0=r0,r25 // if kr# > 7, go slow way
(p7) br.spnt.many dispatch_break_fault ;;
#ifdef FAST_HYPERPRIVOP_CNT
- movl r20=fast_hyperpriv_cnt+(8*XEN_HYPER_SET_KR);;
+ movl r20=fast_hyperpriv_cnt+(8*HYPERPRIVOP_SET_KR);;
ld8 r21=[r20];;
adds r21=1,r21;;
st8 [r20]=r21;;
@@ -1846,7 +1827,7 @@
// r31 == pr
GLOBAL_ENTRY(hyper_thash)
#ifdef FAST_HYPERPRIVOP_CNT
- movl r20=fast_hyperpriv_cnt+(8*XEN_HYPER_THASH);;
+ movl r20=fast_hyperpriv_cnt+(8*HYPERPRIVOP_THASH);;
ld8 r21=[r20];;
adds r21=1,r21;;
st8 [r20]=r21;;
@@ -1915,7 +1896,7 @@
#endif
// FIXME: validate not flushing Xen addresses
#ifdef FAST_HYPERPRIVOP_CNT
- movl r20=fast_hyperpriv_cnt+(8*XEN_HYPER_PTC_GA);;
+ movl r20=fast_hyperpriv_cnt+(8*HYPERPRIVOP_PTC_GA);;
ld8 r21=[r20];;
adds r21=1,r21;;
st8 [r20]=r21;;
@@ -1994,7 +1975,7 @@
br.sptk.many dispatch_break_fault;;
// Registers at entry
-// r17 = break immediate (XEN_HYPER_ITC_D or I)
+// r17 = break immediate (HYPERPRIVOP_ITC_D or I)
// r18 == XSI_PSR_IC_OFS
// r31 == pr
GLOBAL_ENTRY(hyper_itc)
@@ -2027,9 +2008,9 @@
cmp.ne p7,p0=r27,r28
(p7) br.spnt.many dispatch_break_fault ;;
#ifdef FAST_HYPERPRIVOP_CNT
- cmp.eq p6,p7=XEN_HYPER_ITC_D,r17;;
-(p6) movl r20=fast_hyperpriv_cnt+(8*XEN_HYPER_ITC_D);;
-(p7) movl r20=fast_hyperpriv_cnt+(8*XEN_HYPER_ITC_I);;
+ cmp.eq p6,p7=HYPERPRIVOP_ITC_D,r17;;
+(p6) movl r20=fast_hyperpriv_cnt+(8*HYPERPRIVOP_ITC_D);;
+(p7) movl r20=fast_hyperpriv_cnt+(8*HYPERPRIVOP_ITC_I);;
ld8 r21=[r20];;
adds r21=1,r21;;
st8 [r20]=r21;;
diff -r adb151aaf3f8 -r 1dffa15ab582 xen/arch/ia64/xen/privop.c
--- a/xen/arch/ia64/xen/privop.c Thu Apr 27 02:55:42 2006
+++ b/xen/arch/ia64/xen/privop.c Fri May 5 07:05:32 2006
@@ -793,33 +793,6 @@
printf("priv_emulate: priv_handle_op fails, isr=0x%lx\n",isr);
return fault;
}
-
-
-// FIXME: Move these to include/public/arch-ia64?
-#define HYPERPRIVOP_RFI 0x1
-#define HYPERPRIVOP_RSM_DT 0x2
-#define HYPERPRIVOP_SSM_DT 0x3
-#define HYPERPRIVOP_COVER 0x4
-#define HYPERPRIVOP_ITC_D 0x5
-#define HYPERPRIVOP_ITC_I 0x6
-#define HYPERPRIVOP_SSM_I 0x7
-#define HYPERPRIVOP_GET_IVR 0x8
-#define HYPERPRIVOP_GET_TPR 0x9
-#define HYPERPRIVOP_SET_TPR 0xa
-#define HYPERPRIVOP_EOI 0xb
-#define HYPERPRIVOP_SET_ITM 0xc
-#define HYPERPRIVOP_THASH 0xd
-#define HYPERPRIVOP_PTC_GA 0xe
-#define HYPERPRIVOP_ITR_D 0xf
-#define HYPERPRIVOP_GET_RR 0x10
-#define HYPERPRIVOP_SET_RR 0x11
-#define HYPERPRIVOP_SET_KR 0x12
-#define HYPERPRIVOP_FC 0x13
-#define HYPERPRIVOP_GET_CPUID 0x14
-#define HYPERPRIVOP_GET_PMD 0x15
-#define HYPERPRIVOP_GET_EFLAG 0x16
-#define HYPERPRIVOP_SET_EFLAG 0x17
-#define HYPERPRIVOP_MAX 0x17
static const char * const hyperpriv_str[HYPERPRIVOP_MAX+1] = {
0, "rfi", "rsm.dt", "ssm.dt", "cover", "itc.d", "itc.i", "ssm.i",
diff -r adb151aaf3f8 -r 1dffa15ab582 xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h Thu Apr 27 02:55:42 2006
+++ b/xen/include/public/arch-ia64.h Fri May 5 07:05:32 2006
@@ -363,6 +363,32 @@
#endif /* !__ASSEMBLY__ */
+/* Hyperprivops. */
+#define HYPERPRIVOP_RFI 0x1
+#define HYPERPRIVOP_RSM_DT 0x2
+#define HYPERPRIVOP_SSM_DT 0x3
+#define HYPERPRIVOP_COVER 0x4
+#define HYPERPRIVOP_ITC_D 0x5
+#define HYPERPRIVOP_ITC_I 0x6
+#define HYPERPRIVOP_SSM_I 0x7
+#define HYPERPRIVOP_GET_IVR 0x8
+#define HYPERPRIVOP_GET_TPR 0x9
+#define HYPERPRIVOP_SET_TPR 0xa
+#define HYPERPRIVOP_EOI 0xb
+#define HYPERPRIVOP_SET_ITM 0xc
+#define HYPERPRIVOP_THASH 0xd
+#define HYPERPRIVOP_PTC_GA 0xe
+#define HYPERPRIVOP_ITR_D 0xf
+#define HYPERPRIVOP_GET_RR 0x10
+#define HYPERPRIVOP_SET_RR 0x11
+#define HYPERPRIVOP_SET_KR 0x12
+#define HYPERPRIVOP_FC 0x13
+#define HYPERPRIVOP_GET_CPUID 0x14
+#define HYPERPRIVOP_GET_PMD 0x15
+#define HYPERPRIVOP_GET_EFLAG 0x16
+#define HYPERPRIVOP_SET_EFLAG 0x17
+#define HYPERPRIVOP_MAX 0x17
+
#endif /* __HYPERVISOR_IF_IA64_H__ */
/*
_______________________________________________
Xen-ia64-devel mailing list
[email protected]
http://lists.xensource.com/xen-ia64-devel
