Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abde3dff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix hypervisor TLB operation error reporting.
parents a3c53e23 6320bceb

arch/sparc64/kernel/sun4v_tlb_miss.S

+2 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ sun4v_itlb_error: 


1:	ba,pt	%xcc, etrap

2:	 or	%g7, %lo(2b), %g7

	mov	%l4, %o1

	call	sun4v_itlb_error_report

	 add	%sp, PTREGS_OFF, %o0
@@ -241,6 +242,7 @@ sun4v_dtlb_error: 


1:	ba,pt	%xcc, etrap

2:	 or	%g7, %lo(2b), %g7

	mov	%l4, %o1

	call	sun4v_dtlb_error_report

	 add	%sp, PTREGS_OFF, %o0

arch/sparc64/kernel/traps.c

+4 −0
Original line number Diff line number Diff line
@@ -1950,6 +1950,8 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl) 
	printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",

	       regs->tpc, tl);

	print_symbol(KERN_EMERG "SUN4V-ITLB: TPC<%s>\n", regs->tpc);

	printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);

	print_symbol(KERN_EMERG "SUN4V-ITLB: O7<%s>\n", regs->u_regs[UREG_I7]);

	printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "

	       "pte[%lx] error[%lx]\n",

	       sun4v_err_itlb_vaddr, sun4v_err_itlb_ctx,
@@ -1971,6 +1973,8 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl) 
	printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",

	       regs->tpc, tl);

	print_symbol(KERN_EMERG "SUN4V-DTLB: TPC<%s>\n", regs->tpc);

	printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);

	print_symbol(KERN_EMERG "SUN4V-DTLB: O7<%s>\n", regs->u_regs[UREG_I7]);

	printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "

	       "pte[%lx] error[%lx]\n",

	       sun4v_err_dtlb_vaddr, sun4v_err_dtlb_ctx,