Changeset 23b7c02 in mainline for boot/arch/sparc64/src/asm.S

Timestamp:

2013-09-04T06:58:57Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

7664469

Parents:

caf5382 (diff), aa2a049 (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 with Mainline changes.

File:

• boot/arch/sparc64/src/asm.S (modified) (3 diffs)

boot/arch/sparc64/src/asm.S

@@ -30 +30 @@
 #include <arch/arch.h>
 
+#if defined(PROCESSOR_us) || defined(PROCESSOR_us3)
 #define ICACHE_SIZE       8192
 #define ICACHE_LINE_SIZE  32
 #define ICACHE_SET_BIT    (1 << 13)
 #define ASI_ICACHE_TAG    0x67
+#endif  /* PROCESSOR_us || PROCESSOR_us3 */
 
 .register %g2, #scratch
@@ -134 +136 @@
 # Flush I-cache
 icache_flush:
+#if defined(PROCESSOR_us) || defined(PROCESSOR_us3)
         set ((ICACHE_SIZE - ICACHE_LINE_SIZE) | ICACHE_SET_BIT), %g1
         stxa %g0, [%g1] ASI_ICACHE_TAG
@@ -149 +152 @@
         
         nop
+#else
+        // TODO: sun4v
+        retl
+        nop
+#endif  /* PROCESSOR_us || PROCESSOR_us3 */
 
 .global ofw