Index: xen-unstable.hg/xen/arch/ia64/xen/regionreg.c =================================================================== --- xen-unstable.hg.orig/xen/arch/ia64/xen/regionreg.c 2007-12-19 12:27:26.000000000 +0900 +++ xen-unstable.hg/xen/arch/ia64/xen/regionreg.c 2007-12-19 12:27:28.000000000 +0900 @@ -267,6 +267,12 @@ int set_one_rr(unsigned long rr, unsigne if (!PSCB(v,metaphysical_mode)) set_rr(rr,newrrv.rrval); } else if (rreg == 7) { + unsigned long a, b; + a = ia64_get_rr(7UL << 61); + b = vmMangleRID(newrrv.rrval); + if (a != b) + printk("%s: cpu=%d rr7=0x%016lx->0x%016lx\n", + __func__, smp_processor_id(), a, b); ia64_new_rr7(vmMangleRID(newrrv.rrval),v->domain->shared_info, v->arch.privregs, v->domain->arch.shared_info_va, __va_ul(vcpu_vhpt_maddr(v))); Index: xen-unstable.hg/xen/include/asm-ia64/linux-xen/linux/efi.h =================================================================== --- xen-unstable.hg.orig/xen/include/asm-ia64/linux-xen/linux/efi.h 2007-12-19 12:26:32.000000000 +0900 +++ xen-unstable.hg/xen/include/asm-ia64/linux-xen/linux/efi.h 2007-12-19 12:27:28.000000000 +0900 @@ -484,18 +484,28 @@ struct efi_generic_dev_path { * This can be trivially changed by updating the definition of XEN_EFI_RID. */ -#define XEN_EFI_RR_SAVE(rr6, rr7) do { \ +#define XEN_EFI_RR_SAVE_quiet(rr6, rr7) do { \ rr6 = ia64_get_rr(6UL << 61); \ rr7 = ia64_get_rr(7UL << 61); \ - ia64_set_rr(6UL << 61, XEN_EFI_RID); \ + set_one_rr_lite(6UL << 61, XEN_EFI_RID); \ + set_one_rr_lite(7UL << 61, XEN_EFI_RID); \ ia64_srlz_d(); \ } while (0) -#define XEN_EFI_RR_RESTORE(rr6, rr7) do { \ - ia64_set_rr(6UL << 61, rr6); \ +#define XEN_EFI_RR_SAVE(rr6, rr7) do { \ + XEN_EFI_RR_SAVE_quiet(rr6, rr7); \ +} while (0) + +#define XEN_EFI_RR_RESTORE_quiet(rr6, rr7) do { \ + set_one_rr_lite(6UL << 61, rr6); \ + set_one_rr_lite(7UL << 61, rr7); \ ia64_srlz_d(); \ } while (0) +#define XEN_EFI_RR_RESTORE(rr6, rr7) do { \ + XEN_EFI_RR_RESTORE_quiet(rr6, rr7); \ +} while (0) + #else /* Just use rr6 and rr7 in a dummy fashion here to get * rid of compiler warnings - a better solution should Index: xen-unstable.hg/xen/include/asm-ia64/linux-xen/asm/pal.h =================================================================== --- xen-unstable.hg.orig/xen/include/asm-ia64/linux-xen/asm/pal.h 2007-12-19 12:26:32.000000000 +0900 +++ xen-unstable.hg/xen/include/asm-ia64/linux-xen/asm/pal.h 2007-12-19 12:27:28.000000000 +0900 @@ -773,6 +773,16 @@ extern struct ia64_pal_retval ia64_pal_c extern void ia64_save_scratch_fpregs (struct ia64_fpreg *); extern void ia64_load_scratch_fpregs (struct ia64_fpreg *); +#define PAL_CALL_quiet(iprv,a0,a1,a2,a3) do { \ + struct ia64_fpreg fr[6]; \ + XEN_EFI_RR_DECLARE(rr6, rr7); \ + ia64_save_scratch_fpregs(fr); \ + XEN_EFI_RR_SAVE_quiet(rr6, rr7); \ + iprv = ia64_pal_call_static(a0, a1, a2, a3, 0); \ + XEN_EFI_RR_RESTORE_quiet(rr6, rr7); \ + ia64_load_scratch_fpregs(fr); \ +} while (0) + #define PAL_CALL(iprv,a0,a1,a2,a3) do { \ struct ia64_fpreg fr[6]; \ XEN_EFI_RR_DECLARE(rr6, rr7); \ @@ -787,9 +797,9 @@ extern void ia64_load_scratch_fpregs (st struct ia64_fpreg fr[6]; \ XEN_EFI_RR_DECLARE(rr6, rr7); \ ia64_save_scratch_fpregs(fr); \ - XEN_EFI_RR_SAVE(rr6, rr7); \ + XEN_EFI_RR_SAVE_quiet(rr6, rr7); \ iprv = ia64_pal_call_static(a0, a1, a2, a3, 1); \ - XEN_EFI_RR_RESTORE(rr6, rr7); \ + XEN_EFI_RR_RESTORE_quiet(rr6, rr7); \ ia64_load_scratch_fpregs(fr); \ } while (0) @@ -797,9 +807,9 @@ extern void ia64_load_scratch_fpregs (st struct ia64_fpreg fr[6]; \ XEN_EFI_RR_DECLARE(rr6, rr7); \ ia64_save_scratch_fpregs(fr); \ - XEN_EFI_RR_SAVE(rr6, rr7); \ + XEN_EFI_RR_SAVE_quiet(rr6, rr7); \ iprv = ia64_pal_call_stacked(a0, a1, a2, a3); \ - XEN_EFI_RR_RESTORE(rr6, rr7); \ + XEN_EFI_RR_RESTORE_quiet(rr6, rr7); \ ia64_load_scratch_fpregs(fr); \ } while (0) @@ -817,9 +827,9 @@ extern void ia64_load_scratch_fpregs (st struct ia64_fpreg fr[6]; \ XEN_EFI_RR_DECLARE(rr6, rr7); \ ia64_save_scratch_fpregs(fr); \ - XEN_EFI_RR_SAVE(rr6, rr7); \ + XEN_EFI_RR_SAVE_quiet(rr6, rr7); \ iprv = ia64_pal_call_phys_stacked(a0, a1, a2, a3); \ - XEN_EFI_RR_RESTORE(rr6, rr7); \ + XEN_EFI_RR_RESTORE_quiet(rr6, rr7); \ ia64_load_scratch_fpregs(fr); \ } while (0) @@ -906,6 +916,9 @@ ia64_pal_cache_config_info (u64 cache_le { struct ia64_pal_retval iprv; + /* Making this quiet causes rx2620 to hang while booting the first + * kernel + */ PAL_CALL(iprv, PAL_CACHE_INFO, cache_level, cache_type, 0); if (iprv.status == 0) { @@ -924,7 +937,7 @@ ia64_pal_cache_prot_info (u64 cache_leve { struct ia64_pal_retval iprv; - PAL_CALL(iprv, PAL_CACHE_PROT_INFO, cache_level, cache_type, 0); + PAL_CALL_quiet(iprv, PAL_CACHE_PROT_INFO, cache_level, cache_type, 0); if (iprv.status == 0) { prot->pcpi_status = iprv.status; @@ -947,7 +960,7 @@ ia64_pal_cache_flush (u64 cache_type, u6 { struct ia64_pal_retval iprv; #ifdef XEN /* fix a bug in Linux... PAL has changed */ - PAL_CALL(iprv, PAL_CACHE_FLUSH, cache_type, invalidate, *progress); + PAL_CALL_quiet(iprv, PAL_CACHE_FLUSH, cache_type, invalidate, *progress); #else PAL_CALL_IC_OFF(iprv, PAL_CACHE_FLUSH, cache_type, invalidate, *progress); #endif @@ -963,7 +976,7 @@ static inline s64 ia64_pal_cache_init (u64 level, u64 cache_type, u64 rest) { struct ia64_pal_retval iprv; - PAL_CALL(iprv, PAL_CACHE_INIT, level, cache_type, rest); + PAL_CALL_quiet(iprv, PAL_CACHE_INIT, level, cache_type, rest); return iprv.status; } @@ -975,7 +988,7 @@ static inline s64 ia64_pal_cache_line_init (u64 physical_addr, u64 data_value) { struct ia64_pal_retval iprv; - PAL_CALL(iprv, PAL_CACHE_LINE_INIT, physical_addr, data_value, 0); + PAL_CALL_quiet(iprv, PAL_CACHE_LINE_INIT, physical_addr, data_value, 0); return iprv.status; } @@ -985,6 +998,9 @@ static inline s64 ia64_pal_cache_read (pal_cache_line_id_u_t line_id, u64 physical_addr) { struct ia64_pal_retval iprv; + /* If this is quiet then rx2620 hangs when booting the second + * kernel + */ PAL_CALL(iprv, PAL_CACHE_READ, line_id.pclid_data, physical_addr, 0); return iprv.status; } @@ -994,6 +1010,9 @@ static inline s64 ia64_pal_cache_summary (u64 *cache_levels, u64 *unique_caches) { struct ia64_pal_retval iprv; + /* If this is quiet then rx2620 hangs when booting the second + * kernel + */ PAL_CALL(iprv, PAL_CACHE_SUMMARY, 0, 0, 0); if (cache_levels) *cache_levels = iprv.v0; @@ -1007,7 +1026,7 @@ static inline s64 ia64_pal_cache_write (pal_cache_line_id_u_t line_id, u64 physical_addr, u64 data) { struct ia64_pal_retval iprv; - PAL_CALL(iprv, PAL_CACHE_WRITE, line_id.pclid_data, physical_addr, data); + PAL_CALL_quiet(iprv, PAL_CACHE_WRITE, line_id.pclid_data, physical_addr, data); return iprv.status; } @@ -1018,7 +1037,7 @@ ia64_pal_copy_info (u64 copy_type, u64 n u64 *buffer_size, u64 *buffer_align) { struct ia64_pal_retval iprv; - PAL_CALL(iprv, PAL_COPY_INFO, copy_type, num_procs, num_iopics); + PAL_CALL_quiet(iprv, PAL_COPY_INFO, copy_type, num_procs, num_iopics); if (buffer_size) *buffer_size = iprv.v0; if (buffer_align) @@ -1031,7 +1050,7 @@ static inline s64 ia64_pal_copy_pal (u64 target_addr, u64 alloc_size, u64 processor, u64 *pal_proc_offset) { struct ia64_pal_retval iprv; - PAL_CALL(iprv, PAL_COPY_PAL, target_addr, alloc_size, processor); + PAL_CALL_quiet(iprv, PAL_COPY_PAL, target_addr, alloc_size, processor); if (pal_proc_offset) *pal_proc_offset = iprv.v0; return iprv.status; @@ -1042,7 +1061,7 @@ static inline s64 ia64_pal_debug_info (u64 *inst_regs, u64 *data_regs) { struct ia64_pal_retval iprv; - PAL_CALL(iprv, PAL_DEBUG_INFO, 0, 0, 0); + PAL_CALL_quiet(iprv, PAL_DEBUG_INFO, 0, 0, 0); if (inst_regs) *inst_regs = iprv.v0; if (data_regs) @@ -1057,7 +1076,7 @@ static inline s64 ia64_pal_enter_ia32_env (ia32_env1, ia32_env2, ia32_env3) { struct ia64_pal_retval iprv; - PAL_CALL(iprv, PAL_ENTER_IA_32_ENV, ia32_env1, ia32_env2, ia32_env3); + PAL_CALL_quiet(iprv, PAL_ENTER_IA_32_ENV, ia32_env1, ia32_env2, ia32_env3); return iprv.status; } #endif @@ -1067,7 +1086,7 @@ static inline s64 ia64_pal_fixed_addr (u64 *global_unique_addr) { struct ia64_pal_retval iprv; - PAL_CALL(iprv, PAL_FIXED_ADDR, 0, 0, 0); + PAL_CALL_quiet(iprv, PAL_FIXED_ADDR, 0, 0, 0); if (global_unique_addr) *global_unique_addr = iprv.v0; return iprv.status; @@ -1078,7 +1097,7 @@ static inline s64 ia64_pal_freq_base (u64 *platform_base_freq) { struct ia64_pal_retval iprv; - PAL_CALL(iprv, PAL_FREQ_BASE, 0, 0, 0); + PAL_CALL_quiet(iprv, PAL_FREQ_BASE, 0, 0, 0); if (platform_base_freq) *platform_base_freq = iprv.v0; return iprv.status; @@ -1093,6 +1112,7 @@ ia64_pal_freq_ratios (struct pal_freq_ra struct pal_freq_ratio *itc_ratio) { struct ia64_pal_retval iprv; + /* If this is quiet then the second kernel panics on tiger2 */ PAL_CALL(iprv, PAL_FREQ_RATIOS, 0, 0, 0); if (proc_ratio) *(u64 *)proc_ratio = iprv.v0; @@ -1111,7 +1131,7 @@ static inline s64 ia64_pal_halt (u64 halt_state) { struct ia64_pal_retval iprv; - PAL_CALL(iprv, PAL_HALT, halt_state, 0, 0); + PAL_CALL_quiet(iprv, PAL_HALT, halt_state, 0, 0); return iprv.status; } @@ -1143,7 +1163,7 @@ static inline s64 ia64_pal_halt_light (void) { struct ia64_pal_retval iprv; - PAL_CALL(iprv, PAL_HALT_LIGHT, 0, 0, 0); + PAL_CALL_quiet(iprv, PAL_HALT_LIGHT, 0, 0, 0); return iprv.status; } @@ -1155,7 +1175,7 @@ static inline s64 ia64_pal_mc_clear_log (u64 *pending_vector) { struct ia64_pal_retval iprv; - PAL_CALL(iprv, PAL_MC_CLEAR_LOG, 0, 0, 0); + PAL_CALL_quiet(iprv, PAL_MC_CLEAR_LOG, 0, 0, 0); if (pending_vector) *pending_vector = iprv.v0; return iprv.status; Index: xen-unstable.hg/xen/arch/ia64/linux-xen/efi.c =================================================================== --- xen-unstable.hg.orig/xen/arch/ia64/linux-xen/efi.c 2007-12-19 12:26:32.000000000 +0900 +++ xen-unstable.hg/xen/arch/ia64/linux-xen/efi.c 2007-12-19 12:27:28.000000000 +0900 @@ -58,6 +58,12 @@ static unsigned long mem_limit = ~0UL, m #define efi_call_virt(f, args...) (*(f))(args) +#define virt_XEN_EFI_RR_SAVE XEN_EFI_RR_SAVE_quiet +#define virt_XEN_EFI_RR_RESTORE XEN_EFI_RR_RESTORE_quiet + +#define phys_XEN_EFI_RR_SAVE XEN_EFI_RR_SAVE_quiet +#define phys_XEN_EFI_RR_RESTORE XEN_EFI_RR_RESTORE_quiet + #define STUB_GET_TIME(prefix, adjust_arg) \ static efi_status_t \ prefix##_get_time (efi_time_t *tm, efi_time_cap_t *tc) \ @@ -70,9 +76,9 @@ prefix##_get_time (efi_time_t *tm, efi_t if (tc) \ atc = adjust_arg(tc); \ ia64_save_scratch_fpregs(fr); \ - XEN_EFI_RR_SAVE(rr6, rr7); \ + prefix##_XEN_EFI_RR_SAVE(rr6, rr7); \ ret = efi_call_##prefix((efi_get_time_t *) __va(runtime->get_time), adjust_arg(tm), atc); \ - XEN_EFI_RR_RESTORE(rr6, rr7); \ + prefix##_XEN_EFI_RR_RESTORE(rr6, rr7); \ ia64_load_scratch_fpregs(fr); \ return ret; \ } @@ -86,9 +92,9 @@ prefix##_set_time (efi_time_t *tm) XEN_EFI_RR_DECLARE(rr6, rr7); \ \ ia64_save_scratch_fpregs(fr); \ - XEN_EFI_RR_SAVE(rr6, rr7); \ + prefix##_XEN_EFI_RR_SAVE(rr6, rr7); \ ret = efi_call_##prefix((efi_set_time_t *) __va(runtime->set_time), adjust_arg(tm)); \ - XEN_EFI_RR_RESTORE(rr6, rr7); \ + prefix##_XEN_EFI_RR_RESTORE(rr6, rr7); \ ia64_load_scratch_fpregs(fr); \ return ret; \ } @@ -102,10 +108,10 @@ prefix##_get_wakeup_time (efi_bool_t *en XEN_EFI_RR_DECLARE(rr6, rr7); \ \ ia64_save_scratch_fpregs(fr); \ - XEN_EFI_RR_SAVE(rr6, rr7); \ + prefix##_XEN_EFI_RR_SAVE(rr6, rr7); \ ret = efi_call_##prefix((efi_get_wakeup_time_t *) __va(runtime->get_wakeup_time), \ adjust_arg(enabled), adjust_arg(pending), adjust_arg(tm)); \ - XEN_EFI_RR_RESTORE(rr6, rr7); \ + prefix##_XEN_EFI_RR_RESTORE(rr6, rr7); \ ia64_load_scratch_fpregs(fr); \ return ret; \ } @@ -122,10 +128,10 @@ prefix##_set_wakeup_time (efi_bool_t ena if (tm) \ atm = adjust_arg(tm); \ ia64_save_scratch_fpregs(fr); \ - XEN_EFI_RR_SAVE(rr6, rr7); \ + prefix##_XEN_EFI_RR_SAVE(rr6, rr7); \ ret = efi_call_##prefix((efi_set_wakeup_time_t *) __va(runtime->set_wakeup_time), \ enabled, atm); \ - XEN_EFI_RR_RESTORE(rr6, rr7); \ + prefix##_XEN_EFI_RR_RESTORE(rr6, rr7); \ ia64_load_scratch_fpregs(fr); \ return ret; \ } @@ -143,11 +149,11 @@ prefix##_get_variable (efi_char16_t *nam if (attr) \ aattr = adjust_arg(attr); \ ia64_save_scratch_fpregs(fr); \ - XEN_EFI_RR_SAVE(rr6, rr7); \ + prefix##_XEN_EFI_RR_SAVE(rr6, rr7); \ ret = efi_call_##prefix((efi_get_variable_t *) __va(runtime->get_variable), \ adjust_arg(name), adjust_arg(vendor), aattr, \ adjust_arg(data_size), adjust_arg(data)); \ - XEN_EFI_RR_RESTORE(rr6, rr7); \ + prefix##_XEN_EFI_RR_RESTORE(rr6, rr7); \ ia64_load_scratch_fpregs(fr); \ return ret; \ } @@ -161,10 +167,10 @@ prefix##_get_next_variable (unsigned lon XEN_EFI_RR_DECLARE(rr6, rr7); \ \ ia64_save_scratch_fpregs(fr); \ - XEN_EFI_RR_SAVE(rr6, rr7); \ + prefix##_XEN_EFI_RR_SAVE(rr6, rr7); \ ret = efi_call_##prefix((efi_get_next_variable_t *) __va(runtime->get_next_variable), \ adjust_arg(name_size), adjust_arg(name), adjust_arg(vendor)); \ - XEN_EFI_RR_RESTORE(rr6, rr7); \ + prefix##_XEN_EFI_RR_RESTORE(rr6, rr7); \ ia64_load_scratch_fpregs(fr); \ return ret; \ } @@ -179,11 +185,11 @@ prefix##_set_variable (efi_char16_t *nam XEN_EFI_RR_DECLARE(rr6, rr7); \ \ ia64_save_scratch_fpregs(fr); \ - XEN_EFI_RR_SAVE(rr6, rr7); \ + prefix##_XEN_EFI_RR_SAVE(rr6, rr7); \ ret = efi_call_##prefix((efi_set_variable_t *) __va(runtime->set_variable), \ adjust_arg(name), adjust_arg(vendor), attr, data_size, \ adjust_arg(data)); \ - XEN_EFI_RR_RESTORE(rr6, rr7); \ + prefix##_XEN_EFI_RR_RESTORE(rr6, rr7); \ ia64_load_scratch_fpregs(fr); \ return ret; \ } @@ -197,10 +203,10 @@ prefix##_get_next_high_mono_count (u32 * XEN_EFI_RR_DECLARE(rr6, rr7); \ \ ia64_save_scratch_fpregs(fr); \ - XEN_EFI_RR_SAVE(rr6, rr7); \ + prefix##_XEN_EFI_RR_SAVE(rr6, rr7); \ ret = efi_call_##prefix((efi_get_next_high_mono_count_t *) \ __va(runtime->get_next_high_mono_count), adjust_arg(count)); \ - XEN_EFI_RR_RESTORE(rr6, rr7); \ + prefix##_XEN_EFI_RR_RESTORE(rr6, rr7); \ ia64_load_scratch_fpregs(fr); \ return ret; \ } @@ -218,11 +224,11 @@ prefix##_reset_system (int reset_type, e adata = adjust_arg(data); \ \ ia64_save_scratch_fpregs(fr); \ - XEN_EFI_RR_SAVE(rr6, rr7); \ + prefix##_XEN_EFI_RR_SAVE(rr6, rr7); \ efi_call_##prefix((efi_reset_system_t *) __va(runtime->reset_system), \ reset_type, status, data_size, adata); \ /* should not return, but just in case... */ \ - XEN_EFI_RR_RESTORE(rr6, rr7); \ + prefix##_XEN_EFI_RR_RESTORE(rr6, rr7); \ ia64_load_scratch_fpregs(fr); \ } Index: xen-unstable.hg/xen/include/asm-ia64/linux/asm/sal.h =================================================================== --- xen-unstable.hg.orig/xen/include/asm-ia64/linux/asm/sal.h 2007-12-19 12:26:32.000000000 +0900 +++ xen-unstable.hg/xen/include/asm-ia64/linux/asm/sal.h 2007-12-19 12:27:28.000000000 +0900 @@ -55,9 +55,9 @@ extern spinlock_t sal_lock; XEN_EFI_RR_DECLARE(rr6, rr7); \ ia64_save_scratch_fpregs(__ia64_sc_fr); \ spin_lock_irqsave(&sal_lock, __ia64_sc_flags); \ - XEN_EFI_RR_SAVE(rr6, rr7); \ + XEN_EFI_RR_SAVE_quiet(rr6, rr7); \ __SAL_CALL(result, args); \ - XEN_EFI_RR_RESTORE(rr6, rr7); \ + XEN_EFI_RR_RESTORE_quiet(rr6, rr7); \ spin_unlock_irqrestore(&sal_lock, __ia64_sc_flags); \ ia64_load_scratch_fpregs(__ia64_sc_fr); \ } while (0) @@ -68,9 +68,9 @@ extern spinlock_t sal_lock; XEN_EFI_RR_DECLARE(rr6, rr7); \ ia64_save_scratch_fpregs(__ia64_scn_fr); \ local_irq_save(__ia64_scn_flags); \ - XEN_EFI_RR_SAVE(rr6, rr7); \ + XEN_EFI_RR_SAVE_quiet(rr6, rr7); \ __SAL_CALL(result, args); \ - XEN_EFI_RR_RESTORE(rr6, rr7); \ + XEN_EFI_RR_RESTORE_quiet(rr6, rr7); \ local_irq_restore(__ia64_scn_flags); \ ia64_load_scratch_fpregs(__ia64_scn_fr); \ } while (0) @@ -80,9 +80,9 @@ extern spinlock_t sal_lock; XEN_EFI_RR_DECLARE(rr6, rr7); \ ia64_save_scratch_fpregs(__ia64_scs_fr); \ preempt_disable(); \ - XEN_EFI_RR_SAVE(rr6, rr7); \ + XEN_EFI_RR_SAVE_quiet(rr6, rr7); \ __SAL_CALL(result, args); \ - XEN_EFI_RR_RESTORE(rr6, rr7); \ + XEN_EFI_RR_RESTORE_quiet(rr6, rr7); \ preempt_enable(); \ ia64_load_scratch_fpregs(__ia64_scs_fr); \ } while (0)