AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[SPARC64]: Fix sun4v early bootup.

Browse Source 
prom_sun4v_name should be "sun4v" not "SUNW,sun4v"

Also, this is too early to make use of the
.sun4v_Xinsn_patch code patching, so just check
things manually.

This gets us at least to prom_init() on Niagara.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2006-02-11 10:56:43 -08:00
parent 0d4bc95b9c
commit 6cebb52094
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
arch/sparc64/kernel/head.S
View File

@ -123,7 +123,7 @@ prom_map_name:
prom_unmap_name: prom_unmap_name:
.asciz "unmap" .asciz "unmap"
prom_sun4v_name: prom_sun4v_name:
.asciz "SUNW,sun4v" .asciz "sun4v"
.align 4 .align 4
prom_root_compatible: prom_root_compatible:
.skip 64 .skip 64
@ -300,7 +300,7 @@ sparc64_boot_after_remap:
or %g1, %lo(prom_root_compatible), %g1 or %g1, %lo(prom_root_compatible), %g1
sethi %hi(prom_sun4v_name), %g7 sethi %hi(prom_sun4v_name), %g7
or %g7, %lo(prom_sun4v_name), %g7 or %g7, %lo(prom_sun4v_name), %g7
mov 10, %g3 mov 5, %g3
1: ldub [%g7], %g2 1: ldub [%g7], %g2
ldub [%g1], %g4 ldub [%g1], %g4
cmp %g2, %g4 cmp %g2, %g4
@ -380,28 +380,33 @@ jump_to_sun4u_init:
nop nop
sun4u_init: sun4u_init:
BRANCH_IF_SUN4V(g1, sun4v_init)
/* Set ctx 0 */ /* Set ctx 0 */
mov PRIMARY_CONTEXT, %g7 mov PRIMARY_CONTEXT, %g7
stxa %g0, [%g7] ASI_DMMU
661: stxa %g0, [%g7] ASI_DMMU
.section .sun4v_1insn_patch, "ax"
.word 661b
stxa %g0, [%g7] ASI_MMU
.previous
membar #Sync membar #Sync
mov SECONDARY_CONTEXT, %g7 mov SECONDARY_CONTEXT, %g7
stxa %g0, [%g7] ASI_DMMU
661: stxa %g0, [%g7] ASI_DMMU
.section .sun4v_1insn_patch, "ax"
.word 661b
stxa %g0, [%g7] ASI_MMU
.previous
membar #Sync membar #Sync
BRANCH_IF_SUN4V(g1, niagara_tlb_fixup) ba,pt %xcc, sun4u_continue
nop
sun4v_init:
/* Set ctx 0 */
mov PRIMARY_CONTEXT, %g7
stxa %g0, [%g7] ASI_MMU
membar #Sync
mov SECONDARY_CONTEXT, %g7
stxa %g0, [%g7] ASI_MMU
membar #Sync
ba,pt %xcc, niagara_tlb_fixup
nop
sun4u_continue:
BRANCH_IF_ANY_CHEETAH(g1, g7, cheetah_tlb_fixup) BRANCH_IF_ANY_CHEETAH(g1, g7, cheetah_tlb_fixup)
ba,pt %xcc, spitfire_tlb_fixup ba,pt %xcc, spitfire_tlb_fixup