Commit b1b510aa authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC64]: Fix net booting on Ultra5 



We were not doing alignment properly when remapping the kernel image.

What we want is a 4MB aligned physical address to map at KERNBASE.
Mistakedly we were 4MB aligning the virtual address where the kernel
initially sits, that's wrong.

Instead, we should PAGE align the virtual address, then 4MB align the
physical address result the prom gives to us.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 08eb8f12

arch/sparc64/kernel/head.S

+6 −2
Original line number Original line Diff line number Diff line
@@ -191,8 +191,9 @@ prom_boot_mapping_phys_low: 
	stx	%l3, [%sp + 2047 + 128 + 0x10]	! num_rets, 5

	stx	%l3, [%sp + 2047 + 128 + 0x10]	! num_rets, 5

	stx	%l2, [%sp + 2047 + 128 + 0x18]	! arg1: "translate"

	stx	%l2, [%sp + 2047 + 128 + 0x18]	! arg1: "translate"

	stx	%l5, [%sp + 2047 + 128 + 0x20]	! arg2: prom_mmu_ihandle_cache

	stx	%l5, [%sp + 2047 + 128 + 0x20]	! arg2: prom_mmu_ihandle_cache

	srlx	%l0, 22, %l3

	/* PAGE align */

	sllx	%l3, 22, %l3

	srlx	%l0, 13, %l3

	sllx	%l3, 13, %l3

	stx	%l3, [%sp + 2047 + 128 + 0x28]	! arg3: vaddr, our PC

	stx	%l3, [%sp + 2047 + 128 + 0x28]	! arg3: vaddr, our PC

	stx	%g0, [%sp + 2047 + 128 + 0x30]	! res1

	stx	%g0, [%sp + 2047 + 128 + 0x30]	! res1

	stx	%g0, [%sp + 2047 + 128 + 0x38]	! res2

	stx	%g0, [%sp + 2047 + 128 + 0x38]	! res2
@@ -211,6 +212,9 @@ prom_boot_mapping_phys_low: 
	ldx	[%sp + 2047 + 128 + 0x48], %l2	! physaddr high

	ldx	[%sp + 2047 + 128 + 0x48], %l2	! physaddr high

	stx	%l2, [%l4 + 0x0]

	stx	%l2, [%l4 + 0x0]

	ldx	[%sp + 2047 + 128 + 0x50], %l3	! physaddr low

	ldx	[%sp + 2047 + 128 + 0x50], %l3	! physaddr low

	/* 4MB align */

	srlx	%l3, 22, %l3

	sllx	%l3, 22, %l3

	stx	%l3, [%l4 + 0x8]

	stx	%l3, [%l4 + 0x8]





	/* Leave service as-is, "call-method" */

	/* Leave service as-is, "call-method" */