Changeset 26f5bdf in mainline for kernel/arch/sparc64/src/sun4v/start.S

Timestamp:

2018-11-30T22:31:12Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9c3038d

Parents:

ea4910b

Message:

Use aligned addresses to take over the MMU

Commit cfdeedc55a55b7c1fc8de8b3faea55104ff3f641 made the kernel image
start address unaligned, which broke the MMU takeover on sun4v. Use
kernel load address, which is still aligned.

File:

• kernel/arch/sparc64/src/sun4v/start.S (modified) (2 diffs)

kernel/arch/sparc64/src/sun4v/start.S

@@ -162 +162 @@
 
         ! map kernel in context 1
-        set kernel_image_start, %o0                             ! virt. address
+        set kernel_load_address, %o0                            ! virt. address
         set 1, %o1                                              ! context
-        TTE_DATA(kernel_image_start, %l5, %g2, %g3, %o2)        ! TTE data
+        TTE_DATA(kernel_load_address, %l5, %g2, %g3, %o2)       ! TTE data
         set MMU_FLAG_DTLB | MMU_FLAG_ITLB, %o3                  ! MMU flags
         __HYPERCALL_HYPERFAST(MMU_MAP_ADDR)
@@ -181 +181 @@
 
         ! install permanent mapping for kernel in context 0
-        set kernel_image_start, %o0                             ! virtual address
+        set kernel_load_address, %o0                            ! virtual address
         set 0, %o1                                              ! context
-        TTE_DATA(kernel_image_start, %l5, %g2, %g3, %o2)        ! TTE data
+        TTE_DATA(kernel_load_address, %l5, %g2, %g3, %o2)       ! TTE data
         set MMU_FLAG_DTLB | MMU_FLAG_ITLB, %o3                  ! MMU flags
         __HYPERCALL_FAST(MMU_MAP_PERM_ADDR)