Changeset eb79d60 in mainline for kernel/arch/sparc64/include

Timestamp:

2009-11-29T18:17:43Z (16 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

ba50a34

Parents:

3f35634c

Message:

Merged the preemptible trap handler for userspace.

Location:

kernel/arch/sparc64/include

Files:

• cpu.h (modified) (1 diff)
• sun4u/asm.h (added)
• sun4u/cpu.h (modified) (1 diff)
• sun4v/cpu.h (modified) (3 diffs)
• trap/regwin.h (modified) (2 diffs)
• trap/sun4u/regwin.h (added)
• trap/sun4v/regwin.h (added)

kernel/arch/sparc64/include/cpu.h

@@ -64 +64 @@
 #endif
 
-typedef struct {
-        uint32_t mid;                   /**< Processor ID as read from
-                                             UPA_CONFIG/FIREPLANE_CONFIG. */
-        ver_reg_t ver;
-        uint32_t clock_frequency;       /**< Processor frequency in Hz. */
-        uint64_t next_tick_cmpr;        /**< Next clock interrupt should be
-                                             generated when the TICK register
-                                             matches this value. */
-} cpu_arch_t;
 
+#if defined (SUN4U)
+#include <arch/sun4u/cpu.h>
+#elif defined (SUN4V)
+#include <arch/sun4v/cpu.h>
+#endif
 
-/**
- * Reads the module ID (agent ID/CPUID) of the current CPU.
- */
-static inline uint32_t read_mid(void)
-{
-        uint64_t icbus_config = asi_u64_read(ASI_ICBUS_CONFIG, 0);
-        icbus_config = icbus_config >> ICBUS_CONFIG_MID_SHIFT;
-#if defined (US)
-        return icbus_config & 0x1f;
-#elif defined (US3)
-        if (((ver_reg_t) ver_read()).impl == IMPL_ULTRASPARCIII_I)
-                return icbus_config & 0x1f;
-        else
-                return icbus_config & 0x3ff;
-#endif
-}
 
 #endif  

kernel/arch/sparc64/include/sun4u/cpu.h

@@ -33 +33 @@
  */
 
-#ifndef KERN_sparc64_CPU_H_
-#define KERN_sparc64_CPU_H_
+#ifndef KERN_sparc64_sun4u_CPU_H_
+#define KERN_sparc64_sun4u_CPU_H_
 
 #define MANUF_FUJITSU           0x04

kernel/arch/sparc64/include/sun4v/cpu.h

@@ -46 +46 @@
 struct cpu;
 
+/*
 typedef struct {
         uint64_t exec_unit_id;
@@ -54 +55 @@
         SPINLOCK_DECLARE(proposed_nrdy_lock);
 } exec_unit_t;
+*/
 
-// MH
-#if 0
 typedef struct cpu_arch {
         uint64_t id;                    /**< virtual processor ID */
@@ -63 +63 @@
                                              generated when the TICK register
                                              matches this value. */
-        exec_unit_t *exec_unit;         /**< Physical core. */
-        unsigned long proposed_nrdy;    /**< Proposed No. of ready threads
-                                             so that cores are equally balanced. */
+        //exec_unit_t *exec_unit;               /**< Physical core. */
+        //unsigned long proposed_nrdy;  /**< Proposed No. of ready threads
+        //                                   so that cores are equally balanced. */
 } cpu_arch_t;
-#endif
 
 #endif  

kernel/arch/sparc64/include/trap/regwin.h

@@ -131 +131 @@
 
 /*
- * Macro used to spill userspace window to userspace window buffer.
- * It can be either triggered from preemptible_handler doing SAVE
- * at (TL=1) or from normal kernel code doing SAVE when OTHERWIN>0
- * at (TL=0).
- */
-.macro SPILL_TO_USPACE_WINDOW_BUFFER
-        stx %l0, [%g7 + L0_OFFSET]      
-        stx %l1, [%g7 + L1_OFFSET]
-        stx %l2, [%g7 + L2_OFFSET]
-        stx %l3, [%g7 + L3_OFFSET]
-        stx %l4, [%g7 + L4_OFFSET]
-        stx %l5, [%g7 + L5_OFFSET]
-        stx %l6, [%g7 + L6_OFFSET]
-        stx %l7, [%g7 + L7_OFFSET]
-        stx %i0, [%g7 + I0_OFFSET]
-        stx %i1, [%g7 + I1_OFFSET]
-        stx %i2, [%g7 + I2_OFFSET]
-        stx %i3, [%g7 + I3_OFFSET]
-        stx %i4, [%g7 + I4_OFFSET]
-        stx %i5, [%g7 + I5_OFFSET]
-        stx %i6, [%g7 + I6_OFFSET]
-        stx %i7, [%g7 + I7_OFFSET]
-        add %g7, STACK_WINDOW_SAVE_AREA_SIZE, %g7
-        saved
-        retry
-.endm
-
-
-/*
  * Macro used by the nucleus and the primary context 0 during normal fills.
  */
@@ -232 +203 @@
 #endif /* __ASM__ */
 
+#if defined (SUN4U)
+#include <arch/trap/sun4u/regwin.h>
+#elif defined (SUN4V)
+#include <arch/trap/sun4v/regwin.h>
 #endif
 
+#endif
+
 /** @}
  */