diff options
Diffstat (limited to 'arch/alpha/kernel/err_marvel.c')
-rw-r--r-- | arch/alpha/kernel/err_marvel.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/arch/alpha/kernel/err_marvel.c b/arch/alpha/kernel/err_marvel.c index 413bf37eb094..6bfd243efba3 100644 --- a/arch/alpha/kernel/err_marvel.c +++ b/arch/alpha/kernel/err_marvel.c | |||
@@ -129,7 +129,7 @@ marvel_print_po7_crrct_sym(u64 crrct_sym) | |||
129 | 129 | ||
130 | 130 | ||
131 | printk("%s Correctable Error Symptoms:\n" | 131 | printk("%s Correctable Error Symptoms:\n" |
132 | "%s Syndrome: 0x%lx\n", | 132 | "%s Syndrome: 0x%llx\n", |
133 | err_print_prefix, | 133 | err_print_prefix, |
134 | err_print_prefix, EXTRACT(crrct_sym, IO7__PO7_CRRCT_SYM__SYN)); | 134 | err_print_prefix, EXTRACT(crrct_sym, IO7__PO7_CRRCT_SYM__SYN)); |
135 | marvel_print_err_cyc(EXTRACT(crrct_sym, IO7__PO7_CRRCT_SYM__ERR_CYC)); | 135 | marvel_print_err_cyc(EXTRACT(crrct_sym, IO7__PO7_CRRCT_SYM__ERR_CYC)); |
@@ -186,7 +186,7 @@ marvel_print_po7_uncrr_sym(u64 uncrr_sym, u64 valid_mask) | |||
186 | uncrr_sym &= valid_mask; | 186 | uncrr_sym &= valid_mask; |
187 | 187 | ||
188 | if (EXTRACT(valid_mask, IO7__PO7_UNCRR_SYM__SYN)) | 188 | if (EXTRACT(valid_mask, IO7__PO7_UNCRR_SYM__SYN)) |
189 | printk("%s Syndrome: 0x%lx\n", | 189 | printk("%s Syndrome: 0x%llx\n", |
190 | err_print_prefix, | 190 | err_print_prefix, |
191 | EXTRACT(uncrr_sym, IO7__PO7_UNCRR_SYM__SYN)); | 191 | EXTRACT(uncrr_sym, IO7__PO7_UNCRR_SYM__SYN)); |
192 | 192 | ||
@@ -307,7 +307,7 @@ marvel_print_po7_ugbge_sym(u64 ugbge_sym) | |||
307 | sprintf(opcode_str, "BlkIO"); | 307 | sprintf(opcode_str, "BlkIO"); |
308 | break; | 308 | break; |
309 | default: | 309 | default: |
310 | sprintf(opcode_str, "0x%lx\n", | 310 | sprintf(opcode_str, "0x%llx\n", |
311 | EXTRACT(ugbge_sym, IO7__PO7_UGBGE_SYM__UPH_OPCODE)); | 311 | EXTRACT(ugbge_sym, IO7__PO7_UGBGE_SYM__UPH_OPCODE)); |
312 | break; | 312 | break; |
313 | } | 313 | } |
@@ -321,7 +321,7 @@ marvel_print_po7_ugbge_sym(u64 ugbge_sym) | |||
321 | opcode_str); | 321 | opcode_str); |
322 | 322 | ||
323 | if (0xC5 != EXTRACT(ugbge_sym, IO7__PO7_UGBGE_SYM__UPH_OPCODE)) | 323 | if (0xC5 != EXTRACT(ugbge_sym, IO7__PO7_UGBGE_SYM__UPH_OPCODE)) |
324 | printk("%s Packet Offset 0x%08lx\n", | 324 | printk("%s Packet Offset 0x%08llx\n", |
325 | err_print_prefix, | 325 | err_print_prefix, |
326 | EXTRACT(ugbge_sym, IO7__PO7_UGBGE_SYM__UPH_PKT_OFF)); | 326 | EXTRACT(ugbge_sym, IO7__PO7_UGBGE_SYM__UPH_PKT_OFF)); |
327 | } | 327 | } |
@@ -480,8 +480,8 @@ marvel_print_po7_err_sum(struct ev7_pal_io_subpacket *io) | |||
480 | printk("%s Lost Error\n", err_print_prefix); | 480 | printk("%s Lost Error\n", err_print_prefix); |
481 | 481 | ||
482 | printk("%s Failing Packet:\n" | 482 | printk("%s Failing Packet:\n" |
483 | "%s Cycle 1: %016lx\n" | 483 | "%s Cycle 1: %016llx\n" |
484 | "%s Cycle 2: %016lx\n", | 484 | "%s Cycle 2: %016llx\n", |
485 | err_print_prefix, | 485 | err_print_prefix, |
486 | err_print_prefix, io->po7_err_pkt0, | 486 | err_print_prefix, io->po7_err_pkt0, |
487 | err_print_prefix, io->po7_err_pkt1); | 487 | err_print_prefix, io->po7_err_pkt1); |
@@ -515,9 +515,9 @@ marvel_print_pox_tlb_err(u64 tlb_err) | |||
515 | if (!(tlb_err & IO7__POX_TLBERR__ERR_VALID)) | 515 | if (!(tlb_err & IO7__POX_TLBERR__ERR_VALID)) |
516 | return; | 516 | return; |
517 | 517 | ||
518 | printk("%s TLB Error on index 0x%lx:\n" | 518 | printk("%s TLB Error on index 0x%llx:\n" |
519 | "%s - %s\n" | 519 | "%s - %s\n" |
520 | "%s - Addr: 0x%016lx\n", | 520 | "%s - Addr: 0x%016llx\n", |
521 | err_print_prefix, | 521 | err_print_prefix, |
522 | EXTRACT(tlb_err, IO7__POX_TLBERR__ERR_TLB_PTR), | 522 | EXTRACT(tlb_err, IO7__POX_TLBERR__ERR_TLB_PTR), |
523 | err_print_prefix, | 523 | err_print_prefix, |
@@ -579,7 +579,7 @@ marvel_print_pox_spl_cmplt(u64 spl_cmplt) | |||
579 | sprintf(message, "Uncorrectable Split Write Data Error"); | 579 | sprintf(message, "Uncorrectable Split Write Data Error"); |
580 | break; | 580 | break; |
581 | default: | 581 | default: |
582 | sprintf(message, "%08lx\n", | 582 | sprintf(message, "%08llx\n", |
583 | EXTRACT(spl_cmplt, IO7__POX_SPLCMPLT__MESSAGE)); | 583 | EXTRACT(spl_cmplt, IO7__POX_SPLCMPLT__MESSAGE)); |
584 | break; | 584 | break; |
585 | } | 585 | } |
@@ -620,9 +620,9 @@ marvel_print_pox_trans_sum(u64 trans_sum) | |||
620 | return; | 620 | return; |
621 | 621 | ||
622 | printk("%s Transaction Summary:\n" | 622 | printk("%s Transaction Summary:\n" |
623 | "%s Command: 0x%lx - %s\n" | 623 | "%s Command: 0x%llx - %s\n" |
624 | "%s Address: 0x%016lx%s\n" | 624 | "%s Address: 0x%016llx%s\n" |
625 | "%s PCI-X Master Slot: 0x%lx\n", | 625 | "%s PCI-X Master Slot: 0x%llx\n", |
626 | err_print_prefix, | 626 | err_print_prefix, |
627 | err_print_prefix, | 627 | err_print_prefix, |
628 | EXTRACT(trans_sum, IO7__POX_TRANSUM__PCIX_CMD), | 628 | EXTRACT(trans_sum, IO7__POX_TRANSUM__PCIX_CMD), |
@@ -964,12 +964,12 @@ marvel_process_io_error(struct ev7_lf_subpackets *lf_subpackets, int print) | |||
964 | 964 | ||
965 | #if 0 | 965 | #if 0 |
966 | printk("%s PORT 7 ERROR:\n" | 966 | printk("%s PORT 7 ERROR:\n" |
967 | "%s PO7_ERROR_SUM: %016lx\n" | 967 | "%s PO7_ERROR_SUM: %016llx\n" |
968 | "%s PO7_UNCRR_SYM: %016lx\n" | 968 | "%s PO7_UNCRR_SYM: %016llx\n" |
969 | "%s PO7_CRRCT_SYM: %016lx\n" | 969 | "%s PO7_CRRCT_SYM: %016llx\n" |
970 | "%s PO7_UGBGE_SYM: %016lx\n" | 970 | "%s PO7_UGBGE_SYM: %016llx\n" |
971 | "%s PO7_ERR_PKT0: %016lx\n" | 971 | "%s PO7_ERR_PKT0: %016llx\n" |
972 | "%s PO7_ERR_PKT1: %016lx\n", | 972 | "%s PO7_ERR_PKT1: %016llx\n", |
973 | err_print_prefix, | 973 | err_print_prefix, |
974 | err_print_prefix, io->po7_error_sum, | 974 | err_print_prefix, io->po7_error_sum, |
975 | err_print_prefix, io->po7_uncrr_sym, | 975 | err_print_prefix, io->po7_uncrr_sym, |
@@ -987,12 +987,12 @@ marvel_process_io_error(struct ev7_lf_subpackets *lf_subpackets, int print) | |||
987 | if (!MARVEL_IO_ERR_VALID(io->ports[i].pox_err_sum)) | 987 | if (!MARVEL_IO_ERR_VALID(io->ports[i].pox_err_sum)) |
988 | continue; | 988 | continue; |
989 | 989 | ||
990 | printk("%s PID %u PORT %d POx_ERR_SUM: %016lx\n", | 990 | printk("%s PID %u PORT %d POx_ERR_SUM: %016llx\n", |
991 | err_print_prefix, | 991 | err_print_prefix, |
992 | lf_subpackets->io_pid, i, io->ports[i].pox_err_sum); | 992 | lf_subpackets->io_pid, i, io->ports[i].pox_err_sum); |
993 | marvel_print_pox_err(io->ports[i].pox_err_sum, &io->ports[i]); | 993 | marvel_print_pox_err(io->ports[i].pox_err_sum, &io->ports[i]); |
994 | 994 | ||
995 | printk("%s [ POx_FIRST_ERR: %016lx ]\n", | 995 | printk("%s [ POx_FIRST_ERR: %016llx ]\n", |
996 | err_print_prefix, io->ports[i].pox_first_err); | 996 | err_print_prefix, io->ports[i].pox_first_err); |
997 | marvel_print_pox_err(io->ports[i].pox_first_err, | 997 | marvel_print_pox_err(io->ports[i].pox_first_err, |
998 | &io->ports[i]); | 998 | &io->ports[i]); |