Changeset 25a76ab8 in mainline for kernel/arch/sparc64/src/sun4v/start.S

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

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

@@ -75 +75 @@
  *
  * parameters:
- *      addr:                   virtual address to be mapped
- *      rphysmem_start:         register containing the starting address of the
- *                              physical memory
- *      rtmp1:                  a register to be used as temporary
- *      rtmp2:                  a register to be used as temporary
- *      rd:                     register where the result will be saved
+ *  addr:           virtual address to be mapped
+ *  rphysmem_start: register containing the starting address
+ *                  of the physical memory
+ *  rtmp1:          a register to be used as temporary
+ *  rtmp2:          a register to be used as temporary
+ *  rd:             register where the result will be saved
+ *
  */
 #define TTE_DATA(addr, rphysmem_start, rtmp1, rtmp2, rd) \
@@ -90 +91 @@
 /*
  * Here is where the kernel is passed control from the boot loader.
- * 
+ *
  * The registers are expected to be in this state:
- * - %o0 starting address of physical memory + bootstrap processor flag
- *      bits 63...1:    physical memory starting address / 2
- *      bit 0:          non-zero on BSP processor, zero on AP processors
- * - %o1 bootinfo structure address (BSP only)
- * - %o2 bootinfo structure size (BSP only)
+ *  - %o0 bootinfo structure address (BSP only)
+ *  - %o1 starting address of physical memory
+ *        + bootstrap processor flag
+ *          bits 63...1: physical memory starting address / 2
+ *          bit 0:       non-zero on BSP processor, zero on AP processors
  *
  * Moreover, we depend on boot having established the following environment:
- * - TLBs are on
- * - identity mapping for the kernel image
+ *  - TLBs are on
+ *  - identity mapping for the kernel image
+ *
  */
 .global kernel_image_start
 kernel_image_start:
         mov BSP_FLAG, %l0
-        and %o0, %l0, %l7                       ! l7 <= bootstrap processor?
-        andn %o0, %l0, %l6                      ! l6 <= start of physical memory
-        or %o1, %g0, %l1
-        or %o2, %g0, %l2
+        and %o1, %l0, %l7                       ! l7 <= bootstrap processor?
+        andn %o1, %l0, %l6                      ! l6 <= start of physical memory
+        or %o0, %g0, %l0
 
         ! Get bits (PHYSMEM_ADDR_SIZE - 1):13 of physmem_base.
@@ -245 +246 @@
         sub %sp, STACK_BIAS, %sp
 
-        or %l1, %g0, %o1
-        or %l2, %g0, %o2
-        sethi %hi(bootinfo), %o0
-        call memcpy                             ! copy bootinfo
-        or %o0, %lo(bootinfo), %o0
-
+        or %l0, %g0, %o0
         call arch_pre_main
         nop