# HG changeset patch
# User awilliam@xxxxxxxxxxxx
# Date 1168973323 25200
# Node ID 1d72428a0fab5b8a3256c88968fd9253e7b30180
# Parent 24ce556e30498c3de229517aded4aefd4ac7c1d7
[IA64] Remove dorfirfi completely
Signed-off-by: Anthony Xu <anthony.xu@xxxxxxxxx>
---
xen/arch/ia64/xen/faults.c | 5 -----
xen/arch/ia64/xen/hyperprivop.S | 33 ++++++++++++++++++++++-----------
xen/arch/ia64/xen/vcpu.c | 28 ++++++----------------------
xen/arch/ia64/xen/xenasm.S | 22 ----------------------
xen/include/asm-ia64/vcpu.h | 2 --
5 files changed, 28 insertions(+), 62 deletions(-)
diff -r 24ce556e3049 -r 1d72428a0fab xen/arch/ia64/xen/faults.c
--- a/xen/arch/ia64/xen/faults.c Tue Jan 16 11:22:44 2007 -0700
+++ b/xen/arch/ia64/xen/faults.c Tue Jan 16 11:48:43 2007 -0700
@@ -136,11 +136,6 @@ void reflect_event(void)
regs = vcpu_regs(v);
- // can't inject event, when XEN is emulating rfi
- // and both PSCB(v, ifs) and regs->ifs are valid
- if (regs->cr_iip == *(unsigned long *)dorfirfi)
- return;
-
isr = regs->cr_ipsr & IA64_PSR_RI;
if (!PSCB(v, interrupt_collection_enabled))
diff -r 24ce556e3049 -r 1d72428a0fab xen/arch/ia64/xen/hyperprivop.S
--- a/xen/arch/ia64/xen/hyperprivop.S Tue Jan 16 11:22:44 2007 -0700
+++ b/xen/arch/ia64/xen/hyperprivop.S Tue Jan 16 11:48:43 2007 -0700
@@ -81,9 +81,6 @@
// r19 == vpsr.ic
// r31 == pr
GLOBAL_ENTRY(fast_hyperprivop)
-#ifndef FAST_HYPERPRIVOPS // see beginning of file
- br.sptk.many dispatch_break_fault ;;
-#endif
// HYPERPRIVOP_SSM_I?
// assumes domain interrupts pending, so just do it
cmp.eq p7,p6=HYPERPRIVOP_SSM_I,r17
@@ -102,7 +99,9 @@ GLOBAL_ENTRY(fast_hyperprivop)
cmp.eq p7,p6=HYPERPRIVOP_RFI,r17
(p7) br.sptk.many hyper_rfi
;;
-
+#ifndef FAST_HYPERPRIVOPS // see beginning of file
+ br.sptk.many dispatch_break_fault ;;
+#endif
// if event enabled and there are pending events
cmp.ne p7,p0=r20,r0
;;
@@ -1010,10 +1009,22 @@ 1: extr.u r25=r17,61,3;;
#endif
END(fast_tlb_miss_reflect)
+ENTRY(slow_vcpu_rfi)
+ adds r22=XSI_IFS_OFS-XSI_PSR_IC_OFS,r18;;
+ ld8 r22=[r22];;
+ tbit.z p6,p0=r22,63
+(p6) br.spnt.few dispatch_break_fault ;;
+ // if vips is valid, discard current register frame
+ // don't need dorfirfi any more
+ alloc r22=ar.pfs,0,0,0,0
+ br.spnt.few dispatch_break_fault
+ ;;
+END(slow_vcpu_rfi)
+
// ensure that, if giving up, registers at entry to fast_hyperprivop unchanged
ENTRY(hyper_rfi)
#ifndef FAST_RFI
- br.spnt.few dispatch_break_fault ;;
+ br.spnt.few slow_vcpu_rfi ;;
#endif
// if no interrupts pending, proceed
mov r30=r0
@@ -1027,7 +1038,7 @@ ENTRY(hyper_rfi)
// r30 determines whether we might deliver an immediate extint
#ifndef RFI_TO_INTERRUPT // see beginning of file
cmp.ne p6,p0=r30,r0
-(p6) br.cond.spnt.few dispatch_break_fault ;;
+(p6) br.cond.spnt.few slow_vcpu_rfi ;;
#endif
1:
adds r20=XSI_IPSR_OFS-XSI_PSR_IC_OFS,r18 ;;
@@ -1035,25 +1046,25 @@ 1:
extr.u r22=r21,IA64_PSR_BE_BIT,1 ;;
// if turning on psr.be, give up for now and do it the slow way
cmp.ne p7,p0=r22,r0
-(p7) br.spnt.few dispatch_break_fault ;;
+(p7) br.spnt.few slow_vcpu_rfi ;;
// if (!(vpsr.dt && vpsr.rt && vpsr.it)), do it the slow way
movl r20=(IA64_PSR_DT|IA64_PSR_RT|IA64_PSR_IT);;
and r22=r20,r21
;;
cmp.ne p7,p0=r22,r20
-(p7) br.spnt.few dispatch_break_fault ;;
+(p7) br.spnt.few slow_vcpu_rfi ;;
// if was in metaphys mode, do it the slow way (FIXME later?)
adds r20=XSI_METAPHYS_OFS-XSI_PSR_IC_OFS,r18 ;;
ld4 r20=[r20];;
cmp.ne p7,p0=r20,r0
-(p7) br.spnt.few dispatch_break_fault ;;
+(p7) br.spnt.few slow_vcpu_rfi ;;
// if domain hasn't already done virtual bank switch
// do it the slow way (FIXME later?)
#if 0
adds r20=XSI_BANKNUM_OFS-XSI_PSR_IC_OFS,r18 ;;
ld4 r20=[r20];;
cmp.eq p7,p0=r20,r0
-(p7) br.spnt.few dispatch_break_fault ;;
+(p7) br.spnt.few slow_vcpu_rfi ;;
#endif
// validate vcr.iip, if in Xen range, do it the slow way
adds r20=XSI_IIP_OFS-XSI_PSR_IC_OFS,r18 ;;
@@ -1062,7 +1073,7 @@ 1:
movl r24=HYPERVISOR_VIRT_END;;
cmp.ltu p0,p7=r22,r23 ;; // if !(iip<low) &&
(p7) cmp.geu p0,p7=r22,r24 ;; // !(iip>=high)
-(p7) br.spnt.few dispatch_break_fault ;;
+(p7) br.spnt.few slow_vcpu_rfi ;;
1: // OK now, let's do an rfi.
#ifdef FAST_HYPERPRIVOP_CNT
diff -r 24ce556e3049 -r 1d72428a0fab xen/arch/ia64/xen/vcpu.c
--- a/xen/arch/ia64/xen/vcpu.c Tue Jan 16 11:22:44 2007 -0700
+++ b/xen/arch/ia64/xen/vcpu.c Tue Jan 16 11:48:43 2007 -0700
@@ -1336,8 +1336,7 @@ IA64FAULT vcpu_rfi(VCPU * vcpu)
{
// TODO: Only allowed for current vcpu
PSR psr;
- u64 int_enable, regspsr = 0;
- u64 ifs;
+ u64 int_enable, ifs;
REGS *regs = vcpu_regs(vcpu);
psr.i64 = PSCB(vcpu, ipsr);
@@ -1363,26 +1362,11 @@ IA64FAULT vcpu_rfi(VCPU * vcpu)
}
ifs = PSCB(vcpu, ifs);
- if (ifs > 0x8000000000000000UL) {
- if (regs->cr_ifs > 0x8000000000000000UL) {
- // TODO: validate PSCB(vcpu,iip)
- // TODO: PSCB(vcpu,ipsr) = psr;
- PSCB(vcpu, ipsr) = psr.i64;
- // now set up the trampoline
- regs->cr_iip = *(unsigned long *)dorfirfi; // func ptr!
- __asm__ __volatile("mov %0=psr;;":"=r"(regspsr)
- ::"memory");
- regs->cr_ipsr = regspsr & ~(IA64_PSR_I | IA64_PSR_IC |
- IA64_PSR_BN);
- } else {
- regs->cr_ifs = ifs;
- regs->cr_ipsr = psr.i64;
- regs->cr_iip = PSCB(vcpu, iip);
- }
- } else {
- regs->cr_ipsr = psr.i64;
- regs->cr_iip = PSCB(vcpu, iip);
- }
+ if (ifs & 0x8000000000000000UL)
+ regs->cr_ifs = ifs;
+
+ regs->cr_ipsr = psr.i64;
+ regs->cr_iip = PSCB(vcpu, iip);
PSCB(vcpu, interrupt_collection_enabled) = 1;
vcpu_bsw1(vcpu);
vcpu->vcpu_info->evtchn_upcall_mask = !int_enable;
diff -r 24ce556e3049 -r 1d72428a0fab xen/arch/ia64/xen/xenasm.S
--- a/xen/arch/ia64/xen/xenasm.S Tue Jan 16 11:22:44 2007 -0700
+++ b/xen/arch/ia64/xen/xenasm.S Tue Jan 16 11:48:43 2007 -0700
@@ -256,28 +256,6 @@ GLOBAL_ENTRY(__get_domain_bundle)
;;
END(__get_domain_bundle)
-GLOBAL_ENTRY(dorfirfi)
- // Read current vcpu shared info
- movl r16=THIS_CPU(current_psr_ic_addr)
- ;;
- ld8 r19 = [r16]
- ;;
- add r16 = XSI_IIP_OFS - XSI_PSR_IC_OFS, r19
- add r17 = XSI_IPSR_OFS - XSI_PSR_IC_OFS, r19
- add r18 = XSI_IFS_OFS - XSI_PSR_IC_OFS, r19
- ;;
- ld8 r16 = [r16]
- ld8 r17 = [r17]
- ld8 r18 = [r18]
- ;;
- mov cr.iip=r16
- mov cr.ipsr=r17
- mov cr.ifs=r18
- ;;
- rfi
- ;;
-END(dorfirfi)
-
/* derived from linux/arch/ia64/hp/sim/boot/boot_head.S */
GLOBAL_ENTRY(pal_emulator_static)
mov r8=-1
diff -r 24ce556e3049 -r 1d72428a0fab xen/include/asm-ia64/vcpu.h
--- a/xen/include/asm-ia64/vcpu.h Tue Jan 16 11:22:44 2007 -0700
+++ b/xen/include/asm-ia64/vcpu.h Tue Jan 16 11:48:43 2007 -0700
@@ -22,8 +22,6 @@ extern u64 cycle_to_ns(u64 cycle);
#define PSCBX(_v,_x) (_v->arch._x)
#define SPURIOUS_VECTOR 0xf
-
-extern void dorfirfi(void);
/* general registers */
extern u64 vcpu_get_gr(VCPU * vcpu, unsigned long reg);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home