Changes in kernel/arch/sparc64/include/cpu.h [d99c1d2:965dc18] in mainline

File:

• kernel/arch/sparc64/include/cpu.h (modified) (2 diffs)

kernel/arch/sparc64/include/cpu.h

@@ -54 +54 @@
 #ifndef __ASM__
 
+#include <arch/types.h>
 #include <typedefs.h>
 #include <arch/register.h>
@@ -63 +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>
+
+/**
+ * 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