Changeset 0b9ac3c in mainline for kernel/arch/sparc64/include/cpu.h

Timestamp:

2010-02-23T19:03:28Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (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/include/cpu.h (modified) (1 diff)

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