1 files changed, 28 insertions, 5 deletions
diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S
index 9533a25ce5d2..04e81dda13d0 100644
--- a/arch/sparc64/kernel/trampoline.S
+++ b/arch/sparc64/kernel/trampoline.S
@@ -345,7 +345,7 @@ after_lock_tlb:
        sethi           %hi(tramp_stack), %g1
        or              %g1, %lo(tramp_stack), %g1
        add             %g1, TRAMP_STACK_SIZE, %g1
-        sub             %g1, STACKFRAME_SZ + STACK_BIAS, %sp
+        sub             %g1, STACKFRAME_SZ + STACK_BIAS + 256, %sp
        mov             0, %fp
        /* Put garbage in these registers to trap any access to them.  */
@@ -411,15 +411,38 @@ after_lock_tlb:
        sethi           %hi(kern_base), %g3
        ldx             [%g3 + %lo(kern_base)], %g3
        add             %g2, %g3, %o1
+        sethi           %hi(sparc64_ttable_tl0), %o0
-        call            prom_set_trap_table_sun4v
+        set             prom_set_trap_table_name, %g2
-         sethi          %hi(sparc64_ttable_tl0), %o0
+        stx             %g2, [%sp + 2047 + 128 + 0x00]
+        mov             2, %g2
+        stx             %g2, [%sp + 2047 + 128 + 0x08]
+        mov             0, %g2
+        stx             %g2, [%sp + 2047 + 128 + 0x10]
+        stx             %o0, [%sp + 2047 + 128 + 0x18]
+        stx             %o1, [%sp + 2047 + 128 + 0x20]
+        sethi           %hi(p1275buf), %g2
+        or              %g2, %lo(p1275buf), %g2
+        ldx             [%g2 + 0x08], %o1
+        call            %o1
+         add            %sp, (2047 + 128), %o0
        ba,pt           %xcc, 2f
         nop
-1:      call            prom_set_trap_table
+1:      sethi           %hi(sparc64_ttable_tl0), %o0
-         sethi          %hi(sparc64_ttable_tl0), %o0
+        set             prom_set_trap_table_name, %g2
+        stx             %g2, [%sp + 2047 + 128 + 0x00]
+        mov             1, %g2
+        stx             %g2, [%sp + 2047 + 128 + 0x08]
+        mov             0, %g2
+        stx             %g2, [%sp + 2047 + 128 + 0x10]
+        stx             %o0, [%sp + 2047 + 128 + 0x18]
+        sethi           %hi(p1275buf), %g2
+        or              %g2, %lo(p1275buf), %g2
+        ldx             [%g2 + 0x08], %o1
+        call            %o1
+         add            %sp, (2047 + 128), %o0
 2:      ldx             [%l0], %g6
        ldx             [%g6 + TI_TASK], %g4

diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S index 9533a25ce5d2..04e81dda13d0 100644 --- a/arch/sparc64/kernel/trampoline.S +++ b/arch/sparc64/kernel/trampoline.S
@@ -345,7 +345,7 @@ after_lock_tlb:
345	sethi %hi(tramp_stack), %g1	345	sethi %hi(tramp_stack), %g1
346	or %g1, %lo(tramp_stack), %g1	346	or %g1, %lo(tramp_stack), %g1
347	add %g1, TRAMP_STACK_SIZE, %g1	347	add %g1, TRAMP_STACK_SIZE, %g1
348	sub %g1, STACKFRAME_SZ + STACK_BIAS, %sp	348	sub %g1, STACKFRAME_SZ + STACK_BIAS + 256, %sp
349	mov 0, %fp	349	mov 0, %fp
350		350
351	/* Put garbage in these registers to trap any access to them. */	351	/* Put garbage in these registers to trap any access to them. */
@@ -411,15 +411,38 @@ after_lock_tlb:
411	sethi %hi(kern_base), %g3	411	sethi %hi(kern_base), %g3
412	ldx [%g3 + %lo(kern_base)], %g3	412	ldx [%g3 + %lo(kern_base)], %g3
413	add %g2, %g3, %o1	413	add %g2, %g3, %o1
		414	sethi %hi(sparc64_ttable_tl0), %o0
414		415
415	call prom_set_trap_table_sun4v	416	set prom_set_trap_table_name, %g2
416	sethi %hi(sparc64_ttable_tl0), %o0	417	stx %g2, [%sp + 2047 + 128 + 0x00]
		418	mov 2, %g2
		419	stx %g2, [%sp + 2047 + 128 + 0x08]
		420	mov 0, %g2
		421	stx %g2, [%sp + 2047 + 128 + 0x10]
		422	stx %o0, [%sp + 2047 + 128 + 0x18]
		423	stx %o1, [%sp + 2047 + 128 + 0x20]
		424	sethi %hi(p1275buf), %g2
		425	or %g2, %lo(p1275buf), %g2
		426	ldx [%g2 + 0x08], %o1
		427	call %o1
		428	add %sp, (2047 + 128), %o0
417		429
418	ba,pt %xcc, 2f	430	ba,pt %xcc, 2f
419	nop	431	nop
420		432
421	1: call prom_set_trap_table	433	1: sethi %hi(sparc64_ttable_tl0), %o0
422	sethi %hi(sparc64_ttable_tl0), %o0	434	set prom_set_trap_table_name, %g2
		435	stx %g2, [%sp + 2047 + 128 + 0x00]
		436	mov 1, %g2
		437	stx %g2, [%sp + 2047 + 128 + 0x08]
		438	mov 0, %g2
		439	stx %g2, [%sp + 2047 + 128 + 0x10]
		440	stx %o0, [%sp + 2047 + 128 + 0x18]
		441	sethi %hi(p1275buf), %g2
		442	or %g2, %lo(p1275buf), %g2
		443	ldx [%g2 + 0x08], %o1
		444	call %o1
		445	add %sp, (2047 + 128), %o0
423		446
424	2: ldx [%l0], %g6	447	2: ldx [%l0], %g6
425	ldx [%g6 + TI_TASK], %g4	448	ldx [%g6 + TI_TASK], %g4