[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: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 2 deletions

diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index f1dcdf8f7433..4c942f71184d 100644
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -191,8 +191,9 @@ prom_boot_mapping_phys_low:
         stx     %l3, [%sp + 2047 + 128 + 0x10]  ! num_rets, 5
         stx     %l2, [%sp + 2047 + 128 + 0x18]  ! arg1: "translate"
         stx     %l5, [%sp + 2047 + 128 + 0x20]  ! arg2: prom_mmu_ihandle_cache
-        srlx    %l0, 22, %l3
-        sllx    %l3, 22, %l3
+        /* PAGE align */
+        srlx    %l0, 13, %l3
+        sllx    %l3, 13, %l3
         stx     %l3, [%sp + 2047 + 128 + 0x28]  ! arg3: vaddr, our PC
         stx     %g0, [%sp + 2047 + 128 + 0x30]  ! res1
         stx     %g0, [%sp + 2047 + 128 + 0x38]  ! res2
@@ -211,6 +212,9 @@ prom_boot_mapping_phys_low:
         ldx     [%sp + 2047 + 128 + 0x48], %l2  ! physaddr high
         stx     %l2, [%l4 + 0x0]
         ldx     [%sp + 2047 + 128 + 0x50], %l3  ! physaddr low
+        /* 4MB align */
+        srlx    %l3, 22, %l3
+        sllx    %l3, 22, %l3
         stx     %l3, [%l4 + 0x8]
 
         /* Leave service as-is, "call-method" */