ARC: show_regs: reduce lines of output
PATCH 1/1 ARC: show_regs: reduce lines of output
Before
------
| CPU: 1 PID: 29061 Comm: tst-dynarray-at Not tainted 5.6.0-rc1-00002-g941fcc018ca6-dirty #12
|
| [ECR ]: 0x00090000 =>
| [EFA ]: 0x00000000
| [ERET ]: 0x2004aa6c
| @off 0x2aa6c in [/lib/libc-2.31.9000.so]
VMA: 0x20020000 to 0x20122000
| [STAT32]: 0x80080a82 [IE U ]
| BTA: 0x2004aa18 SP: 0x5ffff8a8 FP: 0x5ffff8fc
| LPS: 0x2008788e LPE: 0x20087896 LPC: 0x00000000
| r00: 0x00000000 r01: 0x5ffff8a8 r02: 0x00000000
| r03: 0x00000008 r04: 0xffffffff r05: 0x00000000
| r06: 0x00000000 r07: 0x00000000 r08: 0x00000087
| r09: 0x00000000 r10: 0x2010691c r11: 0x00000020
| r12: 0x2003b214 r13: 0x5ffff8a8 r14: 0x20126e68
| r15: 0x2001f26c r16: 0x2012a000 r17: 0x00000001
| r18: 0x5ffff8fc r19: 0x00000000 r20: 0x5ffff948
| r21: 0x00000001 r22: 0xffffffff r23: 0x5fffff8c
| r24: 0x4008c2a8 r25: 0x2001f6e0After
-----
| CPU: 1 PID: 29061 Comm: tst-dynarray-at Not tainted 5.6.0-rc1-00002-g941fcc018ca6-dirty #12 | @off 0x2aa6c in [/lib/libc-2.31.9000.so] VMA: 0x20020000 to 0x20122000 | ECR: 0x00090000 EFA: 0x00000000 ERET: 0x2004aa6c | STAT32: 0x80080a82 [IE U ] BTA: 0x2004aa18 | BLK: 0x2003b214 SP: 0x5ffff8a8 FP: 0x5ffff8fc | LPS: 0x2008788e LPE: 0x20087896 LPC: 0x00000000 | r00: 0x00000000 r01: 0x5ffff8a8 r02: 0x00000000 | r03: 0x00000008 r04: 0xffffffff r05: 0x00000000 | r06: 0x00000000 r07: 0x00000000 r08: 0x00000087 | r09: 0x00000000 r10: 0x2010691c r11: 0x00000020 | r12: 0x2003b214 r13: 0x5ffff8a8 r14: 0x20126e68 | r15: 0x2001f26c r16: 0x2012a000 r17: 0x00000001 | r18: 0x5ffff8fc r19: 0x00000000 r20: 0x5ffff948 | r21: 0x00000001 r22: 0xffffffff r23: 0x5fffff8c | r24: 0x4008c2a8 r25: 0x2001f6e0 BTA: 0x2004aa18
Signed-off-by Vineet Gupta <[email protected]>
--- arch/arc/kernel/troubleshoot.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-)
arch/arc/kernel/troubleshoot.c +12 -15
@@ -104,8 +104,7 @@ static void show_faulting_vma(unsigned long address)if (IS_ERR (nm)) nm ="?" ; } -pr_info (" @off 0x%lx in [%s]\n" -" VMA: 0x%08lx to 0x%08lx\n" , +pr_info (" @off 0x%lx in [%s] VMA: 0x%08lx to 0x%08lx\n" , vma->vm_start <TASK_UNMAPPED_BASE ? address : address - vma->vm_start, nm, vma->vm_start, vma->vm_end);
@@ -120,8 +119,6 @@ static void show_ecr_verbose(struct pt_regs *regs)unsigned int vec, cause_code;unsigned long address; -pr_info ("\n[ECR ]: 0x%08lx => " , regs->event); -/* For Data fault, this is data address not instruction addr */ address = current->thread.fault_address;
@@ -130,10 +127,10 @@ static void show_ecr_verbose(struct pt_regs *regs)/* For DTLB Miss or ProtV, display the memory involved too */ if (vec ==ECR_V_DTLB_MISS ) { -pr_cont ("Invalid %s @ 0x%08lx by insn @ 0x%08lx\n" , +pr_cont ("Invalid %s @ 0x%08lx by insn @ %pS\n" , (cause_code ==0x01 ) ?"Read" : ((cause_code ==0x02 ) ?"Write" :"EX" ), - address, regs->ret); + address, (void *)regs->ret); }else if (vec ==ECR_V_ITLB_MISS ) {pr_cont ("Insn could not be fetched\n" ); }else if (vec ==ECR_V_MACH_CHK ) {
@@ -191,31 +188,31 @@ void show_regs(struct pt_regs *regs)show_ecr_verbose (regs); -pr_info ("[EFA ]: 0x%08lx\n[BLINK ]: %pS\n[ERET ]: %pS\n" , - current->thread.fault_address, - (void *)regs->blink, (void *)regs->ret); -if (user_mode (regs))show_faulting_vma (regs->ret);/* faulting code, not data */ -pr_info ("[STAT32]: 0x%08lx" , regs->status32); +pr_info ("ECR: 0x%08lx EFA: 0x%08lx ERET: 0x%08lx\n" , + regs->event, current->thread.fault_address, regs->ret); + +pr_info ("STAT32: 0x%08lx" , regs->status32);#define STS_BIT (r, bit) r->status32 & STATUS_##bit##_MASK ? #bit" " : ""#ifdef CONFIG_ISA_ARCOMPACT -pr_cont (" : %2s%2s%2s%2s%2s%2s%2s\n" , +pr_cont (" [%2s%2s%2s%2s%2s%2s%2s]" , (regs->status32 &STATUS_U_MASK ) ?"U " :"K " ,STS_BIT (regs,DE ),STS_BIT (regs,AE ),STS_BIT (regs,A2 ),STS_BIT (regs,A1 ),STS_BIT (regs,E2 ),STS_BIT (regs,E1 ));#else -pr_cont (" : %2s%2s%2s%2s\n" , +pr_cont (" [%2s%2s%2s%2s]" ,STS_BIT (regs,IE ), (regs->status32 &STATUS_U_MASK ) ?"U " :"K " ,STS_BIT (regs,DE ),STS_BIT (regs,AE ));#endif -pr_info ("BTA: 0x%08lx\t SP: 0x%08lx\t FP: 0x%08lx\n" , - regs->bta, regs->sp, regs->fp); +pr_cont (" BTA: 0x%08lx\n" , regs->bta); +pr_info ("BLK: %pS\n SP: 0x%08lx FP: 0x%08lx\n" , + (void *)regs->blink, regs->sp, regs->fp);pr_info ("LPS: 0x%08lx\tLPE: 0x%08lx\tLPC: 0x%08lx\n" , regs->lp_start, regs->lp_end, regs->lp_count);
Signature · 1 line
2.20.1