Commit 3a450ae4 authored by Tony Luck's avatar Tony Luck Committed by David Mosberger

[PATCH] ia64: clean up MCA TLB error recovery code

While backporting to 2.4 I noticed a few bits
of fluff that I'd introduced into 2.6.  Clean
up the mess.
parent f0c8e2a3
...@@ -1363,8 +1363,8 @@ ia64_init_handler (struct pt_regs *pt, struct switch_stack *sw) ...@@ -1363,8 +1363,8 @@ ia64_init_handler (struct pt_regs *pt, struct switch_stack *sw)
void void
ia64_log_prt_guid (efi_guid_t *p_guid, prfunc_t prfunc) ia64_log_prt_guid (efi_guid_t *p_guid, prfunc_t prfunc)
{ {
//char out[40]; char out[40];
//printk(KERN_DEBUG "GUID = %s\n", efi_guid_unparse(p_guid, out)); printk(KERN_DEBUG "GUID = %s\n", efi_guid_unparse(p_guid, out));
} }
static void static void
......
...@@ -114,9 +114,7 @@ ...@@ -114,9 +114,7 @@
ia64_os_mca_dispatch: ia64_os_mca_dispatch:
// Serialize all MCA processing // Serialize all MCA processing
// movl r2=ia64_mca_serialize
mov r3=1;; mov r3=1;;
// DATA_VA_TO_PA(r2);;
LOAD_PHYSICAL(p0,r2,ia64_mca_serialize);; LOAD_PHYSICAL(p0,r2,ia64_mca_serialize);;
ia64_os_mca_spin: ia64_os_mca_spin:
xchg8 r4=[r2],r3;; xchg8 r4=[r2],r3;;
...@@ -138,7 +136,6 @@ begin_os_mca_dump: ...@@ -138,7 +136,6 @@ begin_os_mca_dump:
ia64_os_mca_done_dump: ia64_os_mca_done_dump:
// movl r16=__pa(ia64_sal_to_os_handoff_state)+56
LOAD_PHYSICAL(p0,r16,ia64_sal_to_os_handoff_state+56) LOAD_PHYSICAL(p0,r16,ia64_sal_to_os_handoff_state+56)
;; ;;
ld8 r18=[r16] // Get processor state parameter on existing PALE_CHECK. ld8 r18=[r16] // Get processor state parameter on existing PALE_CHECK.
...@@ -150,7 +147,6 @@ ia64_os_mca_done_dump: ...@@ -150,7 +147,6 @@ ia64_os_mca_done_dump:
// Purge percpu data TC entries. // Purge percpu data TC entries.
begin_tlb_purge_and_reload: begin_tlb_purge_and_reload:
mov r16=cr.lid mov r16=cr.lid
// movl r17=__pa(ia64_mca_tlb_list) // Physical address of ia64_mca_tlb_list
LOAD_PHYSICAL(p0,r17,ia64_mca_tlb_list) // Physical address of ia64_mca_tlb_list LOAD_PHYSICAL(p0,r17,ia64_mca_tlb_list) // Physical address of ia64_mca_tlb_list
mov r19=0 mov r19=0
mov r20=NR_CPUS mov r20=NR_CPUS
...@@ -168,8 +164,6 @@ begin_tlb_purge_and_reload: ...@@ -168,8 +164,6 @@ begin_tlb_purge_and_reload:
mov r23=r17 // save current ia64_mca_percpu_info addr pointer. mov r23=r17 // save current ia64_mca_percpu_info addr pointer.
adds r17=16,r17 adds r17=16,r17
;; ;;
.global aegl
aegl:
ld8 r18=[r17],8 // r18=ptce_base ld8 r18=[r17],8 // r18=ptce_base
;; ;;
ld4 r19=[r17],4 // r19=ptce_count[0] ld4 r19=[r17],4 // r19=ptce_count[0]
...@@ -393,8 +387,6 @@ ia64_os_mca_dispatch_end: ...@@ -393,8 +387,6 @@ ia64_os_mca_dispatch_end:
ia64_os_mca_proc_state_dump: ia64_os_mca_proc_state_dump:
// Save bank 1 GRs 16-31 which will be used by c-language code when we switch // Save bank 1 GRs 16-31 which will be used by c-language code when we switch
// to virtual addressing mode. // to virtual addressing mode.
// movl r2=ia64_mca_proc_state_dump;; // Os state dump area
// DATA_VA_TO_PA(r2) // convert to to physical address
LOAD_PHYSICAL(p0,r2,ia64_mca_proc_state_dump)// convert OS state dump area to physical address LOAD_PHYSICAL(p0,r2,ia64_mca_proc_state_dump)// convert OS state dump area to physical address
// save ar.NaT // save ar.NaT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment